+ Sync + Send + 'static,
CIDP::InherentDataProviders: InherentDataProviderExt + Send + Sync,
{
- sc_consensus_aura::import_queue::(sc_consensus_aura::ImportQueueParams {
+ sc_consensus_aura::import_queue::
(sc_consensus_aura::ImportQueueParams {
block_import: cumulus_client_consensus_common::ParachainBlockImport::new(block_import),
justification_import: None,
client,
create_inherent_data_providers,
spawner,
registry,
- can_author_with,
check_for_equivocation: sc_consensus_aura::CheckForEquivocation::No,
telemetry,
})
}
/// Parameters of [`build_verifier`].
-pub struct BuildVerifierParams {
+pub struct BuildVerifierParams {
/// The client to interact with the chain.
pub client: Arc,
/// The inherent data providers, to create the inherent data.
pub create_inherent_data_providers: CIDP,
- /// Can we author with the current node?
- pub can_author_with: CAW,
/// The telemetry handle.
pub telemetry: Option,
}
/// Build the [`AuraVerifier`].
-pub fn build_verifier(
- BuildVerifierParams {
- client,
- create_inherent_data_providers,
- can_author_with,
- telemetry,
- }: BuildVerifierParams,
-) -> AuraVerifier {
+pub fn build_verifier(
+ BuildVerifierParams { client, create_inherent_data_providers, telemetry }: BuildVerifierParams<
+ C,
+ CIDP,
+ >,
+) -> AuraVerifier {
sc_consensus_aura::build_verifier(sc_consensus_aura::BuildVerifierParams {
client,
create_inherent_data_providers,
- can_author_with,
telemetry,
check_for_equivocation: sc_consensus_aura::CheckForEquivocation::No,
})
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index f88bca38d4b..1be562e37cb 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -201,7 +201,6 @@ where
let info = SlotInfo::new(
inherent_data_providers.slot(),
- inherent_data_providers.timestamp(),
inherent_data,
self.slot_duration.as_duration(),
parent.clone(),
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index 7b3f4e82266..e2e8f492d7c 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -9,17 +9,16 @@ edition = "2021"
async-trait = "0.1.57"
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
dyn-clone = "1.0.9"
-futures = "0.3.23"
-tracing = "0.1.36"
+futures = "0.3.24"
+tracing = "0.1.37"
# Substrate
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
# Polkadot
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "trappist-xcm-v3" }
@@ -31,7 +30,7 @@ cumulus-relay-chain-interface = { path = "../../relay-chain-interface" }
futures-timer = "3.0.2"
# Substrate
-sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
# Cumulus
cumulus-test-client = { path = "../../../test/client" }
diff --git a/client/consensus/relay-chain/Cargo.toml b/client/consensus/relay-chain/Cargo.toml
index 6115a2a6c38..0f5fdb96ac2 100644
--- a/client/consensus/relay-chain/Cargo.toml
+++ b/client/consensus/relay-chain/Cargo.toml
@@ -7,21 +7,20 @@ edition = "2021"
[dependencies]
async-trait = "0.1.57"
-futures = "0.3.23"
+futures = "0.3.24"
parking_lot = "0.12.1"
-tracing = "0.1.36"
+tracing = "0.1.37"
# Substrate
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
# Cumulus
cumulus-client-consensus-common = { path = "../common" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 9e10bf8d59f..111e5dc4bbe 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -8,20 +8,18 @@ edition = "2021"
[dependencies]
async-trait = "0.1.57"
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
-derive_more = "0.99.2"
-futures = "0.3.23"
+futures = "0.3.24"
futures-timer = "3.0.2"
parking_lot = "0.12.1"
-tracing = "0.1.36"
+tracing = "0.1.37"
# Substrate
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
# Polkadot
polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "trappist-xcm-v3" }
@@ -33,17 +31,17 @@ cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
[dev-dependencies]
portpicker = "0.1.1"
-tokio = { version = "1.19.2", features = ["macros"] }
-url = "2.2.2"
+tokio = { version = "1.21.2", features = ["macros"] }
+url = "2.3.1"
# Substrate
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
-substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
# Polkadot
polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "trappist-xcm-v3" }
diff --git a/client/network/src/tests.rs b/client/network/src/tests.rs
index c2093c75ada..cef327b8763 100644
--- a/client/network/src/tests.rs
+++ b/client/network/src/tests.rs
@@ -174,7 +174,7 @@ impl RelayChainInterface for DummyRelayChainInterface {
Ok(false)
}
- fn overseer_handle(&self) -> RelayChainResult