[Sidechain] Integration of the peer sync mechanism by murerfel · Pull Request #627 · integritee-network/worker

murerfel · 2022-01-24T16:04:40Z

Description

Part of #567 - integrating all parts in order to have a working setup where blocks are peer fetched on a worker that joins later, and then continues to synchronize using block gossiping.

Important workflow changes

When importing a sidechain block, we peek the parentchain block from the queue, then verify the sidechain block and only then import the parentchain block.
- Split verification and state update when importing a sidechain block
Sidechain blocks are now imported as a first step in the sidechain block production loop. Instead of importing them when they are gossiped.
- Gossiping sidechain blocks happens asynchronously and only fills an import queue
- Importing sidechain blocks potentially also imports parentchain blocks. The latest imported parentchain header is communicated back to aura
- When the import fails because of a header ancestry, or invalid first block error, we attempt to fetch and import the sidechain block
Sidechain block verifier specifically checks if a block was already imported

Closes #567

Workflow documentation (activity diagrams)

This is an updated version of the activity diagrams in #567 and document the current workflow activity for:

Sidechain production loop. Contains the block import loop action as well, but in a compact form. All the details are found in the dedicated diagram for the import (below).
Sidechain block import loop

Sidechain block production

Sidechain block import

murerfel

This is a far larger PR than originally intended. The integration of the whole sidechain synchronization required quite a few more changes than anticipated. So I added a couple of comments to hopefully help our reviewers 😄

Cargo.lock

core-primitives/block-import-queue/src/block_import_queue.rs

core-primitives/enclave-api/ffi/src/lib.rs

core/parentchain/block-importer/src/block_importer.rs

enclave-runtime/src/lib.rs

sidechain/consensus/aura/src/verifier.rs

sidechain/consensus/common/src/block_import.rs

sidechain/consensus/common/src/block_import_queue_worker.rs

sidechain/consensus/common/src/block_production_suspension.rs

sidechain/storage/src/storage.rs

murerfel

More explanations on the changes I've made.

.github/workflows/build_and_test.yml

cli/demo_direct_call.sh

local-setup/py/worker.py

scripts/m8.sh

.github/workflows/build_and_test.yml

cli/demo_sidechain.sh

murerfel · 2022-01-26T08:16:49Z

Currently working on the activity diagrams for the block production loop and sidechain block import loop. Will add them to the description here.

haerdib

Some remarks, but veery good job on making this work!

PS: Could you add this PR link to the README? https://github.com/integritee-network/worker/blob/master/docs/README.md

cli/demo_sidechain.sh

core-primitives/block-import-queue/src/block_import_queue.rs

core-primitives/block-import-queue/src/lib.rs

core-primitives/enclave-api/ffi/src/lib.rs

local-setup/py/worker.py

sidechain/consensus/aura/src/verifier.rs

sidechain/consensus/common/src/peer_block_sync.rs

sidechain/storage/src/storage.rs

sidechain/consensus/aura/src/verifier.rs

clangenb

Looks very good to me!

Cargo.lock

cli/demo_sidechain.sh

core-primitives/enclave-api/ffi/src/lib.rs

clangenb · 2022-02-07T10:13:34Z

core/parentchain/block-import-dispatcher/src/triggered_dispatcher.rs

 }

+/// Trait to peek the queue, without mutating it.
+pub trait PeekParentchainBlockImportQueue<SignedBlockType> {


I second that question

enclave-runtime/src/top_pool_execution.rs

local-setup/py/worker.py

haerdib

Looks good, thanks for the effort !

haerdib · 2022-02-08T07:53:51Z

core/parentchain/block-import-dispatcher/src/triggered_dispatcher.rs

 }

+/// Trait to peek the queue, without mutating it.
+pub trait PeekParentchainBlockImportQueue<SignedBlockType> {


Ok, then that's fine. Thanks for the explanation :)

haerdib · 2022-02-08T07:55:00Z

docs/README.md

 - Sidechain functionality: https://polkadot.polkassembly.io/post/111
- Sidechain flow: https://github.com/integritee-network/worker/issues/567
- Peer sync and block production suspension for sidechain: https://github.com/integritee-network/worker/pull/618
+- Sidechain flow: https://github.com/integritee-network/worker/pull/627


Thanks 👍

light client is initialized

… after" This reverts commit 911d9697d7a4cc892631543ee1f457d482e3dc8a.

uses ocall api

…n startup

…ead pool to size 2

…duction loop

also need to update latest parentchain header after each sidechain block import when fetching from peer

…rflow

… logs on M6

…scripts

…ect_call.sh

…to 150s

murerfel self-assigned this Jan 24, 2022

murerfel mentioned this pull request Jan 24, 2022

Change slot claim strategy to RoundRobin #577

Closed

murerfel commented Jan 25, 2022

View reviewed changes

.github/workflows/build_and_test.yml Outdated Show resolved Hide resolved

cli/demo_direct_call.sh Show resolved Hide resolved

local-setup/py/worker.py Show resolved Hide resolved

scripts/m8.sh Show resolved Hide resolved

murerfel marked this pull request as ready for review January 26, 2022 06:33

murerfel requested review from clangenb and haerdib January 26, 2022 06:33

murerfel commented Jan 26, 2022

View reviewed changes

.github/workflows/build_and_test.yml Show resolved Hide resolved

murerfel commented Jan 26, 2022

View reviewed changes

.github/workflows/build_and_test.yml Show resolved Hide resolved

murerfel commented Jan 26, 2022

View reviewed changes

cli/demo_sidechain.sh Outdated Show resolved Hide resolved

haerdib reviewed Jan 26, 2022

View reviewed changes

This was referenced Jan 26, 2022

Create Documentation KnowHowDump #431

Closed

Add state update sequence #632

Merged

murerfel force-pushed the feature/fm-peer-block-sync-integration branch from 026eb65 to 4ede153 Compare February 7, 2022 07:05

clangenb approved these changes Feb 7, 2022

View reviewed changes

murerfel mentioned this pull request Feb 8, 2022

Prometheus metrics integration #646

Merged

1 task

haerdib approved these changes Feb 8, 2022

View reviewed changes

Felix Müller added 12 commits February 9, 2022 07:22

WIP: integrate sidechain block syncer

74b560f

Start sidechain block import and direct invocation RPC server after

0b0ba1e

light client is initialized

Change slot claim strategy to round robin

c00b97f

Revert "Start sidechain block import and direct invocation RPC server…

a5b5333

… after" This reverts commit 911d9697d7a4cc892631543ee1f457d482e3dc8a.

integrate peer block fetching in the peer block syncer

ecd205d

uses ocall api

sidechain block production is suspended for non-primary validateers o…

0393d66

…n startup

Detect additional import error, when expecting first block

1a72541

execute peer fetch in local executor, don't spawn new tokio runtime

70a1ae7

More logging for peer fetching / sidechain syncing workflow

922bf25

Spawn separate tasks for gossiping sidechain blocks, reduce tokio thr…

5a82615

…ead pool to size 2

Move block-import-queue to primitives crate and re-use it in sidechain

851dd87

use the import queue for sidechain blocks and import during block pro…

0178b73

…duction loop

Felix Müller added 20 commits February 9, 2022 07:24

add sleep before running the block production cycle

51bd33d

use tokio handle in sidechain ocall and improve error logging

b0b3955

When peer block syncing returns an error, don't produce a block

edc66ab

parentchain block is peeked before imported

8e82d24

also need to update latest parentchain header after each sidechain block import when fetching from peer

fix clippy

ffe6db4

parentchain header is updated along the sidechain block production wo…

32e0b25

…rflow

more logging in aura

6cfcfb8

minor fix in comment of m6 script

042974d

temporarily change log level to warning (from info) in hope to get CI…

ae8cc4f

… logs on M6

set mura port for CI worker setup

1ec2d64

fix comment typos

2f103f1

increase time for CI setup between running workers and starting demo …

e64f2ef

…scripts

run m8 direct invocation on worker 2 for the second call

d9fb501

add delay between transfer of tokens and executing getter in demo_dir…

e9fc11b

…ect_call.sh

add sidechain integration test (and demo)

b49b46f

increase time between launching local setup and running test scripts …

a6ad4a6

…to 150s

pr comment fixes

4696252

more pr comment fixes

02e06be

add doc comments for global components in enclave

9eb189d

remove is_primary_validateer flag from init_light_client()

0e674cb

murerfel force-pushed the feature/fm-peer-block-sync-integration branch from 3d2be2a to 0e674cb Compare February 9, 2022 06:26

murerfel merged commit 1af78af into master Feb 9, 2022

murerfel deleted the feature/fm-peer-block-sync-integration branch February 9, 2022 08:21

murerfel mentioned this pull request Feb 14, 2022

[GA] the worker logs consistently fail to upload #575

Closed

Conversation

murerfel commented Jan 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Important workflow changes

Workflow documentation (activity diagrams)

Sidechain block production

Sidechain block import

Uh oh!

murerfel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

murerfel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

murerfel commented Jan 26, 2022

Uh oh!

haerdib left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

clangenb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

clangenb Feb 7, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

haerdib left a comment

Choose a reason for hiding this comment

Uh oh!

haerdib Feb 8, 2022

Choose a reason for hiding this comment

Uh oh!

haerdib Feb 8, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

murerfel commented Jan 24, 2022 •

edited

Loading