From 382fc353d9c8ce57f35b52cbd314eabaf62807ad Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Tue, 19 Oct 2021 11:16:16 +0100 Subject: [PATCH 01/11] not needed --- node/service/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 7f004c49f211..fb2046452adc 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -101,7 +101,7 @@ pub use sc_executor::NativeExecutionDispatch; pub use service::{ config::{DatabaseSource, PrometheusConfig}, ChainSpec, Configuration, Error as SubstrateServiceError, PruningMode, Role, RuntimeGenesis, - TFullBackend, TFullCallExecutor, TFullClient, TLightBackend, TLightCallExecutor, TLightClient, + TFullBackend, TFullCallExecutor, TFullClient, TaskManager, TransactionPoolOptions, }; pub use sp_api::{ApiRef, ConstructRuntimeApi, Core as CoreApi, ProvideRuntimeApi, StateBackend}; From 7008152c3e4c9a5812fae63f937f3d7d6e1eb6bf Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Tue, 19 Oct 2021 11:42:44 +0100 Subject: [PATCH 02/11] cargo fmt --- node/service/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index fb2046452adc..fc8260c71957 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -101,8 +101,7 @@ pub use sc_executor::NativeExecutionDispatch; pub use service::{ config::{DatabaseSource, PrometheusConfig}, ChainSpec, Configuration, Error as SubstrateServiceError, PruningMode, Role, RuntimeGenesis, - TFullBackend, TFullCallExecutor, TFullClient, - TaskManager, TransactionPoolOptions, + TFullBackend, TFullCallExecutor, TFullClient, TaskManager, TransactionPoolOptions, }; pub use sp_api::{ApiRef, ConstructRuntimeApi, Core as CoreApi, ProvideRuntimeApi, StateBackend}; pub use sp_runtime::{ From 6beeeddbc275e3dc5bd4da892b061babfc65e3a8 Mon Sep 17 00:00:00 2001 From: gilescope Date: Mon, 25 Oct 2021 14:00:21 +0100 Subject: [PATCH 03/11] remove light-node --- node/service/Cargo.toml | 2 - node/service/src/lib.rs | 196 ---------------------------------------- 2 files changed, 198 deletions(-) diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index ba15a841e8a5..0c71830a07b8 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -152,8 +152,6 @@ full-node = [ "kvdb-rocksdb" ] -light-node = [] - # Configure the native runtimes to use. Polkadot is enabled by default. # # Validators require the native runtime currently diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index fc8260c71957..2fa529eaa8ef 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -312,13 +312,6 @@ type FullGrandpaBlockImport; -#[cfg(feature = "light-node")] -type LightBackend = service::TLightBackendWithHash; - -#[cfg(feature = "light-node")] -type LightClient = - service::TLightClientWithBackend; - #[cfg(feature = "full-node")] struct Basics where @@ -1126,168 +1119,6 @@ where Ok(NewFull { task_manager, client, overseer_handle, network, rpc_handlers, backend }) } -/// Builds a new service for a light client. -#[cfg(feature = "light-node")] -fn new_light( - mut config: Configuration, -) -> Result<(TaskManager, RpcHandlers), Error> -where - Runtime: 'static + Send + Sync + ConstructRuntimeApi>, - >>::RuntimeApi: - RuntimeApiCollection>, - Dispatch: NativeExecutionDispatch + 'static, -{ - set_prometheus_registry(&mut config)?; - use sc_client_api::backend::RemoteBackend; - - let telemetry = config - .telemetry_endpoints - .clone() - .filter(|x| !x.is_empty()) - .map(|endpoints| -> Result<_, telemetry::Error> { - let worker = TelemetryWorker::new(16)?; - let telemetry = worker.handle().new_telemetry(endpoints); - Ok((worker, telemetry)) - }) - .transpose()?; - - let (client, backend, keystore_container, mut task_manager, on_demand) = - service::new_light_parts::( - &config, - telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), - )?; - - let mut telemetry = telemetry.map(|(worker, telemetry)| { - task_manager.spawn_handle().spawn("telemetry", worker.run()); - telemetry - }); - - config.network.extra_sets.push(grandpa::grandpa_peers_set_config()); - - let select_chain = sc_consensus::LongestChain::new(backend.clone()); - - let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light( - config.transaction_pool.clone(), - config.prometheus_registry(), - task_manager.spawn_essential_handle(), - client.clone(), - on_demand.clone(), - )); - - let (grandpa_block_import, grandpa_link) = grandpa::block_import( - client.clone(), - &(client.clone() as Arc<_>), - select_chain.clone(), - telemetry.as_ref().map(|x| x.handle()), - )?; - let justification_import = grandpa_block_import.clone(); - - let (babe_block_import, babe_link) = babe::block_import( - babe::Config::get_or_compute(&*client)?, - grandpa_block_import, - client.clone(), - )?; - - // FIXME: pruning task isn't started since light client doesn't do `AuthoritySetup`. - let slot_duration = babe_link.config().slot_duration(); - let import_queue = babe::import_queue( - babe_link, - babe_block_import, - Some(Box::new(justification_import)), - client.clone(), - select_chain.clone(), - move |_, ()| async move { - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = - sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration( - *timestamp, - slot_duration, - ); - - Ok((timestamp, slot)) - }, - &task_manager.spawn_essential_handle(), - config.prometheus_registry(), - consensus_common::NeverCanAuthor, - telemetry.as_ref().map(|x| x.handle()), - )?; - - let warp_sync = Arc::new(grandpa::warp_proof::NetworkProvider::new( - backend.clone(), - grandpa_link.shared_authority_set().clone(), - )); - - let (network, system_rpc_tx, network_starter) = - service::build_network(service::BuildNetworkParams { - config: &config, - client: client.clone(), - transaction_pool: transaction_pool.clone(), - spawn_handle: task_manager.spawn_handle(), - import_queue, - on_demand: Some(on_demand.clone()), - block_announce_validator_builder: None, - warp_sync: Some(warp_sync), - })?; - - let enable_grandpa = !config.disable_grandpa; - if enable_grandpa { - let name = config.network.node_name.clone(); - - let config = grandpa::Config { - gossip_duration: Duration::from_millis(1000), - justification_period: 512, - name: Some(name), - observer_enabled: false, - keystore: None, - local_role: config.role.clone(), - telemetry: telemetry.as_ref().map(|x| x.handle()), - }; - - task_manager.spawn_handle().spawn_blocking( - "grandpa-observer", - grandpa::run_grandpa_observer(config, grandpa_link, network.clone())?, - ); - } - - if config.offchain_worker.enabled { - let _ = service::build_offchain_workers( - &config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), - ); - } - - let light_deps = polkadot_rpc::LightDeps { - remote_blockchain: backend.remote_blockchain(), - fetcher: on_demand.clone(), - client: client.clone(), - pool: transaction_pool.clone(), - }; - - let rpc_extensions = polkadot_rpc::create_light(light_deps); - - let rpc_handlers = service::spawn_tasks(service::SpawnTasksParams { - on_demand: Some(on_demand), - remote_blockchain: Some(backend.remote_blockchain()), - rpc_extensions_builder: Box::new(service::NoopRpcExtensionBuilder(rpc_extensions)), - task_manager: &mut task_manager, - config, - keystore: keystore_container.sync_keystore(), - backend, - transaction_pool, - client, - network, - system_rpc_tx, - telemetry: telemetry.as_mut(), - })?; - - network_starter.start_network(); - - Ok((task_manager, rpc_handlers)) -} - #[cfg(feature = "full-node")] macro_rules! chain_ops { ($config:expr, $jaeger_agent:expr, $telemetry_worker_handle:expr; $scope:ident, $executor:ident, $variant:ident) => {{ @@ -1355,33 +1186,6 @@ pub fn new_chain_ops( Err(Error::NoRuntime) } -/// Build a new light node. -#[cfg(feature = "light-node")] -pub fn build_light(config: Configuration) -> Result<(TaskManager, RpcHandlers), Error> { - #[cfg(feature = "rococo-native")] - if config.chain_spec.is_rococo() || config.chain_spec.is_wococo() { - return new_light::(config) - } - - #[cfg(feature = "kusama-native")] - if config.chain_spec.is_kusama() { - return new_light::(config) - } - - #[cfg(feature = "westend-native")] - if config.chain_spec.is_westend() { - return new_light::(config) - } - - #[cfg(feature = "polkadot-native")] - { - return new_light::(config) - } - - #[cfg(not(feature = "polkadot-native"))] - Err(Error::NoRuntime) -} - #[cfg(feature = "full-node")] pub fn build_full( config: Configuration, From c35eb4fa399e43d29a10c83187cc39b9c74f1feb Mon Sep 17 00:00:00 2001 From: gilescope Date: Mon, 25 Oct 2021 14:14:09 +0100 Subject: [PATCH 04/11] make full-node feature mandatory? --- cli/Cargo.toml | 5 +- cli/src/lib.rs | 1 - node/service/Cargo.toml | 76 ++++++++--------------- node/service/src/grandpa_support.rs | 2 - node/service/src/lib.rs | 30 +-------- node/service/src/parachains_db/mod.rs | 7 --- node/service/src/parachains_db/upgrade.rs | 2 - node/service/src/relay_chain_selection.rs | 2 - 8 files changed, 29 insertions(+), 96 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 899bd4cd0013..36cc70791d9d 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -36,7 +36,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] -default = [ "wasmtime", "db", "cli", "full-node", "trie-memory-tracker", "polkadot-native" ] +default = [ "wasmtime", "db", "cli", "trie-memory-tracker", "polkadot-native" ] wasmtime = [ "sc-cli/wasmtime" ] db = [ "service/db" ] cli = [ @@ -49,7 +49,6 @@ cli = [ ] runtime-benchmarks = [ "service/runtime-benchmarks" ] trie-memory-tracker = [ "sp-trie/memory-tracker" ] -full-node = [ "service/full-node" ] try-runtime = [ "service/try-runtime" ] # Configure the native runtimes to use. Polkadot is enabled by default. @@ -60,5 +59,5 @@ kusama-native = [ "service/kusama-native" ] westend-native = [ "service/westend-native" ] rococo-native = [ "service/rococo-native" ] -malus = [ "full-node", "service/malus" ] +malus = [ "service/malus" ] disputes = [ "service/disputes" ] diff --git a/cli/src/lib.rs b/cli/src/lib.rs index c07722d97540..3623d950cae7 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -23,7 +23,6 @@ mod cli; #[cfg(feature = "cli")] mod command; -#[cfg(feature = "full-node")] pub use service::RuntimeApiCollection; #[cfg(feature = "service")] pub use service::{self, Block, CoreApi, IdentifyVariant, ProvideRuntimeApi, TFullClient}; diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 0c71830a07b8..135f81c4aee5 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -66,14 +66,14 @@ tracing = "0.1.29" serde = { version = "1.0.130", features = ["derive"] } thiserror = "1.0.30" kvdb = "0.10.0" -kvdb-rocksdb = { version = "0.14.0", optional = true } +kvdb-rocksdb = { version = "0.14.0" } async-trait = "0.1.51" lru = "0.7" # Polkadot polkadot-node-core-parachains-inherent = { path = "../core/parachains-inherent" } polkadot-overseer = { path = "../overseer" } -polkadot-client = { path = "../client", default-features = false, optional = true } +polkadot-client = { path = "../client", default-features = false } polkadot-parachain = { path = "../../parachain" } polkadot-primitives = { path = "../../primitives" } polkadot-node-primitives = { path = "../primitives" } @@ -90,27 +90,27 @@ westend-runtime = { path = "../../runtime/westend", optional = true } rococo-runtime = { path = "../../runtime/rococo", optional = true } # Polkadot Subsystems -polkadot-approval-distribution = { path = "../network/approval-distribution", optional = true } -polkadot-availability-bitfield-distribution = { path = "../network/bitfield-distribution", optional = true } -polkadot-availability-distribution = { path = "../network/availability-distribution", optional = true } -polkadot-availability-recovery = { path = "../network/availability-recovery", optional = true } -polkadot-collator-protocol = { path = "../network/collator-protocol", optional = true } -polkadot-dispute-distribution = { path = "../network/dispute-distribution", optional = true } -polkadot-gossip-support = { path = "../network/gossip-support", optional = true } -polkadot-network-bridge = { path = "../network/bridge", optional = true } -polkadot-node-collation-generation = { path = "../collation-generation", optional = true } -polkadot-node-core-approval-voting = { path = "../core/approval-voting", optional = true } -polkadot-node-core-av-store = { path = "../core/av-store", optional = true } -polkadot-node-core-backing = { path = "../core/backing", optional = true } -polkadot-node-core-bitfield-signing = { path = "../core/bitfield-signing", optional = true } -polkadot-node-core-candidate-validation = { path = "../core/candidate-validation", optional = true } -polkadot-node-core-chain-api = { path = "../core/chain-api", optional = true } -polkadot-node-core-chain-selection = { path = "../core/chain-selection", optional = true } -polkadot-node-core-dispute-coordinator = { path = "../core/dispute-coordinator", optional = true } -polkadot-node-core-dispute-participation = { path = "../core/dispute-participation", optional = true } -polkadot-node-core-provisioner = { path = "../core/provisioner", optional = true } -polkadot-node-core-runtime-api = { path = "../core/runtime-api", optional = true } -polkadot-statement-distribution = { path = "../network/statement-distribution", optional = true } +polkadot-approval-distribution = { path = "../network/approval-distribution" } +polkadot-availability-bitfield-distribution = { path = "../network/bitfield-distribution" } +polkadot-availability-distribution = { path = "../network/availability-distribution" } +polkadot-availability-recovery = { path = "../network/availability-recovery" } +polkadot-collator-protocol = { path = "../network/collator-protocol" } +polkadot-dispute-distribution = { path = "../network/dispute-distribution" } +polkadot-gossip-support = { path = "../network/gossip-support" } +polkadot-network-bridge = { path = "../network/bridge" } +polkadot-node-collation-generation = { path = "../collation-generation" } +polkadot-node-core-approval-voting = { path = "../core/approval-voting" } +polkadot-node-core-av-store = { path = "../core/av-store" } +polkadot-node-core-backing = { path = "../core/backing" } +polkadot-node-core-bitfield-signing = { path = "../core/bitfield-signing" } +polkadot-node-core-candidate-validation = { path = "../core/candidate-validation" } +polkadot-node-core-chain-api = { path = "../core/chain-api" } +polkadot-node-core-chain-selection = { path = "../core/chain-selection" } +polkadot-node-core-dispute-coordinator = { path = "../core/dispute-coordinator" } +polkadot-node-core-dispute-participation = { path = "../core/dispute-participation" } +polkadot-node-core-provisioner = { path = "../core/provisioner" } +polkadot-node-core-runtime-api = { path = "../core/runtime-api" } +polkadot-statement-distribution = { path = "../network/statement-distribution" } [dev-dependencies] polkadot-test-client = { path = "../test/client" } @@ -120,38 +120,12 @@ log = "0.4.14" assert_matches = "1.5.0" [features] -default = ["db", "full-node", "polkadot-native"] +default = ["db", "polkadot-native"] db = [ "service/db" ] -full-node = [ - "polkadot-node-core-av-store", - "polkadot-node-core-approval-voting", - "polkadot-availability-bitfield-distribution", - "polkadot-availability-distribution", - "polkadot-availability-recovery", - "polkadot-client", - "polkadot-collator-protocol", - "polkadot-dispute-distribution", - "polkadot-gossip-support", - "polkadot-network-bridge", - "polkadot-node-collation-generation", - "polkadot-node-core-backing", - "polkadot-node-core-bitfield-signing", - "polkadot-node-core-candidate-validation", - "polkadot-node-core-chain-api", - "polkadot-node-core-chain-selection", - "polkadot-node-core-dispute-coordinator", - "polkadot-node-core-dispute-participation", - "polkadot-node-core-provisioner", - "polkadot-node-core-runtime-api", - "polkadot-statement-distribution", - "polkadot-approval-distribution", - "kvdb-rocksdb" -] - # Configure the native runtimes to use. Polkadot is enabled by default. # # Validators require the native runtime currently @@ -172,5 +146,5 @@ try-runtime = [ "westend-runtime/try-runtime", "rococo-runtime/try-runtime", ] -malus = ["full-node"] +malus = [] disputes = ["polkadot-node-core-dispute-coordinator/disputes"] diff --git a/node/service/src/grandpa_support.rs b/node/service/src/grandpa_support.rs index 12ced6c2c05c..6800f96ef175 100644 --- a/node/service/src/grandpa_support.rs +++ b/node/service/src/grandpa_support.rs @@ -22,7 +22,6 @@ use sp_runtime::traits::{Block as BlockT, Header as _, NumberFor}; use crate::HeaderProvider; -#[cfg(feature = "full-node")] use polkadot_primitives::v1::Hash; /// Returns the block hash of the block at the given `target_number` by walking @@ -114,7 +113,6 @@ where /// intermediary pending changes are replaced with a static list comprised of /// w3f validators and randomly selected validators from the latest session (at /// #1500988). -#[cfg(feature = "full-node")] pub(crate) fn kusama_hard_forks() -> Vec<( grandpa_primitives::SetId, (Hash, polkadot_primitives::v1::BlockNumber), diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 2fa529eaa8ef..0408264a2276 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -23,16 +23,13 @@ mod grandpa_support; mod parachains_db; mod relay_chain_selection; -#[cfg(feature = "full-node")] pub mod overseer; -#[cfg(feature = "full-node")] pub use self::overseer::{OverseerGen, OverseerGenArgs, RealOverseerGen}; #[cfg(all(test, feature = "disputes"))] mod tests; -#[cfg(feature = "full-node")] use { grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider}, polkadot_node_core_approval_voting::Config as ApprovalVotingConfig, @@ -50,7 +47,7 @@ use { }; pub use sp_core::traits::SpawnNamed; -#[cfg(feature = "full-node")] + pub use { polkadot_overseer::{Handle, Overseer, OverseerConnector, OverseerHandle}, polkadot_primitives::v1::ParachainHost, @@ -61,17 +58,14 @@ pub use { sp_consensus_babe::BabeApi, }; -#[cfg(feature = "full-node")] use polkadot_subsystem::jaeger; use std::{sync::Arc, time::Duration}; use prometheus_endpoint::Registry; -#[cfg(feature = "full-node")] use service::KeystoreContainer; use service::RpcHandlers; use telemetry::TelemetryWorker; -#[cfg(feature = "full-node")] use telemetry::{Telemetry, TelemetryWorkerHandle}; #[cfg(feature = "rococo-native")] @@ -88,7 +82,6 @@ pub use polkadot_client::PolkadotExecutorDispatch; pub use chain_spec::{KusamaChainSpec, PolkadotChainSpec, RococoChainSpec, WestendChainSpec}; pub use consensus_common::{block_validation::Chain, Proposal, SelectChain}; -#[cfg(feature = "full-node")] pub use polkadot_client::{ AbstractClient, Client, ClientHandle, ExecuteWithClient, FullBackend, FullClient, RuntimeApiCollection, @@ -122,7 +115,6 @@ pub use rococo_runtime; pub use westend_runtime; /// The maximum number of active leaves we forward to the [`Overseer`] on startup. -#[cfg(any(test, feature = "full-node"))] const MAX_ACTIVE_LEAVES: usize = 4; /// Provides the header and block number for a hash. @@ -221,18 +213,15 @@ pub enum Error { #[error(transparent)] Jaeger(#[from] polkadot_subsystem::jaeger::JaegerError), - #[cfg(feature = "full-node")] #[error(transparent)] Availability(#[from] AvailabilityError), #[error("Authorities require the real overseer implementation")] AuthoritiesRequireRealOverseer, - #[cfg(feature = "full-node")] #[error("Creating a custom database is required for validators")] DatabasePathRequired, - #[cfg(feature = "full-node")] #[error("Expected at least one of polkadot, kusama, westend or rococo runtime feature")] NoRuntime, } @@ -284,7 +273,6 @@ fn set_prometheus_registry(config: &mut Configuration) -> Result<(), Error> { /// Initialize the `Jeager` collector. The destination must listen /// on the given address and port for `UDP` packets. -#[cfg(any(test, feature = "full-node"))] fn jaeger_launch_collector_with_agent( spawner: impl SpawnNamed, config: &Configuration, @@ -301,9 +289,8 @@ fn jaeger_launch_collector_with_agent( Ok(()) } -#[cfg(feature = "full-node")] type FullSelectChain = relay_chain_selection::SelectRelayChain; -#[cfg(feature = "full-node")] + type FullGrandpaBlockImport = grandpa::GrandpaBlockImport< FullBackend, @@ -312,7 +299,6 @@ type FullGrandpaBlockImport; -#[cfg(feature = "full-node")] struct Basics where RuntimeApi: ConstructRuntimeApi> @@ -330,7 +316,6 @@ where telemetry: Option, } -#[cfg(feature = "full-node")] fn new_partial_basics( config: &mut Configuration, jaeger_agent: Option, @@ -390,7 +375,6 @@ where Ok(Basics { task_manager, client, backend, keystore_container, telemetry }) } -#[cfg(feature = "full-node")] fn new_partial( config: &mut Configuration, Basics { task_manager, backend, client, keystore_container, telemetry }: Basics< @@ -553,7 +537,6 @@ where }) } -#[cfg(feature = "full-node")] pub struct NewFull { pub task_manager: TaskManager, pub client: C, @@ -563,7 +546,6 @@ pub struct NewFull { pub backend: Arc, } -#[cfg(feature = "full-node")] impl NewFull { /// Convert the client type using the given `func`. pub fn with_client(self, func: impl FnOnce(C) -> NC) -> NewFull { @@ -579,7 +561,6 @@ impl NewFull { } /// Is this node a collator? -#[cfg(feature = "full-node")] #[derive(Clone)] pub enum IsCollator { /// This node is a collator. @@ -588,7 +569,6 @@ pub enum IsCollator { No, } -#[cfg(feature = "full-node")] impl std::fmt::Debug for IsCollator { fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result { use sp_core::Pair; @@ -599,7 +579,6 @@ impl std::fmt::Debug for IsCollator { } } -#[cfg(feature = "full-node")] impl IsCollator { /// Is this a collator? fn is_collator(&self) -> bool { @@ -608,7 +587,6 @@ impl IsCollator { } /// Returns the active leaves the overseer should start with. -#[cfg(feature = "full-node")] async fn active_leaves( select_chain: &impl SelectChain, client: &FullClient, @@ -661,7 +639,6 @@ where /// /// This is an advanced feature and not recommended for general use. Generally, `build_full` is /// a better choice. -#[cfg(feature = "full-node")] pub fn new_full( mut config: Configuration, is_collator: IsCollator, @@ -1119,7 +1096,6 @@ where Ok(NewFull { task_manager, client, overseer_handle, network, rpc_handlers, backend }) } -#[cfg(feature = "full-node")] macro_rules! chain_ops { ($config:expr, $jaeger_agent:expr, $telemetry_worker_handle:expr; $scope:ident, $executor:ident, $variant:ident) => {{ let telemetry_worker_handle = $telemetry_worker_handle; @@ -1146,7 +1122,6 @@ macro_rules! chain_ops { } /// Builds a new object suitable for chain operations. -#[cfg(feature = "full-node")] pub fn new_chain_ops( mut config: &mut Configuration, jaeger_agent: Option, @@ -1186,7 +1161,6 @@ pub fn new_chain_ops( Err(Error::NoRuntime) } -#[cfg(feature = "full-node")] pub fn build_full( config: Configuration, is_collator: IsCollator, diff --git a/node/service/src/parachains_db/mod.rs b/node/service/src/parachains_db/mod.rs index 17f7ae0fd0b8..f62b66790688 100644 --- a/node/service/src/parachains_db/mod.rs +++ b/node/service/src/parachains_db/mod.rs @@ -13,13 +13,10 @@ //! A `RocksDB` instance for storing parachain data; availability data, and approvals. -#[cfg(feature = "full-node")] use {kvdb::KeyValueDB, std::io, std::path::PathBuf, std::sync::Arc}; -#[cfg(feature = "full-node")] mod upgrade; -#[cfg(any(test, feature = "full-node"))] pub(crate) mod columns { pub mod v0 { pub const NUM_COLUMNS: u32 = 3; @@ -34,7 +31,6 @@ pub(crate) mod columns { } /// Columns used by different subsystems. -#[cfg(any(test, feature = "full-node"))] #[derive(Debug, Clone)] pub struct ColumnsConfig { /// The column used by the av-store for data. @@ -50,7 +46,6 @@ pub struct ColumnsConfig { } /// The real columns used by the parachains DB. -#[cfg(any(test, feature = "full-node"))] pub const REAL_COLUMNS: ColumnsConfig = ColumnsConfig { col_availability_data: columns::COL_AVAILABILITY_DATA, col_availability_meta: columns::COL_AVAILABILITY_META, @@ -76,13 +71,11 @@ impl Default for CacheSizes { } } -#[cfg(feature = "full-node")] pub(crate) fn other_io_error(err: String) -> io::Error { io::Error::new(io::ErrorKind::Other, err) } /// Open the database on disk, creating it if it doesn't exist. -#[cfg(feature = "full-node")] pub fn open_creating(root: PathBuf, cache_sizes: CacheSizes) -> io::Result> { use kvdb_rocksdb::{Database, DatabaseConfig}; diff --git a/node/service/src/parachains_db/upgrade.rs b/node/service/src/parachains_db/upgrade.rs index 0ba84103885f..4aa5a61f4e86 100644 --- a/node/service/src/parachains_db/upgrade.rs +++ b/node/service/src/parachains_db/upgrade.rs @@ -13,8 +13,6 @@ //! Migration code for the parachain's DB. -#![cfg(feature = "full-node")] - use std::{ fs, io, path::{Path, PathBuf}, diff --git a/node/service/src/relay_chain_selection.rs b/node/service/src/relay_chain_selection.rs index 31d878218e8f..4ba4c4d1b999 100644 --- a/node/service/src/relay_chain_selection.rs +++ b/node/service/src/relay_chain_selection.rs @@ -33,8 +33,6 @@ //! //! [chain-selection-guide]: https://w3f.github.io/parachain-implementers-guide/protocol-chain-selection.html -#![cfg(feature = "full-node")] - use super::{HeaderProvider, HeaderProviderProvider}; use consensus_common::{Error as ConsensusError, SelectChain}; use futures::channel::oneshot; From 5a2c7d850047466ed902faf673b779a2e02dfed2 Mon Sep 17 00:00:00 2001 From: gilescope Date: Mon, 25 Oct 2021 14:29:31 +0100 Subject: [PATCH 05/11] cargo fmt --- node/service/src/lib.rs | 47 ++++++++++++--------------- node/service/src/parachains_db/mod.rs | 3 +- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 0408264a2276..051f956dad1f 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -30,43 +30,36 @@ pub use self::overseer::{OverseerGen, OverseerGenArgs, RealOverseerGen}; #[cfg(all(test, feature = "disputes"))] mod tests; -use { - grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider}, - polkadot_node_core_approval_voting::Config as ApprovalVotingConfig, - polkadot_node_core_av_store::Config as AvailabilityConfig, - polkadot_node_core_av_store::Error as AvailabilityError, - polkadot_node_core_candidate_validation::Config as CandidateValidationConfig, - polkadot_node_core_chain_selection::{ - self as chain_selection_subsystem, Config as ChainSelectionConfig, - }, - polkadot_node_core_dispute_coordinator::Config as DisputeCoordinatorConfig, - polkadot_overseer::BlockInfo, - sc_client_api::ExecutorProvider, - sp_trie::PrefixedMemoryDB, - tracing::info, +use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider}; +use polkadot_node_core_approval_voting::Config as ApprovalVotingConfig; +use polkadot_node_core_av_store::{Config as AvailabilityConfig, Error as AvailabilityError}; +use polkadot_node_core_candidate_validation::Config as CandidateValidationConfig; +use polkadot_node_core_chain_selection::{ + self as chain_selection_subsystem, Config as ChainSelectionConfig, }; +use polkadot_node_core_dispute_coordinator::Config as DisputeCoordinatorConfig; +use polkadot_overseer::BlockInfo; +use sc_client_api::ExecutorProvider; +use sp_trie::PrefixedMemoryDB; +use tracing::info; pub use sp_core::traits::SpawnNamed; -pub use { - polkadot_overseer::{Handle, Overseer, OverseerConnector, OverseerHandle}, - polkadot_primitives::v1::ParachainHost, - relay_chain_selection::SelectRelayChain, - sc_client_api::AuxStore, - sp_authority_discovery::AuthorityDiscoveryApi, - sp_blockchain::HeaderBackend, - sp_consensus_babe::BabeApi, -}; +pub use polkadot_overseer::{Handle, Overseer, OverseerConnector, OverseerHandle}; +pub use polkadot_primitives::v1::ParachainHost; +pub use relay_chain_selection::SelectRelayChain; +pub use sc_client_api::AuxStore; +pub use sp_authority_discovery::AuthorityDiscoveryApi; +pub use sp_blockchain::HeaderBackend; +pub use sp_consensus_babe::BabeApi; use polkadot_subsystem::jaeger; use std::{sync::Arc, time::Duration}; use prometheus_endpoint::Registry; -use service::KeystoreContainer; -use service::RpcHandlers; -use telemetry::TelemetryWorker; -use telemetry::{Telemetry, TelemetryWorkerHandle}; +use service::{KeystoreContainer, RpcHandlers}; +use telemetry::{Telemetry, TelemetryWorker, TelemetryWorkerHandle}; #[cfg(feature = "rococo-native")] pub use polkadot_client::RococoExecutorDispatch; diff --git a/node/service/src/parachains_db/mod.rs b/node/service/src/parachains_db/mod.rs index f62b66790688..d188b17b5f66 100644 --- a/node/service/src/parachains_db/mod.rs +++ b/node/service/src/parachains_db/mod.rs @@ -13,7 +13,8 @@ //! A `RocksDB` instance for storing parachain data; availability data, and approvals. -use {kvdb::KeyValueDB, std::io, std::path::PathBuf, std::sync::Arc}; +use kvdb::KeyValueDB; +use std::{io, path::PathBuf, sync::Arc}; mod upgrade; From 43376f009fcc4ac4c210b4b223bfad0a4a3f6a8e Mon Sep 17 00:00:00 2001 From: gilescope Date: Tue, 26 Oct 2021 09:52:53 +0100 Subject: [PATCH 06/11] Revert "cargo fmt" This reverts commit 5a2c7d850047466ed902faf673b779a2e02dfed2. --- node/service/src/lib.rs | 47 +++++++++++++++------------ node/service/src/parachains_db/mod.rs | 3 +- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 051f956dad1f..0408264a2276 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -30,36 +30,43 @@ pub use self::overseer::{OverseerGen, OverseerGenArgs, RealOverseerGen}; #[cfg(all(test, feature = "disputes"))] mod tests; -use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider}; -use polkadot_node_core_approval_voting::Config as ApprovalVotingConfig; -use polkadot_node_core_av_store::{Config as AvailabilityConfig, Error as AvailabilityError}; -use polkadot_node_core_candidate_validation::Config as CandidateValidationConfig; -use polkadot_node_core_chain_selection::{ - self as chain_selection_subsystem, Config as ChainSelectionConfig, +use { + grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider}, + polkadot_node_core_approval_voting::Config as ApprovalVotingConfig, + polkadot_node_core_av_store::Config as AvailabilityConfig, + polkadot_node_core_av_store::Error as AvailabilityError, + polkadot_node_core_candidate_validation::Config as CandidateValidationConfig, + polkadot_node_core_chain_selection::{ + self as chain_selection_subsystem, Config as ChainSelectionConfig, + }, + polkadot_node_core_dispute_coordinator::Config as DisputeCoordinatorConfig, + polkadot_overseer::BlockInfo, + sc_client_api::ExecutorProvider, + sp_trie::PrefixedMemoryDB, + tracing::info, }; -use polkadot_node_core_dispute_coordinator::Config as DisputeCoordinatorConfig; -use polkadot_overseer::BlockInfo; -use sc_client_api::ExecutorProvider; -use sp_trie::PrefixedMemoryDB; -use tracing::info; pub use sp_core::traits::SpawnNamed; -pub use polkadot_overseer::{Handle, Overseer, OverseerConnector, OverseerHandle}; -pub use polkadot_primitives::v1::ParachainHost; -pub use relay_chain_selection::SelectRelayChain; -pub use sc_client_api::AuxStore; -pub use sp_authority_discovery::AuthorityDiscoveryApi; -pub use sp_blockchain::HeaderBackend; -pub use sp_consensus_babe::BabeApi; +pub use { + polkadot_overseer::{Handle, Overseer, OverseerConnector, OverseerHandle}, + polkadot_primitives::v1::ParachainHost, + relay_chain_selection::SelectRelayChain, + sc_client_api::AuxStore, + sp_authority_discovery::AuthorityDiscoveryApi, + sp_blockchain::HeaderBackend, + sp_consensus_babe::BabeApi, +}; use polkadot_subsystem::jaeger; use std::{sync::Arc, time::Duration}; use prometheus_endpoint::Registry; -use service::{KeystoreContainer, RpcHandlers}; -use telemetry::{Telemetry, TelemetryWorker, TelemetryWorkerHandle}; +use service::KeystoreContainer; +use service::RpcHandlers; +use telemetry::TelemetryWorker; +use telemetry::{Telemetry, TelemetryWorkerHandle}; #[cfg(feature = "rococo-native")] pub use polkadot_client::RococoExecutorDispatch; diff --git a/node/service/src/parachains_db/mod.rs b/node/service/src/parachains_db/mod.rs index d188b17b5f66..f62b66790688 100644 --- a/node/service/src/parachains_db/mod.rs +++ b/node/service/src/parachains_db/mod.rs @@ -13,8 +13,7 @@ //! A `RocksDB` instance for storing parachain data; availability data, and approvals. -use kvdb::KeyValueDB; -use std::{io, path::PathBuf, sync::Arc}; +use {kvdb::KeyValueDB, std::io, std::path::PathBuf, std::sync::Arc}; mod upgrade; From cbcb9a4725a0ac93fe1f2bcd5b0896221998c17a Mon Sep 17 00:00:00 2001 From: gilescope Date: Tue, 26 Oct 2021 09:53:34 +0100 Subject: [PATCH 07/11] Revert "make full-node feature mandatory?" This reverts commit c35eb4fa399e43d29a10c83187cc39b9c74f1feb. --- cli/Cargo.toml | 5 +- cli/src/lib.rs | 1 + node/service/Cargo.toml | 76 +++++++++++++++-------- node/service/src/grandpa_support.rs | 2 + node/service/src/lib.rs | 30 ++++++++- node/service/src/parachains_db/mod.rs | 7 +++ node/service/src/parachains_db/upgrade.rs | 2 + node/service/src/relay_chain_selection.rs | 2 + 8 files changed, 96 insertions(+), 29 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 36cc70791d9d..899bd4cd0013 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -36,7 +36,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] -default = [ "wasmtime", "db", "cli", "trie-memory-tracker", "polkadot-native" ] +default = [ "wasmtime", "db", "cli", "full-node", "trie-memory-tracker", "polkadot-native" ] wasmtime = [ "sc-cli/wasmtime" ] db = [ "service/db" ] cli = [ @@ -49,6 +49,7 @@ cli = [ ] runtime-benchmarks = [ "service/runtime-benchmarks" ] trie-memory-tracker = [ "sp-trie/memory-tracker" ] +full-node = [ "service/full-node" ] try-runtime = [ "service/try-runtime" ] # Configure the native runtimes to use. Polkadot is enabled by default. @@ -59,5 +60,5 @@ kusama-native = [ "service/kusama-native" ] westend-native = [ "service/westend-native" ] rococo-native = [ "service/rococo-native" ] -malus = [ "service/malus" ] +malus = [ "full-node", "service/malus" ] disputes = [ "service/disputes" ] diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 3623d950cae7..c07722d97540 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -23,6 +23,7 @@ mod cli; #[cfg(feature = "cli")] mod command; +#[cfg(feature = "full-node")] pub use service::RuntimeApiCollection; #[cfg(feature = "service")] pub use service::{self, Block, CoreApi, IdentifyVariant, ProvideRuntimeApi, TFullClient}; diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 135f81c4aee5..0c71830a07b8 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -66,14 +66,14 @@ tracing = "0.1.29" serde = { version = "1.0.130", features = ["derive"] } thiserror = "1.0.30" kvdb = "0.10.0" -kvdb-rocksdb = { version = "0.14.0" } +kvdb-rocksdb = { version = "0.14.0", optional = true } async-trait = "0.1.51" lru = "0.7" # Polkadot polkadot-node-core-parachains-inherent = { path = "../core/parachains-inherent" } polkadot-overseer = { path = "../overseer" } -polkadot-client = { path = "../client", default-features = false } +polkadot-client = { path = "../client", default-features = false, optional = true } polkadot-parachain = { path = "../../parachain" } polkadot-primitives = { path = "../../primitives" } polkadot-node-primitives = { path = "../primitives" } @@ -90,27 +90,27 @@ westend-runtime = { path = "../../runtime/westend", optional = true } rococo-runtime = { path = "../../runtime/rococo", optional = true } # Polkadot Subsystems -polkadot-approval-distribution = { path = "../network/approval-distribution" } -polkadot-availability-bitfield-distribution = { path = "../network/bitfield-distribution" } -polkadot-availability-distribution = { path = "../network/availability-distribution" } -polkadot-availability-recovery = { path = "../network/availability-recovery" } -polkadot-collator-protocol = { path = "../network/collator-protocol" } -polkadot-dispute-distribution = { path = "../network/dispute-distribution" } -polkadot-gossip-support = { path = "../network/gossip-support" } -polkadot-network-bridge = { path = "../network/bridge" } -polkadot-node-collation-generation = { path = "../collation-generation" } -polkadot-node-core-approval-voting = { path = "../core/approval-voting" } -polkadot-node-core-av-store = { path = "../core/av-store" } -polkadot-node-core-backing = { path = "../core/backing" } -polkadot-node-core-bitfield-signing = { path = "../core/bitfield-signing" } -polkadot-node-core-candidate-validation = { path = "../core/candidate-validation" } -polkadot-node-core-chain-api = { path = "../core/chain-api" } -polkadot-node-core-chain-selection = { path = "../core/chain-selection" } -polkadot-node-core-dispute-coordinator = { path = "../core/dispute-coordinator" } -polkadot-node-core-dispute-participation = { path = "../core/dispute-participation" } -polkadot-node-core-provisioner = { path = "../core/provisioner" } -polkadot-node-core-runtime-api = { path = "../core/runtime-api" } -polkadot-statement-distribution = { path = "../network/statement-distribution" } +polkadot-approval-distribution = { path = "../network/approval-distribution", optional = true } +polkadot-availability-bitfield-distribution = { path = "../network/bitfield-distribution", optional = true } +polkadot-availability-distribution = { path = "../network/availability-distribution", optional = true } +polkadot-availability-recovery = { path = "../network/availability-recovery", optional = true } +polkadot-collator-protocol = { path = "../network/collator-protocol", optional = true } +polkadot-dispute-distribution = { path = "../network/dispute-distribution", optional = true } +polkadot-gossip-support = { path = "../network/gossip-support", optional = true } +polkadot-network-bridge = { path = "../network/bridge", optional = true } +polkadot-node-collation-generation = { path = "../collation-generation", optional = true } +polkadot-node-core-approval-voting = { path = "../core/approval-voting", optional = true } +polkadot-node-core-av-store = { path = "../core/av-store", optional = true } +polkadot-node-core-backing = { path = "../core/backing", optional = true } +polkadot-node-core-bitfield-signing = { path = "../core/bitfield-signing", optional = true } +polkadot-node-core-candidate-validation = { path = "../core/candidate-validation", optional = true } +polkadot-node-core-chain-api = { path = "../core/chain-api", optional = true } +polkadot-node-core-chain-selection = { path = "../core/chain-selection", optional = true } +polkadot-node-core-dispute-coordinator = { path = "../core/dispute-coordinator", optional = true } +polkadot-node-core-dispute-participation = { path = "../core/dispute-participation", optional = true } +polkadot-node-core-provisioner = { path = "../core/provisioner", optional = true } +polkadot-node-core-runtime-api = { path = "../core/runtime-api", optional = true } +polkadot-statement-distribution = { path = "../network/statement-distribution", optional = true } [dev-dependencies] polkadot-test-client = { path = "../test/client" } @@ -120,12 +120,38 @@ log = "0.4.14" assert_matches = "1.5.0" [features] -default = ["db", "polkadot-native"] +default = ["db", "full-node", "polkadot-native"] db = [ "service/db" ] +full-node = [ + "polkadot-node-core-av-store", + "polkadot-node-core-approval-voting", + "polkadot-availability-bitfield-distribution", + "polkadot-availability-distribution", + "polkadot-availability-recovery", + "polkadot-client", + "polkadot-collator-protocol", + "polkadot-dispute-distribution", + "polkadot-gossip-support", + "polkadot-network-bridge", + "polkadot-node-collation-generation", + "polkadot-node-core-backing", + "polkadot-node-core-bitfield-signing", + "polkadot-node-core-candidate-validation", + "polkadot-node-core-chain-api", + "polkadot-node-core-chain-selection", + "polkadot-node-core-dispute-coordinator", + "polkadot-node-core-dispute-participation", + "polkadot-node-core-provisioner", + "polkadot-node-core-runtime-api", + "polkadot-statement-distribution", + "polkadot-approval-distribution", + "kvdb-rocksdb" +] + # Configure the native runtimes to use. Polkadot is enabled by default. # # Validators require the native runtime currently @@ -146,5 +172,5 @@ try-runtime = [ "westend-runtime/try-runtime", "rococo-runtime/try-runtime", ] -malus = [] +malus = ["full-node"] disputes = ["polkadot-node-core-dispute-coordinator/disputes"] diff --git a/node/service/src/grandpa_support.rs b/node/service/src/grandpa_support.rs index 6800f96ef175..12ced6c2c05c 100644 --- a/node/service/src/grandpa_support.rs +++ b/node/service/src/grandpa_support.rs @@ -22,6 +22,7 @@ use sp_runtime::traits::{Block as BlockT, Header as _, NumberFor}; use crate::HeaderProvider; +#[cfg(feature = "full-node")] use polkadot_primitives::v1::Hash; /// Returns the block hash of the block at the given `target_number` by walking @@ -113,6 +114,7 @@ where /// intermediary pending changes are replaced with a static list comprised of /// w3f validators and randomly selected validators from the latest session (at /// #1500988). +#[cfg(feature = "full-node")] pub(crate) fn kusama_hard_forks() -> Vec<( grandpa_primitives::SetId, (Hash, polkadot_primitives::v1::BlockNumber), diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 0408264a2276..2fa529eaa8ef 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -23,13 +23,16 @@ mod grandpa_support; mod parachains_db; mod relay_chain_selection; +#[cfg(feature = "full-node")] pub mod overseer; +#[cfg(feature = "full-node")] pub use self::overseer::{OverseerGen, OverseerGenArgs, RealOverseerGen}; #[cfg(all(test, feature = "disputes"))] mod tests; +#[cfg(feature = "full-node")] use { grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider}, polkadot_node_core_approval_voting::Config as ApprovalVotingConfig, @@ -47,7 +50,7 @@ use { }; pub use sp_core::traits::SpawnNamed; - +#[cfg(feature = "full-node")] pub use { polkadot_overseer::{Handle, Overseer, OverseerConnector, OverseerHandle}, polkadot_primitives::v1::ParachainHost, @@ -58,14 +61,17 @@ pub use { sp_consensus_babe::BabeApi, }; +#[cfg(feature = "full-node")] use polkadot_subsystem::jaeger; use std::{sync::Arc, time::Duration}; use prometheus_endpoint::Registry; +#[cfg(feature = "full-node")] use service::KeystoreContainer; use service::RpcHandlers; use telemetry::TelemetryWorker; +#[cfg(feature = "full-node")] use telemetry::{Telemetry, TelemetryWorkerHandle}; #[cfg(feature = "rococo-native")] @@ -82,6 +88,7 @@ pub use polkadot_client::PolkadotExecutorDispatch; pub use chain_spec::{KusamaChainSpec, PolkadotChainSpec, RococoChainSpec, WestendChainSpec}; pub use consensus_common::{block_validation::Chain, Proposal, SelectChain}; +#[cfg(feature = "full-node")] pub use polkadot_client::{ AbstractClient, Client, ClientHandle, ExecuteWithClient, FullBackend, FullClient, RuntimeApiCollection, @@ -115,6 +122,7 @@ pub use rococo_runtime; pub use westend_runtime; /// The maximum number of active leaves we forward to the [`Overseer`] on startup. +#[cfg(any(test, feature = "full-node"))] const MAX_ACTIVE_LEAVES: usize = 4; /// Provides the header and block number for a hash. @@ -213,15 +221,18 @@ pub enum Error { #[error(transparent)] Jaeger(#[from] polkadot_subsystem::jaeger::JaegerError), + #[cfg(feature = "full-node")] #[error(transparent)] Availability(#[from] AvailabilityError), #[error("Authorities require the real overseer implementation")] AuthoritiesRequireRealOverseer, + #[cfg(feature = "full-node")] #[error("Creating a custom database is required for validators")] DatabasePathRequired, + #[cfg(feature = "full-node")] #[error("Expected at least one of polkadot, kusama, westend or rococo runtime feature")] NoRuntime, } @@ -273,6 +284,7 @@ fn set_prometheus_registry(config: &mut Configuration) -> Result<(), Error> { /// Initialize the `Jeager` collector. The destination must listen /// on the given address and port for `UDP` packets. +#[cfg(any(test, feature = "full-node"))] fn jaeger_launch_collector_with_agent( spawner: impl SpawnNamed, config: &Configuration, @@ -289,8 +301,9 @@ fn jaeger_launch_collector_with_agent( Ok(()) } +#[cfg(feature = "full-node")] type FullSelectChain = relay_chain_selection::SelectRelayChain; - +#[cfg(feature = "full-node")] type FullGrandpaBlockImport = grandpa::GrandpaBlockImport< FullBackend, @@ -299,6 +312,7 @@ type FullGrandpaBlockImport; +#[cfg(feature = "full-node")] struct Basics where RuntimeApi: ConstructRuntimeApi> @@ -316,6 +330,7 @@ where telemetry: Option, } +#[cfg(feature = "full-node")] fn new_partial_basics( config: &mut Configuration, jaeger_agent: Option, @@ -375,6 +390,7 @@ where Ok(Basics { task_manager, client, backend, keystore_container, telemetry }) } +#[cfg(feature = "full-node")] fn new_partial( config: &mut Configuration, Basics { task_manager, backend, client, keystore_container, telemetry }: Basics< @@ -537,6 +553,7 @@ where }) } +#[cfg(feature = "full-node")] pub struct NewFull { pub task_manager: TaskManager, pub client: C, @@ -546,6 +563,7 @@ pub struct NewFull { pub backend: Arc, } +#[cfg(feature = "full-node")] impl NewFull { /// Convert the client type using the given `func`. pub fn with_client(self, func: impl FnOnce(C) -> NC) -> NewFull { @@ -561,6 +579,7 @@ impl NewFull { } /// Is this node a collator? +#[cfg(feature = "full-node")] #[derive(Clone)] pub enum IsCollator { /// This node is a collator. @@ -569,6 +588,7 @@ pub enum IsCollator { No, } +#[cfg(feature = "full-node")] impl std::fmt::Debug for IsCollator { fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result { use sp_core::Pair; @@ -579,6 +599,7 @@ impl std::fmt::Debug for IsCollator { } } +#[cfg(feature = "full-node")] impl IsCollator { /// Is this a collator? fn is_collator(&self) -> bool { @@ -587,6 +608,7 @@ impl IsCollator { } /// Returns the active leaves the overseer should start with. +#[cfg(feature = "full-node")] async fn active_leaves( select_chain: &impl SelectChain, client: &FullClient, @@ -639,6 +661,7 @@ where /// /// This is an advanced feature and not recommended for general use. Generally, `build_full` is /// a better choice. +#[cfg(feature = "full-node")] pub fn new_full( mut config: Configuration, is_collator: IsCollator, @@ -1096,6 +1119,7 @@ where Ok(NewFull { task_manager, client, overseer_handle, network, rpc_handlers, backend }) } +#[cfg(feature = "full-node")] macro_rules! chain_ops { ($config:expr, $jaeger_agent:expr, $telemetry_worker_handle:expr; $scope:ident, $executor:ident, $variant:ident) => {{ let telemetry_worker_handle = $telemetry_worker_handle; @@ -1122,6 +1146,7 @@ macro_rules! chain_ops { } /// Builds a new object suitable for chain operations. +#[cfg(feature = "full-node")] pub fn new_chain_ops( mut config: &mut Configuration, jaeger_agent: Option, @@ -1161,6 +1186,7 @@ pub fn new_chain_ops( Err(Error::NoRuntime) } +#[cfg(feature = "full-node")] pub fn build_full( config: Configuration, is_collator: IsCollator, diff --git a/node/service/src/parachains_db/mod.rs b/node/service/src/parachains_db/mod.rs index f62b66790688..17f7ae0fd0b8 100644 --- a/node/service/src/parachains_db/mod.rs +++ b/node/service/src/parachains_db/mod.rs @@ -13,10 +13,13 @@ //! A `RocksDB` instance for storing parachain data; availability data, and approvals. +#[cfg(feature = "full-node")] use {kvdb::KeyValueDB, std::io, std::path::PathBuf, std::sync::Arc}; +#[cfg(feature = "full-node")] mod upgrade; +#[cfg(any(test, feature = "full-node"))] pub(crate) mod columns { pub mod v0 { pub const NUM_COLUMNS: u32 = 3; @@ -31,6 +34,7 @@ pub(crate) mod columns { } /// Columns used by different subsystems. +#[cfg(any(test, feature = "full-node"))] #[derive(Debug, Clone)] pub struct ColumnsConfig { /// The column used by the av-store for data. @@ -46,6 +50,7 @@ pub struct ColumnsConfig { } /// The real columns used by the parachains DB. +#[cfg(any(test, feature = "full-node"))] pub const REAL_COLUMNS: ColumnsConfig = ColumnsConfig { col_availability_data: columns::COL_AVAILABILITY_DATA, col_availability_meta: columns::COL_AVAILABILITY_META, @@ -71,11 +76,13 @@ impl Default for CacheSizes { } } +#[cfg(feature = "full-node")] pub(crate) fn other_io_error(err: String) -> io::Error { io::Error::new(io::ErrorKind::Other, err) } /// Open the database on disk, creating it if it doesn't exist. +#[cfg(feature = "full-node")] pub fn open_creating(root: PathBuf, cache_sizes: CacheSizes) -> io::Result> { use kvdb_rocksdb::{Database, DatabaseConfig}; diff --git a/node/service/src/parachains_db/upgrade.rs b/node/service/src/parachains_db/upgrade.rs index 4aa5a61f4e86..0ba84103885f 100644 --- a/node/service/src/parachains_db/upgrade.rs +++ b/node/service/src/parachains_db/upgrade.rs @@ -13,6 +13,8 @@ //! Migration code for the parachain's DB. +#![cfg(feature = "full-node")] + use std::{ fs, io, path::{Path, PathBuf}, diff --git a/node/service/src/relay_chain_selection.rs b/node/service/src/relay_chain_selection.rs index 4ba4c4d1b999..31d878218e8f 100644 --- a/node/service/src/relay_chain_selection.rs +++ b/node/service/src/relay_chain_selection.rs @@ -33,6 +33,8 @@ //! //! [chain-selection-guide]: https://w3f.github.io/parachain-implementers-guide/protocol-chain-selection.html +#![cfg(feature = "full-node")] + use super::{HeaderProvider, HeaderProviderProvider}; use consensus_common::{Error as ConsensusError, SelectChain}; use futures::channel::oneshot; From 9a1da600c2767e18b3093b500415fc2418f00671 Mon Sep 17 00:00:00 2001 From: gilescope Date: Tue, 26 Oct 2021 11:51:05 +0200 Subject: [PATCH 08/11] bump versionn numbers --- bridges/primitives/chain-westend/src/lib.rs | 2 +- runtime/kusama/src/lib.rs | 2 +- runtime/polkadot/src/lib.rs | 2 +- runtime/westend/src/lib.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bridges/primitives/chain-westend/src/lib.rs b/bridges/primitives/chain-westend/src/lib.rs index e3c4d733def9..d6999fe65131 100644 --- a/bridges/primitives/chain-westend/src/lib.rs +++ b/bridges/primitives/chain-westend/src/lib.rs @@ -37,7 +37,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: sp_version::create_runtime_str!("westend"), impl_name: sp_version::create_runtime_str!("parity-westend"), authoring_version: 2, - spec_version: 51, + spec_version: 52, impl_version: 0, apis: sp_version::create_apis_vec![[]], transaction_version: 5, diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 0b58ff7c3ae1..14bbba51f87b 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -115,7 +115,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("kusama"), impl_name: create_runtime_str!("parity-kusama"), authoring_version: 2, - spec_version: 9120, + spec_version: 9130, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index e8feec47b0dd..06c0715f131b 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -105,7 +105,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("polkadot"), impl_name: create_runtime_str!("parity-polkadot"), authoring_version: 0, - spec_version: 9120, + spec_version: 9130, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 8fbcdb7099c6..2f0233283626 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -115,7 +115,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("westend"), impl_name: create_runtime_str!("parity-westend"), authoring_version: 2, - spec_version: 9120, + spec_version: 9130, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, From 6909f0b8246154a19bf985479b26cd201a0139e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 29 Oct 2021 12:29:02 +0200 Subject: [PATCH 09/11] Update bridges/primitives/chain-westend/src/lib.rs --- bridges/primitives/chain-westend/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/primitives/chain-westend/src/lib.rs b/bridges/primitives/chain-westend/src/lib.rs index d6999fe65131..e3c4d733def9 100644 --- a/bridges/primitives/chain-westend/src/lib.rs +++ b/bridges/primitives/chain-westend/src/lib.rs @@ -37,7 +37,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: sp_version::create_runtime_str!("westend"), impl_name: sp_version::create_runtime_str!("parity-westend"), authoring_version: 2, - spec_version: 52, + spec_version: 51, impl_version: 0, apis: sp_version::create_apis_vec![[]], transaction_version: 5, From a51e7b599e95ad216898fc4552052e1e54ade4c6 Mon Sep 17 00:00:00 2001 From: gilescope Date: Sat, 30 Oct 2021 13:21:17 +0200 Subject: [PATCH 10/11] fix typo + expand dictionary --- bridges/.config/lingua.dic | 2 ++ .../availability-distribution/src/requester/fetch_task/mod.rs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bridges/.config/lingua.dic b/bridges/.config/lingua.dic index ee369c0f1095..1fc67a5a5d24 100644 --- a/bridges/.config/lingua.dic +++ b/bridges/.config/lingua.dic @@ -18,6 +18,7 @@ BFT/M bitfield/MS blake2/MS blockchain/MS +boolean borked BridgeStorage BlockNumber @@ -30,6 +31,7 @@ ChainTime chain_getBlock choosen config/MS +cooldown crypto/MS customizable/B Debian/M diff --git a/node/network/availability-distribution/src/requester/fetch_task/mod.rs b/node/network/availability-distribution/src/requester/fetch_task/mod.rs index 0c5dd6e684c1..93b5d14f8171 100644 --- a/node/network/availability-distribution/src/requester/fetch_task/mod.rs +++ b/node/network/availability-distribution/src/requester/fetch_task/mod.rs @@ -103,7 +103,7 @@ struct RunningTask { /// Index of validator group to fetch the chunk from. /// - /// Needef for reporting bad validators. + /// Needed for reporting bad validators. group_index: GroupIndex, /// Validators to request the chunk from. From f2fd17c0a34f3f1ba16a8f1914576737c8e3cf90 Mon Sep 17 00:00:00 2001 From: parity-processbot <> Date: Sat, 30 Oct 2021 12:38:36 +0000 Subject: [PATCH 11/11] update lockfile for substrate --- Cargo.lock | 323 ++++++++++++++++++++++++++--------------------------- 1 file changed, 161 insertions(+), 162 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a76c34f86d9e..5be48f7b6271 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -467,7 +467,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "beefy-primitives", "fnv", @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -515,12 +515,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "scale-info", @@ -1910,7 +1910,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", ] @@ -1928,7 +1928,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -1948,7 +1948,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "Inflector", "chrono", @@ -1974,7 +1974,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -1988,7 +1988,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -2016,7 +2016,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "bitflags", "frame-metadata", @@ -2043,7 +2043,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2055,7 +2055,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -2067,7 +2067,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "proc-macro2", "quote", @@ -2077,7 +2077,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2100,7 +2100,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -2111,7 +2111,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "log", @@ -2128,7 +2128,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -2143,7 +2143,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "sp-api", @@ -2152,7 +2152,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "sp-api", @@ -2365,7 +2365,7 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generate-bags" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "chrono", "frame-election-provider-support", @@ -4606,7 +4606,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -4620,7 +4620,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -4636,7 +4636,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -4651,7 +4651,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -4675,7 +4675,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4695,7 +4695,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -4710,7 +4710,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "beefy-primitives", "frame-support", @@ -4726,7 +4726,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -4751,7 +4751,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -4836,7 +4836,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -4853,7 +4853,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -4869,7 +4869,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4893,7 +4893,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -4911,7 +4911,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -4926,7 +4926,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -4949,7 +4949,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4965,7 +4965,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -4985,7 +4985,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -5002,7 +5002,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -5019,7 +5019,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5037,7 +5037,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -5053,7 +5053,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5070,7 +5070,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -5085,7 +5085,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -5099,7 +5099,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -5116,7 +5116,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5139,7 +5139,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -5154,7 +5154,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -5168,7 +5168,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -5184,7 +5184,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -5205,7 +5205,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -5221,7 +5221,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -5235,7 +5235,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5258,7 +5258,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -5269,7 +5269,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "log", "sp-arithmetic", @@ -5278,7 +5278,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -5292,7 +5292,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -5310,7 +5310,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -5329,7 +5329,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-support", "frame-system", @@ -5346,7 +5346,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5363,7 +5363,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5374,7 +5374,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -5391,7 +5391,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -5407,7 +5407,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-benchmarking", "frame-support", @@ -7779,7 +7779,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "env_logger 0.9.0", "jsonrpsee-proc-macros", @@ -8042,7 +8042,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "log", "sp-core", @@ -8053,7 +8053,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "derive_more", @@ -8080,7 +8080,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8103,7 +8103,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8119,7 +8119,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8135,7 +8135,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8146,7 +8146,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "chrono", "fdlimit", @@ -8184,7 +8184,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "fnv", "futures 0.3.17", @@ -8212,7 +8212,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "hash-db", "kvdb", @@ -8237,7 +8237,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "futures 0.3.17", @@ -8261,7 +8261,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "derive_more", @@ -8304,7 +8304,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "derive_more", "futures 0.3.17", @@ -8328,7 +8328,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8341,7 +8341,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "assert_matches", "async-trait", @@ -8375,7 +8375,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "futures 0.3.17", @@ -8401,7 +8401,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "sc-client-api", "sp-authorship", @@ -8412,7 +8412,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "lazy_static", "libsecp256k1 0.6.0", @@ -8438,7 +8438,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "derive_more", "environmental", @@ -8456,7 +8456,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "log", "parity-scale-codec", @@ -8472,7 +8472,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8490,7 +8490,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "derive_more", @@ -8527,7 +8527,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "derive_more", "finality-grandpa", @@ -8551,7 +8551,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "ansi_term 0.12.1", "futures 0.3.17", @@ -8568,7 +8568,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "derive_more", @@ -8583,7 +8583,7 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "hash-db", "parity-scale-codec", @@ -8601,7 +8601,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-std", "async-trait", @@ -8652,7 +8652,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8668,7 +8668,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "bytes 1.0.1", "fnv", @@ -8695,7 +8695,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "futures 0.3.17", "libp2p", @@ -8708,7 +8708,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8717,7 +8717,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "futures 0.3.17", "hash-db", @@ -8748,7 +8748,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8773,7 +8773,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8790,7 +8790,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "directories", @@ -8814,7 +8814,6 @@ dependencies = [ "sc-executor", "sc-informant", "sc-keystore", - "sc-light", "sc-network", "sc-offchain", "sc-rpc", @@ -8855,7 +8854,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "log", "parity-scale-codec", @@ -8869,7 +8868,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8891,7 +8890,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "chrono", "futures 0.3.17", @@ -8909,7 +8908,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8940,7 +8939,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8951,7 +8950,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "futures 0.3.17", "intervalier", @@ -8978,7 +8977,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "derive_more", "futures 0.3.17", @@ -8992,7 +8991,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -9415,7 +9414,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "hash-db", "log", @@ -9432,7 +9431,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -9444,7 +9443,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "scale-info", @@ -9457,7 +9456,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "integer-sqrt", "num-traits", @@ -9472,7 +9471,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "scale-info", @@ -9485,7 +9484,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "parity-scale-codec", @@ -9497,7 +9496,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "sp-api", @@ -9509,7 +9508,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "futures 0.3.17", "log", @@ -9527,7 +9526,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "futures 0.3.17", @@ -9546,7 +9545,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "merlin", @@ -9569,7 +9568,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "scale-info", @@ -9580,7 +9579,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9592,7 +9591,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "base58", "blake2-rfc", @@ -9638,7 +9637,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "kvdb", "parking_lot", @@ -9647,7 +9646,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "proc-macro2", "quote", @@ -9657,7 +9656,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "environmental", "parity-scale-codec", @@ -9668,7 +9667,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "finality-grandpa", "log", @@ -9686,7 +9685,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9700,7 +9699,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "futures 0.3.17", "hash-db", @@ -9724,7 +9723,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "lazy_static", "sp-core", @@ -9735,7 +9734,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "derive_more", @@ -9752,7 +9751,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "zstd", ] @@ -9760,7 +9759,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "scale-info", @@ -9775,7 +9774,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9786,7 +9785,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "sp-api", "sp-core", @@ -9796,7 +9795,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "backtrace", ] @@ -9804,7 +9803,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "rustc-hash", "serde", @@ -9814,7 +9813,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "either", "hash256-std-hasher", @@ -9836,7 +9835,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9853,7 +9852,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -9865,7 +9864,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "serde", "serde_json", @@ -9874,7 +9873,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "scale-info", @@ -9888,7 +9887,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "scale-info", @@ -9899,7 +9898,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "hash-db", "log", @@ -9922,12 +9921,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9940,7 +9939,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "log", "sp-core", @@ -9953,7 +9952,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -9969,7 +9968,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "sp-std", @@ -9981,7 +9980,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "sp-api", "sp-runtime", @@ -9990,7 +9989,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "log", @@ -10006,7 +10005,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "hash-db", "memory-db", @@ -10021,7 +10020,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10037,7 +10036,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10048,7 +10047,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10276,7 +10275,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "platforms", ] @@ -10284,7 +10283,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.17", @@ -10306,7 +10305,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-std", "derive_more", @@ -10320,7 +10319,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "async-trait", "futures 0.3.17", @@ -10347,7 +10346,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "futures 0.3.17", "substrate-test-utils-derive", @@ -10357,7 +10356,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -10368,7 +10367,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -10521,7 +10520,7 @@ dependencies = [ [[package]] name = "test-runner" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "frame-system", "futures 0.3.17", @@ -10963,7 +10962,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#945377f35fd6ba265d6bd2b808e97749471dec0b" +source = "git+https://github.com/paritytech/substrate?branch=master#1d818f38a3198f21b4ae68bac3dc98219fccc669" dependencies = [ "jsonrpsee-ws-client", "log",