Merge branch 'master' into ao-disputes-offences-runtime

* master:
  Use correct file header for 'benchmark overhead' (#5984)
  [Substrate Companion] Part 1: add TargetList for validator ranking (#5930)
  Bump blake2 from 0.10.2 to 0.10.4 (#6019)
  node/core/pvf: strip some deps (#6016)
  Bump enumn from 0.1.4 to 0.1.5 (#5938)
  Co #11976: Enable rust features (#5983)
  update memory-lru:0.1.1 (#6012)
  Companion for paritytech/substrate#12219 (#5987)
  Remove CanAuthorWith trait (#5986)
  Update cid to 0.8.6 (#5994)
  Update Westend Trusted Teleporters (#5985)
  Companion for #11981 (#5915)
  update weights (sync with v0.9.29) (#5989)
  remove stale polkadot call filter (#5969)
  Sync versions with current release (v0.9.29) (#5982)

Cargo.toml

@@ -6,7 +6,7 @@ path = "src/main.rs"
 name = "polkadot"
 description = "Implementation of a `https://polkadot.network` node in Rust based on the Substrate framework."
 license = "GPL-3.0-only"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 rust-version = "1.57.0" # custom profiles

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-cli"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Polkadot Relay-chain Client Node"
 edition = "2021"

cli/src/command.rs

@@ -512,6 +512,15 @@ pub fn run() -> Result<()> {
 			let chain_spec = &runner.config().chain_spec;
 
 			match cmd {
+				#[cfg(not(feature = "runtime-benchmarks"))]
+				BenchmarkCmd::Storage(_) =>
+					return Err(sc_cli::Error::Input(
+						"Compile with --features=runtime-benchmarks \
+						to enable storage benchmarks."
+							.into(),
+					)
+					.into()),
+				#[cfg(feature = "runtime-benchmarks")]
 				BenchmarkCmd::Storage(cmd) => runner.sync_run(|mut config| {
 					let (client, backend, _, _) = service::new_chain_ops(&mut config, None)?;
 					let db = backend.expose_db();

core-primitives/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-core-primitives"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

erasure-coding/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-erasure-coding"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

erasure-coding/fuzzer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "erasure_coding_fuzzer"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-client"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/client/src/benchmarking.rs

@@ -49,9 +49,9 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder {
 	fn build(&self, nonce: u32) -> std::result::Result<OpaqueExtrinsic, &'static str> {
 		with_client! {
 			self.client.as_ref(), client, {
-				use runtime::{Call, SystemCall};
+				use runtime::{RuntimeCall, SystemCall};
 
-				let call = Call::System(SystemCall::remark { remark: vec![] });
+				let call = RuntimeCall::System(SystemCall::remark { remark: vec![] });
 				let signer = Sr25519Keyring::Bob.pair();
 
 				let period = polkadot_runtime_common::BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64;
@@ -92,9 +92,9 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder {
 	fn build(&self, nonce: u32) -> std::result::Result<OpaqueExtrinsic, &'static str> {
 		with_client! {
 			self.client.as_ref(), client, {
-				use runtime::{Call, BalancesCall};
+				use runtime::{RuntimeCall, BalancesCall};
 
-				let call = Call::Balances(BalancesCall::transfer_keep_alive {
+				let call = RuntimeCall::Balances(BalancesCall::transfer_keep_alive {
 					dest: self.dest.clone().into(),
 					value: self.value.into(),
 				});
@@ -113,14 +113,14 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder {
 ///
 /// Should only be used for benchmarking since it makes strong assumptions
 /// about the chain state that these calls will be valid for.
-trait BenchmarkCallSigner<Call: Encode + Clone, Signer: Pair> {
+trait BenchmarkCallSigner<RuntimeCall: Encode + Clone, Signer: Pair> {
 	/// Signs a call together with the signed extensions of the specific runtime.
 	///
 	/// Only works if the current block is the genesis block since the
 	/// `CheckMortality` check is mocked by using the genesis block.
 	fn sign_call(
 		&self,
-		call: Call,
+		call: RuntimeCall,
 		nonce: u32,
 		current_block: u64,
 		period: u64,
@@ -130,12 +130,12 @@ trait BenchmarkCallSigner<Call: Encode + Clone, Signer: Pair> {
 }
 
 #[cfg(feature = "polkadot")]
-impl BenchmarkCallSigner<polkadot_runtime::Call, sp_core::sr25519::Pair>
+impl BenchmarkCallSigner<polkadot_runtime::RuntimeCall, sp_core::sr25519::Pair>
 	for FullClient<polkadot_runtime::RuntimeApi, PolkadotExecutorDispatch>
 {
 	fn sign_call(
 		&self,
-		call: polkadot_runtime::Call,
+		call: polkadot_runtime::RuntimeCall,
 		nonce: u32,
 		current_block: u64,
 		period: u64,
@@ -186,12 +186,12 @@ impl BenchmarkCallSigner<polkadot_runtime::Call, sp_core::sr25519::Pair>
 }
 
 #[cfg(feature = "westend")]
-impl BenchmarkCallSigner<westend_runtime::Call, sp_core::sr25519::Pair>
+impl BenchmarkCallSigner<westend_runtime::RuntimeCall, sp_core::sr25519::Pair>
 	for FullClient<westend_runtime::RuntimeApi, WestendExecutorDispatch>
 {
 	fn sign_call(
 		&self,
-		call: westend_runtime::Call,
+		call: westend_runtime::RuntimeCall,
 		nonce: u32,
 		current_block: u64,
 		period: u64,
@@ -240,12 +240,12 @@ impl BenchmarkCallSigner<westend_runtime::Call, sp_core::sr25519::Pair>
 }
 
 #[cfg(feature = "kusama")]
-impl BenchmarkCallSigner<kusama_runtime::Call, sp_core::sr25519::Pair>
+impl BenchmarkCallSigner<kusama_runtime::RuntimeCall, sp_core::sr25519::Pair>
 	for FullClient<kusama_runtime::RuntimeApi, KusamaExecutorDispatch>
 {
 	fn sign_call(
 		&self,
-		call: kusama_runtime::Call,
+		call: kusama_runtime::RuntimeCall,
 		nonce: u32,
 		current_block: u64,
 		period: u64,
@@ -294,12 +294,12 @@ impl BenchmarkCallSigner<kusama_runtime::Call, sp_core::sr25519::Pair>
 }
 
 #[cfg(feature = "rococo")]
-impl BenchmarkCallSigner<rococo_runtime::Call, sp_core::sr25519::Pair>
+impl BenchmarkCallSigner<rococo_runtime::RuntimeCall, sp_core::sr25519::Pair>
 	for FullClient<rococo_runtime::RuntimeApi, RococoExecutorDispatch>
 {
 	fn sign_call(
 		&self,
-		call: rococo_runtime::Call,
+		call: rococo_runtime::RuntimeCall,
 		nonce: u32,
 		current_block: u64,
 		period: u64,

node/collation-generation/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-collation-generation"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/approval-voting/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-approval-voting"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/av-store/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-av-store"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/backing/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-backing"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/bitfield-signing/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-bitfield-signing"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/candidate-validation/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-candidate-validation"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/chain-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-chain-api"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/chain-selection/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-node-core-chain-selection"
 description = "Chain Selection Subsystem"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/dispute-coordinator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/parachains-inherent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-parachains-inherent"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/provisioner/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-provisioner"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/pvf-checker/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-pvf-checker"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/core/pvf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-pvf"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 
@@ -24,7 +24,7 @@ rayon = "1.5.1"
 parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] }
 polkadot-parachain = { path = "../../../parachain" }
 polkadot-core-primitives = { path = "../../../core-primitives" }
-polkadot-node-subsystem-util = { path = "../../subsystem-util"}
+polkadot-node-metrics = { path = "../../metrics"}
 sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-executor-wasmtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "master" }

node/core/pvf/src/metrics.rs

@@ -16,7 +16,7 @@
 
 //! Prometheus metrics related to the validation host.
 
-use polkadot_node_subsystem_util::metrics::{self, prometheus};
+use polkadot_node_metrics::metrics::{self, prometheus};
 
 /// Validation host metrics.
 #[derive(Default, Clone)]

node/core/runtime-api/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "polkadot-node-core-runtime-api"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 
 [dependencies]
 futures = "0.3.21"
 gum = { package = "tracing-gum", path = "../../gum" }
-memory-lru = "0.1.0"
+memory-lru = "0.1.1"
 parity-util-mem = { version = "0.11.0", default-features = false }
 
 sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }

node/gum/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tracing-gum"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 description = "Stick logs together with the TraceID as provided by tempo"

node/gum/proc-macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tracing-gum-proc-macro"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 description = "Generate an overseer including builder pattern and message wrapper from a single annotated struct definition."

node/jaeger/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-jaeger"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 description = "Polkadot Jaeger primitives, but equally useful for Grafana/Tempo"

node/malus/Cargo.toml

@@ -2,7 +2,7 @@
 name = "polkadot-test-malus"
 description = "Misbehaving nodes for local testnets, system and Simnet tests."
 license = "GPL-3.0-only"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 readme = "README.md"

node/metrics/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-metrics"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 description = "Subsystem metric helpers"

node/network/approval-distribution/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-approval-distribution"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/network/availability-distribution/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-availability-distribution"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/network/availability-recovery/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-availability-recovery"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/network/bitfield-distribution/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-availability-bitfield-distribution"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/network/bridge/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-network-bridge"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 

node/network/collator-protocol/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-collator-protocol"
-version = "0.9.28"
+version = "0.9.29"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"