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

Commit 918b4ca

Browse files
ordianordian
committed
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)
2 parents e87cc9c + bc0cc9d commit 918b4ca

File tree

291 files changed

+4423
-4033
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

291 files changed

+4423
-4033
lines changed

‎Cargo.lock

+508-347
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ path = "src/main.rs"
66
name = "polkadot"
77
description = "Implementation of a `https://polkadot.network` node in Rust based on the Substrate framework."
88
license = "GPL-3.0-only"
9-
version = "0.9.28"
9+
version = "0.9.29"
1010
authors = ["Parity Technologies <admin@parity.io>"]
1111
edition = "2021"
1212
rust-version = "1.57.0" # custom profiles

‎cli/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-cli"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
description = "Polkadot Relay-chain Client Node"
66
edition = "2021"

‎cli/src/command.rs

+9
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,15 @@ pub fn run() -> Result<()> {
512512
let chain_spec = &runner.config().chain_spec;
513513

514514
match cmd {
515+
#[cfg(not(feature = "runtime-benchmarks"))]
516+
BenchmarkCmd::Storage(_) =>
517+
return Err(sc_cli::Error::Input(
518+
"Compile with --features=runtime-benchmarks \
519+
to enable storage benchmarks."
520+
.into(),
521+
)
522+
.into()),
523+
#[cfg(feature = "runtime-benchmarks")]
515524
BenchmarkCmd::Storage(cmd) => runner.sync_run(|mut config| {
516525
let (client, backend, _, _) = service::new_chain_ops(&mut config, None)?;
517526
let db = backend.expose_db();

‎core-primitives/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-core-primitives"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎erasure-coding/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-erasure-coding"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎erasure-coding/fuzzer/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "erasure_coding_fuzzer"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/client/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-client"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/client/src/benchmarking.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder {
4949
fn build(&self, nonce: u32) -> std::result::Result<OpaqueExtrinsic, &'static str> {
5050
with_client! {
5151
self.client.as_ref(), client, {
52-
use runtime::{Call, SystemCall};
52+
use runtime::{RuntimeCall, SystemCall};
5353

54-
let call = Call::System(SystemCall::remark { remark: vec![] });
54+
let call = RuntimeCall::System(SystemCall::remark { remark: vec![] });
5555
let signer = Sr25519Keyring::Bob.pair();
5656

5757
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 {
9292
fn build(&self, nonce: u32) -> std::result::Result<OpaqueExtrinsic, &'static str> {
9393
with_client! {
9494
self.client.as_ref(), client, {
95-
use runtime::{Call, BalancesCall};
95+
use runtime::{RuntimeCall, BalancesCall};
9696

97-
let call = Call::Balances(BalancesCall::transfer_keep_alive {
97+
let call = RuntimeCall::Balances(BalancesCall::transfer_keep_alive {
9898
dest: self.dest.clone().into(),
9999
value: self.value.into(),
100100
});
@@ -113,14 +113,14 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder {
113113
///
114114
/// Should only be used for benchmarking since it makes strong assumptions
115115
/// about the chain state that these calls will be valid for.
116-
trait BenchmarkCallSigner<Call: Encode + Clone, Signer: Pair> {
116+
trait BenchmarkCallSigner<RuntimeCall: Encode + Clone, Signer: Pair> {
117117
/// Signs a call together with the signed extensions of the specific runtime.
118118
///
119119
/// Only works if the current block is the genesis block since the
120120
/// `CheckMortality` check is mocked by using the genesis block.
121121
fn sign_call(
122122
&self,
123-
call: Call,
123+
call: RuntimeCall,
124124
nonce: u32,
125125
current_block: u64,
126126
period: u64,
@@ -130,12 +130,12 @@ trait BenchmarkCallSigner<Call: Encode + Clone, Signer: Pair> {
130130
}
131131

132132
#[cfg(feature = "polkadot")]
133-
impl BenchmarkCallSigner<polkadot_runtime::Call, sp_core::sr25519::Pair>
133+
impl BenchmarkCallSigner<polkadot_runtime::RuntimeCall, sp_core::sr25519::Pair>
134134
for FullClient<polkadot_runtime::RuntimeApi, PolkadotExecutorDispatch>
135135
{
136136
fn sign_call(
137137
&self,
138-
call: polkadot_runtime::Call,
138+
call: polkadot_runtime::RuntimeCall,
139139
nonce: u32,
140140
current_block: u64,
141141
period: u64,
@@ -186,12 +186,12 @@ impl BenchmarkCallSigner<polkadot_runtime::Call, sp_core::sr25519::Pair>
186186
}
187187

188188
#[cfg(feature = "westend")]
189-
impl BenchmarkCallSigner<westend_runtime::Call, sp_core::sr25519::Pair>
189+
impl BenchmarkCallSigner<westend_runtime::RuntimeCall, sp_core::sr25519::Pair>
190190
for FullClient<westend_runtime::RuntimeApi, WestendExecutorDispatch>
191191
{
192192
fn sign_call(
193193
&self,
194-
call: westend_runtime::Call,
194+
call: westend_runtime::RuntimeCall,
195195
nonce: u32,
196196
current_block: u64,
197197
period: u64,
@@ -240,12 +240,12 @@ impl BenchmarkCallSigner<westend_runtime::Call, sp_core::sr25519::Pair>
240240
}
241241

242242
#[cfg(feature = "kusama")]
243-
impl BenchmarkCallSigner<kusama_runtime::Call, sp_core::sr25519::Pair>
243+
impl BenchmarkCallSigner<kusama_runtime::RuntimeCall, sp_core::sr25519::Pair>
244244
for FullClient<kusama_runtime::RuntimeApi, KusamaExecutorDispatch>
245245
{
246246
fn sign_call(
247247
&self,
248-
call: kusama_runtime::Call,
248+
call: kusama_runtime::RuntimeCall,
249249
nonce: u32,
250250
current_block: u64,
251251
period: u64,
@@ -294,12 +294,12 @@ impl BenchmarkCallSigner<kusama_runtime::Call, sp_core::sr25519::Pair>
294294
}
295295

296296
#[cfg(feature = "rococo")]
297-
impl BenchmarkCallSigner<rococo_runtime::Call, sp_core::sr25519::Pair>
297+
impl BenchmarkCallSigner<rococo_runtime::RuntimeCall, sp_core::sr25519::Pair>
298298
for FullClient<rococo_runtime::RuntimeApi, RococoExecutorDispatch>
299299
{
300300
fn sign_call(
301301
&self,
302-
call: rococo_runtime::Call,
302+
call: rococo_runtime::RuntimeCall,
303303
nonce: u32,
304304
current_block: u64,
305305
period: u64,

‎node/collation-generation/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-collation-generation"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/core/approval-voting/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-core-approval-voting"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/core/av-store/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-core-av-store"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/core/backing/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-core-backing"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/core/bitfield-signing/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-core-bitfield-signing"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/core/candidate-validation/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-core-candidate-validation"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/core/chain-api/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-core-chain-api"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/core/chain-selection/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "polkadot-node-core-chain-selection"
33
description = "Chain Selection Subsystem"
4-
version = "0.9.28"
4+
version = "0.9.29"
55
authors = ["Parity Technologies <admin@parity.io>"]
66
edition = "2021"
77

‎node/core/dispute-coordinator/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-core-dispute-coordinator"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/core/parachains-inherent/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-core-parachains-inherent"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/core/provisioner/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-core-provisioner"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/core/pvf-checker/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-core-pvf-checker"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/core/pvf/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-core-pvf"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

@@ -24,7 +24,7 @@ rayon = "1.5.1"
2424
parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] }
2525
polkadot-parachain = { path = "../../../parachain" }
2626
polkadot-core-primitives = { path = "../../../core-primitives" }
27-
polkadot-node-subsystem-util = { path = "../../subsystem-util"}
27+
polkadot-node-metrics = { path = "../../metrics"}
2828
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
2929
sc-executor-wasmtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
3030
sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "master" }

‎node/core/pvf/src/metrics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
//! Prometheus metrics related to the validation host.
1818
19-
use polkadot_node_subsystem_util::metrics::{self, prometheus};
19+
use polkadot_node_metrics::metrics::{self, prometheus};
2020

2121
/// Validation host metrics.
2222
#[derive(Default, Clone)]

‎node/core/runtime-api/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[package]
22
name = "polkadot-node-core-runtime-api"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

77
[dependencies]
88
futures = "0.3.21"
99
gum = { package = "tracing-gum", path = "../../gum" }
10-
memory-lru = "0.1.0"
10+
memory-lru = "0.1.1"
1111
parity-util-mem = { version = "0.11.0", default-features = false }
1212

1313
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }

‎node/gum/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tracing-gum"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66
description = "Stick logs together with the TraceID as provided by tempo"

‎node/gum/proc-macro/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tracing-gum-proc-macro"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66
description = "Generate an overseer including builder pattern and message wrapper from a single annotated struct definition."

‎node/jaeger/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-jaeger"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66
description = "Polkadot Jaeger primitives, but equally useful for Grafana/Tempo"

‎node/malus/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "polkadot-test-malus"
33
description = "Misbehaving nodes for local testnets, system and Simnet tests."
44
license = "GPL-3.0-only"
5-
version = "0.9.28"
5+
version = "0.9.29"
66
authors = ["Parity Technologies <admin@parity.io>"]
77
edition = "2021"
88
readme = "README.md"

‎node/metrics/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-node-metrics"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66
description = "Subsystem metric helpers"

‎node/network/approval-distribution/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-approval-distribution"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/network/availability-distribution/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-availability-distribution"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/network/availability-recovery/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-availability-recovery"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/network/bitfield-distribution/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-availability-bitfield-distribution"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/network/bridge/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-network-bridge"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎node/network/collator-protocol/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-collator-protocol"
3-
version = "0.9.28"
3+
version = "0.9.29"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

0 commit comments

Comments
 (0)