forked from integritee-network/worker
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix unresolved imports #71
Open
m-yahya
wants to merge
133
commits into
master
Choose a base branch
from
my/fix-merged-conflicts
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Adding in the balance transfer filters * clippy and fmt * taplo * adding polkadot js transfer script for various transfer tests and some logging * cleanup for pr * adding privacy sidechain shielding to indirect executor * Adding in privacy shielding with runtime crash * fix merge error * [stf] migrate deprecated `set_balance` to `force_set_balance` * renaming and refactor * reorganizing and refactor for better code seperation * bump api-client after master merge * cargo fmt * making indirect_executor refactored to avoid cycles * make itp-utils purely no-std * make itp-utils purely no-std * code fixes after itp-utils change * fix enclave build * [itp-utils] fix test compilation * Fix enclave build in shielding parentchain transfer branch (integritee-network#1482) * make itp-utils purely no-std * make itp-utils purely no-std * code fixes after itp-utils change * fix enclave build * [itp-utils] fix test compilation * adding integration test * clippy taplo fmt * avoid clash between //Alice unshielding and //Alice vault for shielding. * WIP causing cyclic dependency * plenty of refactoring. now no_std clash remaining * mostly fixed the mess. now failing high-level when build * mock for indirect call executor tests * fixed cargo test * cleanups * fixes * cargo fix in root * taplo fmt * toml feature cleanup. no effect * revert bogus fix * taplo fmt * fix trait bound build errors * cleanup * get rid of extern crate core again * get rid of sgx_tstd in itp-types * add enhancement todo comment --------- Co-authored-by: Christian Langenbacher <[email protected]> Co-authored-by: clangenb <[email protected]> Co-authored-by: Alain Brenzikofer <[email protected]> Co-authored-by: brenzi <[email protected]>
* now shielding from vault instead of alice. breaks sidechain block production * fix * fix unit testing * fix clippy
* now shielding from vault instead of alice. breaks sidechain block production * fix * fix unit testing * fix clippy * clean up rpc api definitions * rpc works * added cli commands for new rpc methods * get-shard and get-shard-vault subcommands work * cargo fix * fix clippy
…#1499) * now shielding from vault instead of alice. breaks sidechain block production * fix * fix unit testing * fix clippy * clean up rpc api definitions * rpc works * added cli commands for new rpc methods * get-shard and get-shard-vault subcommands work * cargo fix * fix clippy * prepare CI and docker for testing shard vault too * skip shard vault tests for offchain-worker which doesn't support that feature (yet)
* remove comments * fix cargo and clippy * a bit more * taplo fmt * revert some comments
mosonyi
approved these changes
Nov 28, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The build.Dockerfile changes look good.
…1502) * enable target_a and _b syncing for sidechain mode and prepare new demo script. syncing target_a happening * add shard vault proxy account on target A/B as well. derivation is deterministic, so the vault account is the same on all parentchains * prepare event listener on target A and fix demoscript * remove old enclave_bridge unshield call from trusted_call * abstracting parentchain effect opaque_calls. stf can send to any parentchain. (only integritee implemented for now) * sending stf extrinsics to all parentchains now * WIP: triggering block import of target_a and b upon sidechain on_slot * refactored aura to trigger target_a and target_b import * shielding from target_a worked * demo passes first and second rungit add -u! * log cosmetics * generic event display (fails). log cosmetics * hack the fees. and more pimps * recorded demo with this * fixed cargo test * clippy * fixed enclave tests * cleanup * fix CI * CI: introduce fee tolerance when assering balances * fix evm tests * fix * clippy with test flag * fix demo_sidechain with fee tolerance * CI fixes * review remarks fixed
…k#1500) * specify return type in perform_trusted_operation * reveiw suggestions * fix evm code * remove comment
…egritee-network#1493) * improve log levels * [service] `sidechain_start_untrusted_rpc_server`downgrade tokyo handle arg to a borrow * [service/main] distinguish better between different setups * [service/main] extract duplicate code * [service/main] fix clippy * [service/main] fix clippy with teeracle * introduce `is_syncing` in `sync_parentchain` * remove obsolete `trigger_parentchain_block` ffi * remove unused import * fix clippy * fix test compilation * [service/main] extract `init_proxied_shard_vault`
* support json-rpc request string id * fix tests --------- Co-authored-by: clangenb <[email protected]>
* Trim padded xt * fix compile
…ntegritee-network#1517) * ensure extrinsic success for enclave RA registration and fix integritee-network#1515 * postpone provisioning to after registering own enclave onchain * remove request-state argument form run config. no longer necessary to explicitly request this * introduce shard birth concept and a bit of renaming throughout * fixing startup panic. fast-sync disabled now * fast-syncing integritee parentchain now * cargo fix * clippy * fast-sync now also skips event and proof fetching from rpc * clippy * OCW now provisions entire state as well * fix enclave tests * fetch peer for provisioning based on their activity and avoid fetching from other shards or self * tiny clone remove * rename birth > creation * bump v0.12.2 * rename is_syncing > immediate_import
integritee-network#1521) * init shard if primary worker and no shard exists onchain * fix * fix * fail immediately upon block import error * fix log reporting synced header number * more logs if ancestry mismatch * fix zip with empty vec leading to non imported blocks * revert block sync chunk size change
…ms/BEST-Energy into my/fix-merged-conflicts
68d2fa7
to
5ccde13
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.