Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

BABE's revert procedure #11022

Merged
paritytech-processbot merged 15 commits into from
Mar 24, 2022
Merged

BABE's revert procedure #11022

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a80baae
First rough draft for BABE revert
davxy Mar 8, 2022
a494b12
Proper babe revert test
davxy Mar 14, 2022
e8c1640
Merge branch 'master' into davxy-revert-command-fix
davxy Mar 14, 2022
3e95228
Cleanup
davxy Mar 14, 2022
cbbd61f
Test trivial cleanup
davxy Mar 14, 2022
301f55a
Fix to make clippy happy
davxy Mar 14, 2022
2cf3e1c
Check polkadot companion
davxy Mar 14, 2022
71ae24d
Check cumulus companion
davxy Mar 15, 2022
c052a28
Remove babe's blocks weight on revert
davxy Mar 16, 2022
81f8f85
Handle "empty" blockchain edge case
davxy Mar 16, 2022
a418f81
Run companions
davxy Mar 16, 2022
de1ede9
Simplify the filter predicate
davxy Mar 23, 2022
41b192e
Saturating sub is not required
davxy Mar 23, 2022
042b0ea
Run pipeline
davxy Mar 23, 2022
b9d1549
Run pipeline again...
davxy Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleanup
  • Loading branch information
@davxy
davxy committed Mar 14, 2022
commit 3e95228011917feb41d25bd08232e669261cfcac
6 changes: 2 additions & 4 deletions bin/node/cli/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,8 @@ pub fn run() -> Result<()> {
let PartialComponents { client, task_manager, backend, .. } = new_partial(&config)?;
let client_clone = client.clone();
let revert_aux = Box::new(move |blocks| {
sc_consensus_babe::revert::<node_primitives::Block, service::FullClient>(
client_clone,
blocks,
)?;
sc_consensus_babe::revert(client_clone, blocks)?;
// TODO: grandpa
Ok(())
});

Expand Down
1 change: 1 addition & 0 deletions client/cli/src/commands/revert_cmd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ pub struct RevertCmd {
pub pruning_params: PruningParams,
}

/// Revert handler for auxiliary data (e.g. consensus).
type AuxRevertHandler<B> = Box<dyn FnOnce(NumberFor<B>) -> error::Result<()>>;
Copy link
Member Author

@davxy davxy Mar 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

The aux data revert can be made atomic by returning a Vec<(Vec<u8>, Option<Vec<u8>>)>.

This vector has the same purpose of BlockImportParams::auxiliary for block import, i.e. perform a bunch of operations on aux data atomically together with blockchain state operations.

The only drawback is that currently the blockchain state is reverted one block at a time (see here). If we want an "atomic" revert of "aux-data + blockchain-state" then we will have to call AuxRevertHandler multiple times as well (once for each reverted block)

Copy link
Contributor

@wigy-opensource-developer wigy-opensource-developer Mar 16, 2022

Choose a reason for hiding this comment

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

I am surprised we do not support begin/commit/rollback transaction for batching multiple mutations across aux and main state storage already.


impl RevertCmd {
Expand Down