Merge upstream #47
Merged
Merge upstream #47
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
clangenb
commented
Jun 21, 2023
•
clangenb
commented
- Merges the following branch from upstream: Polkadot update v0.9.42 integritee-network/worker#1337
- Changes the CI to use GitHub hosted runners instead of securitee infrastructure
- Minor fixes in CLI to make it compile again.
* [local-setup] use default ports for the node and worker1 * [local-setup] re-organize configs and use default ports in configs. * [local-setup] update readme * [local-setup] also add external flags for the node in the benchmark settings * [local-setup] also add external flags for the worker
…network#1159) * citadel mods * use ldconfig * service: skip check_files if dcap attestation is used * worker: move feature check to check_files() to silence unused warning (temporary fix) * Add function to verify quote from the outside * fix invalid extrinsic return parameter * cleanup * rename fetch_stuff * extract timeout * remove comment 2x * extract function * add flag for prometheus endpoint base url * dcap vs ias check_files * switch to rest_client * fix typo * remove comment by me * fetch events every hour * remove unnecessary comment * fetch fmspc from dcap_quote * fixes * worker: fetch FMSPC from RA certificate * cleanup2 * fix typo * Placeholder commit for updating pallets/node after .37 polkadot update has been merged * Clippy fixes * add feature flags for dcap, use pallets fork * ci: taplo fmt * revert accidental Cargo.toml style changes * service: add handy derives to PrometheusMarblerRunEvent and PrometheusMarblerunEventActivation * service: add proper reasoning to expect() in register_quotes_from_marblerun() * enclave-runtime/attestation: remove leftover debug output * pallets: use updated polkadot branch * rename generate_dcap_ra_extrinsic_internal_with_quote() to generate_dcap_ra_extrinsic_from_quote() * rename methods to generate_dcap_ra_extrinsic_from_quote{_internal} * remove obsolete todo * fix typo in expect message * *.toml: fix accidental formatting * service: handle registering marblerun quotes failure with error logging * ffi: remove _internal suffix from generate_dcap_ra_extrinsic_from_quote_internal()
* stf_sgx_tests: make sure NodeMetadataRepository is initialized with Some() value, rather than the default None. * tests: fix formatting * disable test_verify_get_exchange_rate_from_coin_gecko_works() for now * fixup! disable test_verify_get_exchange_rate_from_coin_gecko_works() for now
* docker: copy sgx libs only * docker: add DCAP libs
* Adding fork-tree to worker * Cargo fmt and clippy * taplo fmt * adding in default impl for clippy and removing senseless comments * minor fmt
* Adding fork-tree to worker * Cargo fmt and clippy * taplo fmt * adding in default impl for clippy and removing senseless comments * minor fmt * Cherry picking and merging * Cherry picking test of is_descendent_builder * Removing comments and cleanup * Adding in build_queue_header helper * Adding in imports for SidechainBlockBuilderTrait * Cargo fmt taplo fmt and clippy * Adding some documentation to new structures * cargo fmt * Addressing comments
* service: fix register_quotes_from_marblerun after refactor * service: change marblerun prometheus endpoint poll interval to 5 minutes * enclave-runtime: attestation.rs: fix typo * enclave-runtime: move enclave call log to trace level in attestation.rs * fixup! service: change marblerun prometheus endpoint poll interval to 5 minutes * fixup! enclave-runtime: attestation.rs: fix typo * fixup! enclave-runtime: move enclave call log to trace level in attestation.rs * Makefile: remove hardcoded dcap flag * Makefile: WORKER_FEATURES should not overwrite user supplied value * fixup! Makefile: WORKER_FEATURES should not overwrite user supplied value
…crypt (integritee-network#1204) * teeracle: change coingecko root certificate as they moved to Let's Encrypt * teeracle: remove obsolete comment about test case failure
* make: add real debug add __assert_fail implementation for ring * cli: remove duplicate -s flag clap * make: remove obsolete comment * fixup! make: add real debug * clippy: remove unnecessary unsafe block * enclave-runtime: add __assert_fail implementation for ring / ring-xous This is a necessary addition to have ring / ring-xous compile in debug mode. Teaclave added their implementation, but it no longer gets linked for some reason. See integritee-network#1200 for more details.
…ueues (integritee-network#1198) * Adding fork-tree to worker * Cargo fmt and clippy * taplo fmt * adding in default impl for clippy and removing senseless comments * minor fmt * Cherry picking and merging * Cherry picking test of is_descendent_builder * Removing comments and cleanup * Adding in build_queue_header helper * Adding in imports for SidechainBlockBuilderTrait * Cargo fmt taplo fmt and clippy * Adding some documentation to new structures * cargo fmt * Addressing comments * Refactoring for pr * Fix incorrect comment * fixing docstring * cargo fmt * Moving errors to correct file * refactor from comments half * Refactoring for Chris comments * Missing import * cargo fmt * Minor fixes for `is_descendant_builder` (integritee-network#1206) * properly feature gate the `is_descendant_of_builder` * [header_db] improve traitbounds * Update sidechain/consensus/common/src/is_descendant_of_builder.rs Co-authored-by: clangenb <[email protected]> * Update sidechain/consensus/common/src/is_descendant_of_builder.rs Co-authored-by: clangenb <[email protected]> * Update sidechain/consensus/common/src/is_descendant_of_builder.rs Co-authored-by: clangenb <[email protected]> * Update sidechain/consensus/common/src/is_descendant_of_builder.rs Co-authored-by: clangenb <[email protected]> --------- Co-authored-by: clangenb <[email protected]>
…-network#1207) * build: bump integritee-dev docker image, .13 is based on Ubuntu 22.04 (Jammy) * GHA: change runs-on to Ubuntu 22.04 (Jammy) as well * GHA: use explicit Ubuntu version instead of latest
* core-primitives/utils: fix crash if slice.len() < 2 in decode_hex() * its-consensus-common: fix unused doc comment warning * fixup! core-primitives/utils: fix crash if slice.len() < 2 in decode_hex()
…ics configurable (integritee-network#1223) * wip of indirect executor refactoring * [indirect-executor] provide a filter implementation * [indirect-executor] fix mock feature flag * [indirect-executor] tests runs, but if fails to find the call * [indirect-executor] shield funds indirect call works now. * [indirect-executor] call worker works too * [indirect-executor] add `ParentchainExtrinsic` associated type, which must implement `ExtractCallIndex` * [global-components] add indirect filter to initialization * [indirect-calls-executor] make filter trait definition less constraining * [enclave-runtime] fix top_pool_tests.rs * minor cleanup * minor cleanup * minor cleanup * [indirect-executor] move `create_processed_parentchain_block_call` to the trait definition. * [indirect-executor] move trait definitions to separate module. * [indirect-executor] re-organise crate * [indirect-executor] remove obsolete todo * [indirect-executor] add comment about app-libs * [indirect-executor] minor cleanup * [api-client-types] also return the signature of the extrinsic. * typo * minor cleanup * [api-client-types] fix import of MultiSignature in no-std. * [indirect-execution] trait does not take mutable reference anymore. * fix clippy warnings. * fix clippy warnings. * [api-clients] added `Signature` associated type. * [indirect-executor] `IndirectDispatch` rename method to `dispatch` * [indirect-executor] add minimal crate level doc. * [indirect-executor] introduce extrinsic parser and make the filters generic over it. * minor cleanup * remove obsolete comment * fix clippy * fix comment! * add todo
* only bump up the version number * cargo update * cargo build and clippy
integritee-network#1230) * GHA: fix teeracle failure by increasing the update interval of the API Co-authored-by: Zoltan Mosonyi <[email protected]> * teeracle: fix coingecko test failure by increasing the timeout * fixup! teeracle: fix coingecko test failure by increasing the timeout * teeracle: increase coingecko timeout further * teeracle: increase coingecko timeout further (20 seconds) * teeracle: try fetching exchange_rates 3 times before giving up * teeracle: add descriptive error message if fetching exchange rates fails * clippy: fix * clippy: fix, remove leftover code * teeracle: use plain loop with breaks instead of for --------- Co-authored-by: Zoltan Mosonyi <[email protected]>
…Let's Encrypt" (integritee-network#1268) This reverts commit 3fb6801.
* rpc: add attesteer_forward_dcap_quote call * rpc: add attesteer_forward_ias_attestation_report * remove unused variables * enclave-runtime/attestation: remove duplicate code * enclave-runtime/attestation: extract extrinsic sending * enclave-runtime/attestaion: refactor generate_dcap_ra_extrinsic_internal to reduce code duplication * attesteer: add attesteer RPC calls to the CLI * compiling * cli: attesteer dcap quote verification takes a filename (to a hex encoded quote) instead of contents * cli: attesteer ias attestation report takes a filename (to a hex encoded report) instead of its contents * clippy: fix needless borrow * rename: match substrate convention for RPC method names * rename: SendDCAPQuoteCmd -> SendDcapQuoteCmd * rename: SendIASAttestationReportCmd -> SendIasAttestationReportCmd * rename: attesteer_callForwardIASAttestationReport -> attesteer_ForwardIasAttestationReport * rename: attesteer_callForwardDCAPQuote -> attesteer_ForwardDcapQuote * cli: refactor attesteer comamnds to use a neat match expressions * cli: attesteer commands use let-else pattern * cli: attesteer commands send to chain * rename: attesteer_Forward -> attesteer_forward
* update to v0.9.0 tag * fix api-types * some more changes * fix metadata * fix it all * fix submit extrinsic * fix palletteerex api * one step further * some more uptadates * seems to work * oh yes * and compiled * readd comment * add comment * cargo fmt * taplo fmt * fix rpc-client mock * fix tests * fix clippy * fix clippy * fix teeracle * fix teeracel * fix clippy * lets try * lets try that * simplify account.rs * simplfy pallet teerex * simplify signedblock * remove clone * fmt * fix clippy * clean SignedBlock
* update to tag v0.10.0 switch to generic extrinsic params some more changes add SignExtrinisc trait update extrinisc factory fix error rename event subscription fix events fix whatever possible we're getting there compiling! fix tests fix teeracle fmt clippy fix evm fmt * fix compilation * clean up extrinisc V4 * fix typos * fix typo
…; remove unused jsonrpsee dependency (integritee-network#1271) * update api-client feature flags to remove unused jsonrpsee dependency. * update enclave Cargo.lock * [itp-api-client-types] re-export extrinsic params trait. * [itp-node-api-metadata] use Metadata from itp-api-client-types instead of from api-client * [enclave-runtime] remove unnecessary dependency on the substrate-api-client * [itc-rpc-client] uses now the types from itp-api-client-types * [enclave-runtime] fix api-client dependencies in tests.
…oved to Let's Encrypt" (integritee-network#1268)" (integritee-network#1276) This reverts commit d794987.
* Added self hosted runner integritee-network#386 --------- Co-authored-by: Szilard Parrag <[email protected]> Co-authored-by: Christian Langenbacher <[email protected]>
* Initial addition of retrieving event proof from parent-chain * Adding in events retrieval * removing old comments * Passing in events and proofs per block to enclave * refactoring a bit * Fixing compiler errors * slight refactor plus comment * Clippy and fmt * Addressing clippy concerns * Taplo * fixing mock import
…integritee-network#1229) * service: fix DCAP and --skip-ra flag * attestation_handler: handle HTTP status code 400 - bad request * attestation_handler: handle unknown error better * attestation_handler: make the error messages format uniform * gha: remove unnecessary dockerhub login
* teeracle: rename market update method to be consistent with weather update * teeracle: execute updates at start as well
* First trial to use docker cache * Added back cargo test release * Remove debugging commands * Add sccache to try * Added sccache status * Be sure that build has unique id * Add force run that line * Remove commented out line * Pull dev image if not exist --------- Co-authored-by: Szilárd Parrag <[email protected]>
* [itc-light-client] refactor * [itc-light-client] remove obsolete `NoSuchRelayExists` error * [itc-light-client] make `submit_xt_to_be_included` infallible and remove expect statement. * [itc-light-client] remove error that is not used yet. * [itc-light-client] Remove `Default` derive, which can't be satisfied
* [local-setup] fix setup with two workers: avoid using the same data dirs. (integritee-network#1358) * [ita_stf/test_genesis] remove reserved balance from state, as it doesn't exist anymore * [enclave-runtime/top_pool_execution] downgrade logs to trace * [state_handler] add debug and trace logs * add additional flags for the worker setup * [its-consensus-aura/block_importer] add some more logs * local setup add some more logging
…-upstream # Conflicts: # .github/workflows/build_and_test.yml # .github/workflows/publish-docker-release.yml # Cargo.lock # app-libs/sgx-runtime/Cargo.toml # app-libs/stf/Cargo.toml # cli/Cargo.toml # enclave-runtime/Cargo.lock # local-setup/config/one-worker.json # service/Cargo.toml
This reverts commit 877f516.
This reverts commit 0488d2b.
m-yahya
approved these changes
Jul 4, 2023
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.