From 1dcff3df39b85fa43c7ca1dafe10f802cd812234 Mon Sep 17 00:00:00 2001
From: Sebastian Kunert <skunert49@gmail.com>
Date: Mon, 6 Jan 2025 14:09:06 +0100
Subject: [PATCH] Avoid incomplete block import pipeline with full verifying
import queue (#7050)
## Problem
In the parachain template we use the [fully verifying import queue
](https://github.com/paritytech/polkadot-sdk/blob/3d9eddbeb262277c79f2b93b9efb5af95a3a35a8/cumulus/client/consensus/aura/src/equivocation_import_queue.rs#L224-L224)
which does extra equivocation checks.
However, when we import a warp synced block with state, we don't set a
fork choice, leading to an incomplete block import pipeline and error
here:
https://github.com/paritytech/polkadot-sdk/blob/3d9eddbeb262277c79f2b93b9efb5af95a3a35a8/substrate/client/service/src/client/client.rs#L488-L488
This renders warp sync useless for chains using this import queue.
## Fix
The fix is to always import a block with state as best block, as we
already do in the normal Aura Verifier.
In a follow up we should also take another look into unifying the usage
of the different import queues.
fixes https://github.com/paritytech/project-mythical/issues/256
---------
Co-authored-by: command-bot <>
---
.../consensus/aura/src/equivocation_import_queue.rs | 1 +
prdoc/pr_7050.prdoc | 11 +++++++++++
2 files changed, 12 insertions(+)
create mode 100644 prdoc/pr_7050.prdoc
diff --git a/cumulus/client/consensus/aura/src/equivocation_import_queue.rs b/cumulus/client/consensus/aura/src/equivocation_import_queue.rs
index 68f2d37c874..dbd9d5ba6a6 100644
--- a/cumulus/client/consensus/aura/src/equivocation_import_queue.rs
+++ b/cumulus/client/consensus/aura/src/equivocation_import_queue.rs
@@ -97,6 +97,7 @@ where
// This is done for example when gap syncing and it is expected that the block after the gap
// was checked/chosen properly, e.g. by warp syncing to this block using a finality proof.
if block_params.state_action.skip_execution_checks() || block_params.with_state() {
+ block_params.fork_choice = Some(ForkChoiceStrategy::Custom(block_params.with_state()));
return Ok(block_params)
}
diff --git a/prdoc/pr_7050.prdoc b/prdoc/pr_7050.prdoc
new file mode 100644
index 00000000000..da9dd808033
--- /dev/null
+++ b/prdoc/pr_7050.prdoc
@@ -0,0 +1,11 @@
+title: Avoid incomplete block import pipeline with full verifying import queue
+doc:
+- audience: Node Dev
+ description: |-
+ When warp syncing a node using the equivocation checking verifier, we now properly set the fork_choice rule.
+ Affected are mostly nodes that are derived from the parachain template. Omni-node is not affected.
+
+ The prevents the error `ClientImport("Incomplete block import pipeline.")` after state sync.
+crates:
+- name: cumulus-client-consensus-aura
+ bump: patch
--
GitLab