[5 / 5] Introduce approval-voting-parallel

.gitlab/pipeline/zombienet/polkadot.yml

@@ -216,6 +216,14 @@ zombienet-polkadot-functional-0015-coretime-shared-core:
       --local-dir="${LOCAL_DIR}/functional"
       --test="0015-coretime-shared-core.zndsl"
 
+zombienet-polkadot-functional-0016-approval-voting-parallel:
+  extends:
+    - .zombienet-polkadot-common
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+      --local-dir="${LOCAL_DIR}/functional"
+      --test="0016-approval-voting-parallel.zndsl"
+
 zombienet-polkadot-smoke-0001-parachains-smoke-test:
   extends:
     - .zombienet-polkadot-common

Cargo.toml

@@ -158,6 +158,7 @@ members = [
 	"polkadot/erasure-coding/fuzzer",
 	"polkadot/node/collation-generation",
 	"polkadot/node/core/approval-voting",
+	"polkadot/node/core/approval-voting-parallel",
 	"polkadot/node/core/av-store",
 	"polkadot/node/core/backing",
 	"polkadot/node/core/bitfield-signing",
@@ -1029,6 +1030,7 @@ polkadot-gossip-support = { path = "polkadot/node/network/gossip-support", defau
 polkadot-network-bridge = { path = "polkadot/node/network/bridge", default-features = false }
 polkadot-node-collation-generation = { path = "polkadot/node/collation-generation", default-features = false }
 polkadot-node-core-approval-voting = { path = "polkadot/node/core/approval-voting", default-features = false }
+polkadot-node-core-approval-voting-parallel = { path = "polkadot/node/core/approval-voting-parallel", default-features = false }
 polkadot-node-core-av-store = { path = "polkadot/node/core/av-store", default-features = false }
 polkadot-node-core-backing = { path = "polkadot/node/core/backing", default-features = false }
 polkadot-node-core-bitfield-signing = { path = "polkadot/node/core/bitfield-signing", default-features = false }

cumulus/client/relay-chain-inprocess-interface/src/lib.rs

@@ -350,6 +350,7 @@ fn build_polkadot_full_node(
 			execute_workers_max_num: None,
 			prepare_workers_hard_max_num: None,
 			prepare_workers_soft_max_num: None,
+			enable_approval_voting_parallel: false,
 		},
 	)?;
 

polkadot/cli/src/cli.rs

@@ -151,6 +151,12 @@ pub struct RunCmd {
 	/// TESTING ONLY: disable the version check between nodes and workers.
 	#[arg(long, hide = true)]
 	pub disable_worker_version_check: bool,
+
+	/// Enable approval-voting message processing in parallel.
+	///
+	///**Dangerous!** This is an experimental feature and should not be used in production.
+	#[arg(long)]
+	pub enable_approval_voting_parallel: bool,
 }
 
 #[allow(missing_docs)]

polkadot/cli/src/command.rs

@@ -256,6 +256,7 @@ where
 				execute_workers_max_num: cli.run.execute_workers_max_num,
 				prepare_workers_hard_max_num: cli.run.prepare_workers_hard_max_num,
 				prepare_workers_soft_max_num: cli.run.prepare_workers_soft_max_num,
+				enable_approval_voting_parallel: cli.run.enable_approval_voting_parallel,
 			},
 		)
 		.map(|full| full.task_manager)?;
@@ -373,16 +374,16 @@ pub fn run() -> Result<()> {
 			Ok(runner.async_run(|mut config| {
 				let (client, backend, _, task_manager) =
 					polkadot_service::new_chain_ops(&mut config, None)?;
+				let task_handle = task_manager.spawn_handle();
 				let aux_revert = Box::new(|client, backend, blocks| {
-					polkadot_service::revert_backend(client, backend, blocks, config).map_err(
-						|err| {
+					polkadot_service::revert_backend(client, backend, blocks, config, task_handle)
+						.map_err(|err| {
 							match err {
 								polkadot_service::Error::Blockchain(err) => err.into(),
 								// Generic application-specific error.
 								err => sc_cli::Error::Application(err.into()),
 							}
-						},
-					)
+						})
 				});
 				Ok((
 					cmd.run(client, backend, Some(aux_revert)).map_err(Error::SubstrateCli),

polkadot/node/core/approval-voting-parallel/Cargo.toml

@@ -0,0 +1,67 @@
+[package]
+name = "polkadot-node-core-approval-voting-parallel"
+version = "7.0.0"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+description = "Approval Voting Subsystem running approval work in parallel"
+
+[lints]
+workspace = true
+
+[dependencies]
+futures = "0.3.30"
+futures-timer = "3.0.2"
+codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["bit-vec", "derive"] }
+gum = { package = "tracing-gum", path = "../../gum" }
+bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
+schnellru = "0.2.1"
+merlin = "3.0"
+schnorrkel = "0.11.4"
+kvdb = "0.13.0"
+derive_more = "0.99.17"
+thiserror = { workspace = true }
+itertools = "0.11"
+async-trait = { workspace = true }
+
+polkadot-node-core-approval-voting = {  workspace = true, default-features = true }
+polkadot-approval-distribution = {  workspace = true, default-features = true }
+
+
+polkadot-node-subsystem = {  workspace = true, default-features = true }
+polkadot-node-subsystem-util = {  workspace = true, default-features = true }
+polkadot-overseer = { workspace = true, default-features = true  }
+polkadot-primitives = {  workspace = true, default-features = true  }
+polkadot-node-primitives = {  workspace = true, default-features = true }
+polkadot-node-jaeger = {  workspace = true, default-features = true }
+
+sc-keystore = {  workspace = true, default-features = false }
+sp-consensus = { workspace = true, default-features = false }
+sp-consensus-slots = {  workspace = true, default-features = false }
+sp-application-crypto = {  workspace = true, default-features = false, features = ["full_crypto"] }
+sp-runtime = {  workspace = true, default-features = false }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-metrics = { workspace = true, default-features = true}
+
+rand = "0.8.5"
+
+# rand_core should match schnorrkel
+rand_core = "0.6.2"
+rand_chacha = { version = "0.3.1" }
+
+[dev-dependencies]
+async-trait = "0.1.79"
+parking_lot = "0.12.1"
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = {workspace = true, default-features = true}
+sp-core = { workspace = true, default-features = true}
+sp-consensus-babe = { workspace = true, default-features = true }
+polkadot-node-subsystem-test-helpers = { workspace = true, default-features = true}
+assert_matches = "1.4.0"
+kvdb-memorydb = "0.13.0"
+polkadot-primitives-test-helpers = { workspace = true, default-features = true }
+log = { workspace = true, default-features = true }
+env_logger = "0.11"
+
+polkadot-subsystem-bench = { workspace = true, default-features = true}
+