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

Aura: Do not verify on state import #13058

Merged
merged 4 commits into from
Jan 4, 2023
Merged

Aura: Do not verify on state import #13058

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e1a9ec
Aura: Do not verify on state import
bkchr Jan 3, 2023
a4b62ce
Skip checks as well for gap sync
bkchr Jan 4, 2023
28b6c17
Update client/consensus/aura/src/import_queue.rs
bkchr Jan 4, 2023
5d4f44e
Review comment
bkchr Jan 4, 2023
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
21 changes: 20 additions & 1 deletion client/consensus/aura/src/import_queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ where
#[async_trait::async_trait]
impl<B: BlockT, C, P, CIDP> Verifier<B> for AuraVerifier<C, P, CIDP, NumberFor<B>>
where
C: ProvideRuntimeApi<B> + Send + Sync + sc_client_api::backend::AuxStore,
C: ProvideRuntimeApi<B> + Send + Sync + sc_client_api::backend::AuxStore + HeaderBackend<B>,
C::Api: BlockBuilderApi<B> + AuraApi<B, AuthorityId<P>> + ApiExt<B>,
P: Pair + Send + Sync + 'static,
P::Public: Send + Sync + Hash + Eq + Clone + Decode + Encode + Debug + 'static,
Expand All @@ -186,6 +186,25 @@ where
&mut self,
mut block: BlockImportParams<B, ()>,
) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
// When importing whole state we don't verify the seal as the state is not available.
if block.with_state() {
return Ok((block, Default::default()))
}

let info = self.client.info();

// If we are importing a block in the gap, we skip all checks.
//
// It is expected that the block after the gap was checked/chosen properly, e.g. by warp
// syncing to this block.
if info
Copy link
Member

Choose a reason for hiding this comment

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

Instead of checking for gaps specifically, just check for block.state_action.skip_execution_checks()
It returns true when all checks that involve calling into parent runtime should be skipped.

Copy link
Member

Choose a reason for hiding this comment

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

Might as well remove the same check on line 249 below.

.block_gap
.map(|(start, end)| start <= *block.header.number() && *block.header.number() <= end)
.unwrap_or(false)
{
return Ok((block, Default::default()))
}

let hash = block.header.hash();
let parent_hash = *block.header.parent_hash();
let authorities = authorities(
Expand Down