Skip to content
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

bump substrate to commit 59649dd #645

Merged
merged 18 commits into from
Feb 8, 2022
Merged

bump substrate to commit 59649dd #645

merged 18 commits into from
Feb 8, 2022

Conversation

haerdib
Copy link
Contributor

@haerdib haerdib commented Feb 4, 2022

@haerdib haerdib self-assigned this Feb 4, 2022
@haerdib haerdib changed the title bump substrate bump substrate to commit 59649dd Feb 8, 2022
Copy link
Contributor

@gaudenzkessler gaudenzkessler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

Copy link
Contributor

@murerfel murerfel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍 just have a few questions for my own understanding

sidechain/consensus/aura/src/lib.rs Show resolved Hide resolved
@haerdib haerdib marked this pull request as ready for review February 8, 2022 15:37
Copy link
Contributor

@gaudenzkessler gaudenzkessler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks still good

@haerdib haerdib merged commit 0f32411 into master Feb 8, 2022
@haerdib haerdib deleted the bh-bump-substrate branch February 8, 2022 16:05
haerdib added a commit to ajuna-network/worker that referenced this pull request Feb 10, 2022
* Make mu-ra and untrusted worker url queriable (integritee-network#595)

* extract request_keys() to separate file

* remove providr input, add dummy getter function

* add node_api worker_for_shard call

* fix error message

* add primitives cache and rpc call

* fix tests

* add primitives-cache to workspace

* fix unit tests

* remove obsolete .yml provider from request-keys cmd

* remove provider_addr from CI py scripts

* fix reported worker address

* improve usability of rpc-client

* make it work

* fix rebase error

* add some delay

* update local setup script

* remove ugly async worker url, replace with enclave getter function

* some steps towards a working exmaple..

* add peer_updater

* fix unit test

* fix some test clippy warnings

* fix function name

* fix client mu ra url

* fix comment

* fix comment

* rename state_sync to appropriate request keys

* fix comments and add missing _size to untrusted_worker_addr

* update cargo.lock after rebase

* fix typos

* rename store_peers to set_peers

* fix comment

* move set_primitives to primitves cache repository

* return read guard instead of primittves clone

* rename config worker_rpc_port to trusted_worker_port

* remove obsolete Error enum from request_keys.rs

* fix unit tests

* move thread spawning back into watch fn

* rename worker-rpc-port to trusted-worker-port

* readd external worker address

* fix unit tests

* fix unit test

* add external addresses, optional port input and unit tests

* update test names

* [cli.yml] update shorts

* fix local setup configs

* change untrusted worker port to w

* [sidechain] detect out of sync error (integritee-network#606)

* inital commit

* remove unwrap_err from assert_matches

* Update substrate sp-core to version 4.1.0-dev (integritee-network#612)

Co-authored-by: Gaudenz Kessler <gaudenz.kessler@scs.ch>

* Renaming of unspecific SB and PB variable names (integritee-network#605)

* some clean up & add hanlde import error

* remove logic changes

* fix unit tests

* [aura block importer] rename SidechainBlock to SignedSidechainBlock

* fix rebase errors

* [aura mock] rename xxT import to xxTrait

* [aura verifier] rename SidechainBlock to SignedSidechainblock where appropriate

* fix rebase errors

* [aura] rename Sidechainblock to SignedSidechainBlock

* rename SB & PB to full written version and adapt to SignedSidechainBlock Where necessary

* [sidechain block imported] remove extra generic from SignedParentchainBlock

* some further SB & PB clean up

* rename B & SB to SidechainBlock & SignedSidechainBlock

* some further renaming

* completely remove SB

* rename all left over PBs

* remove rebase error & rename to SignedSidechainBlock

* rename to SignedSidechainBlock

* Sidechain peer fetch blocks - RPC client/server (integritee-network#580)

* WIP: RPC call to fetch sidechain blocks

* WIP: sidechain peer fetch crate with RPC server and client impl

* WIP: test for RPC peer sidechain block fetching

* fix unit test

* remove obsolete comment

* fix rebase error

* cargo fmt

* fix tests

* fix Fixme + add som Send+Sync to errors

* update add_block_to_batch to return error. Otherwise silent fail

* small comment fixes

* make some comments better understandable

* remove FIXME comment

* remove new lines

* fix trailing comments

* [peer-fetch] change order or crates in .toml

* [sidechain storage] fix error message of HeaderAncestryMismatch

* [sidechain storage] exchange match statement with ok_or

* [sidechain storage] use temp-dir in tests

* [sidechain storage] remove extra genesis block check

* fix rebase errors

* remove untrstued url, replace with untrusted peer fetcher

* [sidechain storage] fix comment

* update delete_last_block description comment

* [sidechain storage] fix comment grammer

* move FetchUntrustedPeers trait to the top

* [FetchBlocksFromPeer] extend description comment

* update cargo.lock

* rename get_blocks_following to get_blocks_after

* rename get_blocks_following to get_blocks_after

* rename all leftover "blocks_following" to "block_after"

Co-authored-by: Bigna Härdi <bhaerdi@devsgx02.scs-ad.scs.ch>

* [Sidechain] Peer block fetching o-call implementation (integritee-network#619)

* introduce o-call for fetching sidechain blocks from peer
* re-name api-client-extensions to node-api-extensions

Sub-task of integritee-network#567

* add direct call rpc doc (integritee-network#620)

* add some doc

* add some structure to the links

* restructure rpc interface

* Update docs/README.md

Co-authored-by: gaudenzkessler <92718752+gaudenzkessler@users.noreply.github.com>

* adapt readmes according to review comments

Co-authored-by: gaudenzkessler <92718752+gaudenzkessler@users.noreply.github.com>

* [Sidechain] Peer sync and block production suspension (integritee-network#618)

Peer syncer implementation (not in use yet) and block production suspender (also not in use yet)

* update to most recent teaclave commit (integritee-network#624)

* Sync state from fellow validateer (integritee-network#615)

* rename request_keys to sync_state

* rename request_key_prov to request_state_prov

* rename request_keys.rs to sync_state.rs

* restructure key and state provisioning server

* some refactoring

* add TlsServer struct

* add test file

* rename key_provision_server to state_provisioning_server

* add unit test

* update unit test

* introduce mockable key handler struct

* shielding key success

* remove clippy warnings

* fix test

* add unit tests for KeyHandler

* rename to prepare for state inclusion

* rename seal_handler

* add shard as argument to sync state

* some more renaming

* add shard read & write process

* [SealHandler] add unit tests & fix state

* update networking test to include state

* add default shard

* add some documentation

* remove ugly for loop

* move authentications to separate file

* update comment

* remove obsolete, never ending loop

* add error logs

* remove extra phantom field

* add sgx feature flag

* remove global variables from test

* add join handle to test

* add some more logging info

* Change tokio runtime to use 2 worker threads. Gossiping spawns new tokio tasks. (integritee-network#626)

* Add state update sequence (integritee-network#632)

* add bock_import_sequence.svg

* move block_import.svg to docs/diagramms

* update diagramm

* add block import sequence

* RPC call to get metadata from sgx-runtime (integritee-network#642)

* RPC call to get metadata from sgx-runtime
- rcp call
- print sgx metadata cli

* Change from review: Metadata is already encoded

* Change from review

Co-authored-by: echevrier <edith.chevrier@scs.ch>

* bump substrate to commit 59649dd (integritee-network#645)

* update .tomls to new substrate versions

* cargo update

* RawEvent -> Event

* remove default from Accountid

* RawEvent -> Event

* cargo update enclave-runtime

* fix bump errors

* remove unused patch

* finaly compiling

* update sgx-runtime and substrate-api-client to github

* remove integritee-node-runtime patch

* cargo update -p std-std --precise 59649dd

* update Github Actions integritee node

* remove bh-config

* fix clippy

* fix cargo test

* update spec version

* update substrate-api-client

* update sgx-runtime source

* update substrate

* adjust node version values

* detect new game

* solve merge conflicts

* update sgx-runtime

* fix some things

* cargo format

Co-authored-by: gaudenzkessler <92718752+gaudenzkessler@users.noreply.github.com>
Co-authored-by: Gaudenz Kessler <gaudenz.kessler@scs.ch>
Co-authored-by: Felix Müller <mullefel@users.noreply.github.com>
Co-authored-by: echevrier <84318241+echevrier@users.noreply.github.com>
Co-authored-by: echevrier <edith.chevrier@scs.ch>
haerdib added a commit to ajuna-network/worker that referenced this pull request Feb 10, 2022
* Make mu-ra and untrusted worker url queriable (integritee-network#595)

* extract request_keys() to separate file

* remove providr input, add dummy getter function

* add node_api worker_for_shard call

* fix error message

* add primitives cache and rpc call

* fix tests

* add primitives-cache to workspace

* fix unit tests

* remove obsolete .yml provider from request-keys cmd

* remove provider_addr from CI py scripts

* fix reported worker address

* improve usability of rpc-client

* make it work

* fix rebase error

* add some delay

* update local setup script

* remove ugly async worker url, replace with enclave getter function

* some steps towards a working exmaple..

* add peer_updater

* fix unit test

* fix some test clippy warnings

* fix function name

* fix client mu ra url

* fix comment

* fix comment

* rename state_sync to appropriate request keys

* fix comments and add missing _size to untrusted_worker_addr

* update cargo.lock after rebase

* fix typos

* rename store_peers to set_peers

* fix comment

* move set_primitives to primitves cache repository

* return read guard instead of primittves clone

* rename config worker_rpc_port to trusted_worker_port

* remove obsolete Error enum from request_keys.rs

* fix unit tests

* move thread spawning back into watch fn

* rename worker-rpc-port to trusted-worker-port

* readd external worker address

* fix unit tests

* fix unit test

* add external addresses, optional port input and unit tests

* update test names

* [cli.yml] update shorts

* fix local setup configs

* change untrusted worker port to w

* [sidechain] detect out of sync error (integritee-network#606)

* inital commit

* remove unwrap_err from assert_matches

* Update substrate sp-core to version 4.1.0-dev (integritee-network#612)

Co-authored-by: Gaudenz Kessler <gaudenz.kessler@scs.ch>

* Renaming of unspecific SB and PB variable names (integritee-network#605)

* some clean up & add hanlde import error

* remove logic changes

* fix unit tests

* [aura block importer] rename SidechainBlock to SignedSidechainBlock

* fix rebase errors

* [aura mock] rename xxT import to xxTrait

* [aura verifier] rename SidechainBlock to SignedSidechainblock where appropriate

* fix rebase errors

* [aura] rename Sidechainblock to SignedSidechainBlock

* rename SB & PB to full written version and adapt to SignedSidechainBlock Where necessary

* [sidechain block imported] remove extra generic from SignedParentchainBlock

* some further SB & PB clean up

* rename B & SB to SidechainBlock & SignedSidechainBlock

* some further renaming

* completely remove SB

* rename all left over PBs

* remove rebase error & rename to SignedSidechainBlock

* rename to SignedSidechainBlock

* Sidechain peer fetch blocks - RPC client/server (integritee-network#580)

* WIP: RPC call to fetch sidechain blocks

* WIP: sidechain peer fetch crate with RPC server and client impl

* WIP: test for RPC peer sidechain block fetching

* fix unit test

* remove obsolete comment

* fix rebase error

* cargo fmt

* fix tests

* fix Fixme + add som Send+Sync to errors

* update add_block_to_batch to return error. Otherwise silent fail

* small comment fixes

* make some comments better understandable

* remove FIXME comment

* remove new lines

* fix trailing comments

* [peer-fetch] change order or crates in .toml

* [sidechain storage] fix error message of HeaderAncestryMismatch

* [sidechain storage] exchange match statement with ok_or

* [sidechain storage] use temp-dir in tests

* [sidechain storage] remove extra genesis block check

* fix rebase errors

* remove untrstued url, replace with untrusted peer fetcher

* [sidechain storage] fix comment

* update delete_last_block description comment

* [sidechain storage] fix comment grammer

* move FetchUntrustedPeers trait to the top

* [FetchBlocksFromPeer] extend description comment

* update cargo.lock

* rename get_blocks_following to get_blocks_after

* rename get_blocks_following to get_blocks_after

* rename all leftover "blocks_following" to "block_after"

Co-authored-by: Bigna Härdi <bhaerdi@devsgx02.scs-ad.scs.ch>

* [Sidechain] Peer block fetching o-call implementation (integritee-network#619)

* introduce o-call for fetching sidechain blocks from peer
* re-name api-client-extensions to node-api-extensions

Sub-task of integritee-network#567

* add direct call rpc doc (integritee-network#620)

* add some doc

* add some structure to the links

* restructure rpc interface

* Update docs/README.md

Co-authored-by: gaudenzkessler <92718752+gaudenzkessler@users.noreply.github.com>

* adapt readmes according to review comments

Co-authored-by: gaudenzkessler <92718752+gaudenzkessler@users.noreply.github.com>

* [Sidechain] Peer sync and block production suspension (integritee-network#618)

Peer syncer implementation (not in use yet) and block production suspender (also not in use yet)

* update to most recent teaclave commit (integritee-network#624)

* Sync state from fellow validateer (integritee-network#615)

* rename request_keys to sync_state

* rename request_key_prov to request_state_prov

* rename request_keys.rs to sync_state.rs

* restructure key and state provisioning server

* some refactoring

* add TlsServer struct

* add test file

* rename key_provision_server to state_provisioning_server

* add unit test

* update unit test

* introduce mockable key handler struct

* shielding key success

* remove clippy warnings

* fix test

* add unit tests for KeyHandler

* rename to prepare for state inclusion

* rename seal_handler

* add shard as argument to sync state

* some more renaming

* add shard read & write process

* [SealHandler] add unit tests & fix state

* update networking test to include state

* add default shard

* add some documentation

* remove ugly for loop

* move authentications to separate file

* update comment

* remove obsolete, never ending loop

* add error logs

* remove extra phantom field

* add sgx feature flag

* remove global variables from test

* add join handle to test

* add some more logging info

* Change tokio runtime to use 2 worker threads. Gossiping spawns new tokio tasks. (integritee-network#626)

* Add state update sequence (integritee-network#632)

* add bock_import_sequence.svg

* move block_import.svg to docs/diagramms

* update diagramm

* add block import sequence

* RPC call to get metadata from sgx-runtime (integritee-network#642)

* RPC call to get metadata from sgx-runtime
- rcp call
- print sgx metadata cli

* Change from review: Metadata is already encoded

* Change from review

Co-authored-by: echevrier <edith.chevrier@scs.ch>

* bump substrate to commit 59649dd (integritee-network#645)

* update .tomls to new substrate versions

* cargo update

* RawEvent -> Event

* remove default from Accountid

* RawEvent -> Event

* cargo update enclave-runtime

* fix bump errors

* remove unused patch

* finaly compiling

* update sgx-runtime and substrate-api-client to github

* remove integritee-node-runtime patch

* cargo update -p std-std --precise 59649dd

* update Github Actions integritee node

* remove bh-config

* fix clippy

* fix cargo test

* update spec version

* update substrate-api-client

* update sgx-runtime source

* update substrate

* adjust node version values

* detect new game

* solve merge conflicts

* update sgx-runtime

* fix some things

* cargo format

Co-authored-by: haerdib <73821294+haerdib@users.noreply.github.com>
Co-authored-by: Gaudenz Kessler <gaudenz.kessler@scs.ch>
Co-authored-by: Felix Müller <mullefel@users.noreply.github.com>
Co-authored-by: Bigna Härdi <bhaerdi@devsgx02.scs-ad.scs.ch>
Co-authored-by: echevrier <84318241+echevrier@users.noreply.github.com>
Co-authored-by: echevrier <edith.chevrier@scs.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade worker to recent substrate commit
3 participants