From 769fb847255c2821a4c0e1ca767dce696ca1dc50 Mon Sep 17 00:00:00 2001 From: Aaro Altonen Date: Thu, 1 Dec 2022 13:47:22 +0200 Subject: [PATCH 1/6] Companion for paritytech/substrate#12828 --- node/network/bridge/src/rx/mod.rs | 5 ++--- node/service/Cargo.toml | 1 + node/service/src/lib.rs | 24 +++++++++++++++++++----- node/service/src/overseer.rs | 7 +++++-- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/node/network/bridge/src/rx/mod.rs b/node/network/bridge/src/rx/mod.rs index 1d3052d3a218..3ce9dae0308a 100644 --- a/node/network/bridge/src/rx/mod.rs +++ b/node/network/bridge/src/rx/mod.rs @@ -145,14 +145,13 @@ where loop { match network_stream.next().await { None => return Err(Error::EventStreamConcluded), - Some(NetworkEvent::Dht(_)) | - Some(NetworkEvent::SyncConnected { .. }) | - Some(NetworkEvent::SyncDisconnected { .. }) => {}, + Some(NetworkEvent::Dht(_)) => {}, Some(NetworkEvent::NotificationStreamOpened { remote: peer, protocol, role, negotiated_fallback, + received_handshake: _, }) => { let role = ObservedRole::from(role); let (peer_set, version) = { diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index d796f02aebb9..533767bb77f0 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -24,6 +24,7 @@ sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index e80f085ef2bc..d490c67e523e 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -621,6 +621,7 @@ pub struct NewFull { pub client: C, pub overseer_handle: Option, pub network: Arc::Hash>>, + pub sync_service: Arc>, pub rpc_handlers: RpcHandlers, pub backend: Arc, } @@ -634,6 +635,7 @@ impl NewFull { task_manager: self.task_manager, overseer_handle: self.overseer_handle, network: self.network, + sync_service: self.sync_service, rpc_handlers: self.rpc_handlers, backend: self.backend, } @@ -911,7 +913,7 @@ where grandpa_hard_forks, )); - let (network, system_rpc_tx, tx_handler_controller, network_starter) = + let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = service::build_network(service::BuildNetworkParams { config: &config, client: client.clone(), @@ -979,6 +981,7 @@ where client: client.clone(), keystore: keystore_container.sync_keystore(), network: network.clone(), + sync_service: sync_service.clone(), rpc_builder: Box::new(rpc_extensions_builder), transaction_pool: transaction_pool.clone(), task_manager: &mut task_manager, @@ -1068,6 +1071,7 @@ where runtime_client: overseer_client.clone(), parachains_db, network_service: network.clone(), + sync_service: sync_service.clone(), authority_discovery_service, pov_req_receiver, chunk_req_receiver, @@ -1147,8 +1151,8 @@ where select_chain, block_import, env: proposer, - sync_oracle: network.clone(), - justification_sync_link: network.clone(), + sync_oracle: sync_service.clone(), + justification_sync_link: sync_service.clone(), create_inherent_data_providers: move |parent, ()| { let client_clone = client_clone.clone(); let overseer_handle = overseer_handle.clone(); @@ -1192,6 +1196,7 @@ where let justifications_protocol_name = beefy_on_demand_justifications_handler.protocol_name(); let network_params = beefy_gadget::BeefyNetworkParams { network: network.clone(), + sync: sync_service.clone(), gossip_protocol_name: beefy_gossip_proto_name, justifications_protocol_name, _phantom: core::marker::PhantomData::, @@ -1210,7 +1215,7 @@ where on_demand_justifications_handler: beefy_on_demand_justifications_handler, }; - let gadget = beefy_gadget::start_beefy_gadget::<_, _, _, _, _, _>(beefy_params); + let gadget = beefy_gadget::start_beefy_gadget::<_, _, _, _, _, _, _>(beefy_params); // Wococo's purpose is to be a testbed for BEEFY, so if it fails we'll // bring the node down with it to make sure it is noticed. @@ -1290,6 +1295,7 @@ where config, link: link_half, network: network.clone(), + sync: sync_service.clone(), voting_rule, prometheus_registry: prometheus_registry.clone(), shared_voter_state, @@ -1305,7 +1311,15 @@ where network_starter.start_network(); - Ok(NewFull { task_manager, client, overseer_handle, network, rpc_handlers, backend }) + Ok(NewFull { + task_manager, + client, + overseer_handle, + network, + sync_service, + rpc_handlers, + backend, + }) } #[cfg(feature = "full-node")] diff --git a/node/service/src/overseer.rs b/node/service/src/overseer.rs index 7dff86693827..f0ef5a29a8fb 100644 --- a/node/service/src/overseer.rs +++ b/node/service/src/overseer.rs @@ -91,6 +91,8 @@ where pub parachains_db: Arc, /// Underlying network service implementation. pub network_service: Arc>, + /// Underlying syncing service implementation. + pub sync_service: Arc>, /// Underlying authority discovery service. pub authority_discovery_service: AuthorityDiscoveryService, /// POV request receiver @@ -136,6 +138,7 @@ pub fn prepared_overseer_builder( runtime_client, parachains_db, network_service, + sync_service, authority_discovery_service, pov_req_receiver, chunk_req_receiver, @@ -215,7 +218,7 @@ where .network_bridge_rx(NetworkBridgeRxSubsystem::new( network_service.clone(), authority_discovery_service.clone(), - Box::new(network_service.clone()), + Box::new(sync_service.clone()), network_bridge_metrics, peerset_protocol_names, )) @@ -287,7 +290,7 @@ where approval_voting_config, parachains_db.clone(), keystore.clone(), - Box::new(network_service.clone()), + Box::new(sync_service.clone()), Metrics::register(registry)?, )) .gossip_support(GossipSupportSubsystem::new( From 5effdfc87225a349c629fc243dcec86c5fff6fc5 Mon Sep 17 00:00:00 2001 From: Aaro Altonen Date: Mon, 20 Feb 2023 22:23:49 +0200 Subject: [PATCH 2/6] Pass sync service --- node/service/src/overseer.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/service/src/overseer.rs b/node/service/src/overseer.rs index 0ca3457ee2a4..294b80c0d39e 100644 --- a/node/service/src/overseer.rs +++ b/node/service/src/overseer.rs @@ -234,7 +234,7 @@ where .availability_store(AvailabilityStoreSubsystem::new( parachains_db.clone(), availability_config, - Box::new(network_service.clone()), + Box::new(sync_service.clone()), Metrics::register(registry)?, )) .bitfield_distribution(BitfieldDistributionSubsystem::new(Metrics::register(registry)?)) From b195606b26b3bb157d233b02c36ee6e9aabb0e95 Mon Sep 17 00:00:00 2001 From: Aaro Altonen Date: Tue, 21 Feb 2023 10:58:58 +0200 Subject: [PATCH 3/6] Fix test --- node/network/bridge/src/rx/tests.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/node/network/bridge/src/rx/tests.rs b/node/network/bridge/src/rx/tests.rs index cfbf8ac35fc3..b16287f82f8a 100644 --- a/node/network/bridge/src/rx/tests.rs +++ b/node/network/bridge/src/rx/tests.rs @@ -195,6 +195,7 @@ impl TestNetworkHandle { protocol: self.protocol_names.get_main_name(peer_set), negotiated_fallback: None, role: role.into(), + received_handshake: vec![], }) .await; } From 8b30e5a717b254642886f2b82114cf9aa6df2e0e Mon Sep 17 00:00:00 2001 From: Aaro Altonen Date: Tue, 21 Feb 2023 11:18:46 +0200 Subject: [PATCH 4/6] Fix tests again --- node/network/bridge/src/tx/tests.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/node/network/bridge/src/tx/tests.rs b/node/network/bridge/src/tx/tests.rs index bfc7200d15ec..9853927e58c9 100644 --- a/node/network/bridge/src/tx/tests.rs +++ b/node/network/bridge/src/tx/tests.rs @@ -173,6 +173,7 @@ impl TestNetworkHandle { protocol: self.peerset_protocol_names.get_main_name(peer_set), negotiated_fallback: None, role: role.into(), + received_handshake: vec![], }) .await; } From 0738929825e1ea4c33657db63996e41b4c4820c6 Mon Sep 17 00:00:00 2001 From: parity-processbot <> Date: Mon, 6 Mar 2023 16:33:52 +0000 Subject: [PATCH 5/6] update lockfile for {"substrate"} --- Cargo.lock | 372 +++++++++++++++++++++++++++-------------------------- 1 file changed, 189 insertions(+), 183 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9296c4888223..a7af2dc121aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -466,7 +466,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "hash-db", "log", @@ -2276,7 +2276,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", ] @@ -2299,7 +2299,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-support-procedural", @@ -2324,7 +2324,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "Inflector", "array-bytes", @@ -2371,7 +2371,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2382,7 +2382,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2399,7 +2399,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-system", @@ -2428,7 +2428,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "futures", "log", @@ -2444,7 +2444,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "bitflags", "environmental", @@ -2477,7 +2477,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "Inflector", "cfg-expr", @@ -2492,7 +2492,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2504,7 +2504,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "proc-macro2", "quote", @@ -2514,7 +2514,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -2538,7 +2538,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-system", @@ -2549,7 +2549,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "log", @@ -2567,7 +2567,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -2582,7 +2582,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "sp-api", @@ -2591,7 +2591,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "parity-scale-codec", @@ -2773,7 +2773,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "chrono", "frame-election-provider-support", @@ -4553,7 +4553,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "futures", "log", @@ -4572,7 +4572,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "anyhow", "jsonrpsee", @@ -5134,7 +5134,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5149,7 +5149,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-system", @@ -5165,7 +5165,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-system", @@ -5179,7 +5179,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5203,7 +5203,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5223,7 +5223,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-election-provider-support", "frame-remote-externalities", @@ -5242,7 +5242,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5257,7 +5257,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-system", @@ -5276,7 +5276,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -5300,7 +5300,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5318,7 +5318,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5337,7 +5337,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5354,7 +5354,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5371,7 +5371,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5389,7 +5389,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5412,7 +5412,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5425,7 +5425,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5443,7 +5443,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5461,7 +5461,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5484,7 +5484,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5500,7 +5500,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5520,7 +5520,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5537,7 +5537,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5554,7 +5554,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5571,7 +5571,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5587,7 +5587,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5603,7 +5603,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-system", @@ -5620,7 +5620,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5640,7 +5640,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -5651,7 +5651,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-system", @@ -5668,7 +5668,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5692,7 +5692,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5709,7 +5709,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5724,7 +5724,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5742,7 +5742,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5757,7 +5757,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5776,7 +5776,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5793,7 +5793,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-system", @@ -5814,7 +5814,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5830,7 +5830,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-system", @@ -5844,7 +5844,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5867,7 +5867,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5878,7 +5878,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "log", "sp-arithmetic", @@ -5887,7 +5887,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "sp-api", @@ -5896,7 +5896,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5913,7 +5913,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-system", @@ -5927,7 +5927,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5945,7 +5945,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -5964,7 +5964,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-support", "frame-system", @@ -5980,7 +5980,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5996,7 +5996,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6008,7 +6008,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -6025,7 +6025,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -6040,7 +6040,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -6056,7 +6056,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -6071,7 +6071,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-benchmarking", "frame-support", @@ -7699,6 +7699,7 @@ dependencies = [ "sc-keystore", "sc-network", "sc-network-common", + "sc-network-sync", "sc-offchain", "sc-service", "sc-sync-state-rpc", @@ -9000,7 +9001,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "log", "sp-core", @@ -9011,7 +9012,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "futures", @@ -9038,7 +9039,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "futures", "futures-timer", @@ -9061,7 +9062,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9076,7 +9077,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -9095,7 +9096,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9106,7 +9107,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "chrono", @@ -9146,7 +9147,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "fnv", "futures", @@ -9172,7 +9173,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "hash-db", "kvdb", @@ -9198,7 +9199,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "futures", @@ -9223,7 +9224,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "fork-tree", @@ -9262,7 +9263,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "futures", "jsonrpsee", @@ -9284,7 +9285,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "async-trait", @@ -9299,6 +9300,7 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-gossip", + "sc-network-sync", "sc-utils", "sp-api", "sp-application-crypto", @@ -9318,7 +9320,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "futures", "jsonrpsee", @@ -9337,7 +9339,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9350,7 +9352,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "ahash 0.8.2", "array-bytes", @@ -9390,7 +9392,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "finality-grandpa", "futures", @@ -9410,7 +9412,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "futures", @@ -9433,7 +9435,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "lru 0.8.1", "parity-scale-codec", @@ -9457,7 +9459,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -9470,7 +9472,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "log", "sc-allocator", @@ -9483,7 +9485,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "anyhow", "cfg-if", @@ -9501,7 +9503,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "ansi_term", "futures", @@ -9516,7 +9518,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "async-trait", @@ -9531,7 +9533,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "async-channel", @@ -9574,7 +9576,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "cid", "futures", @@ -9593,8 +9595,9 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ + "array-bytes", "async-trait", "bitflags", "bytes", @@ -9606,6 +9609,7 @@ dependencies = [ "prost-build", "sc-consensus", "sc-peerset", + "sc-utils", "serde", "smallvec", "sp-blockchain", @@ -9614,12 +9618,13 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "thiserror", + "zeroize", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "ahash 0.8.2", "futures", @@ -9637,7 +9642,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "futures", @@ -9658,12 +9663,13 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "async-trait", "fork-tree", "futures", + "futures-timer", "libp2p", "log", "lru 0.8.1", @@ -9690,7 +9696,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "futures", @@ -9709,7 +9715,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "bytes", @@ -9739,7 +9745,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "futures", "libp2p", @@ -9752,7 +9758,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9761,7 +9767,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "futures", "jsonrpsee", @@ -9791,7 +9797,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9810,7 +9816,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "http", "jsonrpsee", @@ -9825,7 +9831,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "futures", @@ -9851,7 +9857,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "directories", @@ -9917,7 +9923,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "log", "parity-scale-codec", @@ -9928,7 +9934,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "clap 4.0.15", "fs4", @@ -9944,7 +9950,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9963,7 +9969,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "futures", "libc", @@ -9982,7 +9988,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "chrono", "futures", @@ -10001,7 +10007,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "ansi_term", "atty", @@ -10032,7 +10038,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10043,7 +10049,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "futures", @@ -10070,7 +10076,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "futures", @@ -10084,7 +10090,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "backtrace", "futures", @@ -10598,7 +10604,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "hash-db", "log", @@ -10616,7 +10622,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "blake2", "proc-macro-crate", @@ -10628,7 +10634,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "scale-info", @@ -10641,7 +10647,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "integer-sqrt", "num-traits", @@ -10655,7 +10661,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "scale-info", @@ -10668,7 +10674,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "sp-api", @@ -10680,7 +10686,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "futures", "log", @@ -10698,7 +10704,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "futures", @@ -10713,7 +10719,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "parity-scale-codec", @@ -10731,7 +10737,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "merlin", @@ -10754,7 +10760,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "lazy_static", "parity-scale-codec", @@ -10773,7 +10779,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "finality-grandpa", "log", @@ -10791,7 +10797,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "scale-info", @@ -10803,7 +10809,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "scale-info", @@ -10816,7 +10822,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "base58", @@ -10859,7 +10865,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "blake2", "byteorder", @@ -10873,7 +10879,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "proc-macro2", "quote", @@ -10884,7 +10890,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -10893,7 +10899,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "proc-macro2", "quote", @@ -10903,7 +10909,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "environmental", "parity-scale-codec", @@ -10914,7 +10920,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10929,7 +10935,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "bytes", "ed25519", @@ -10954,7 +10960,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "lazy_static", "sp-core", @@ -10965,7 +10971,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "futures", @@ -10982,7 +10988,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "thiserror", "zstd", @@ -10991,7 +10997,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -11009,7 +11015,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "scale-info", @@ -11023,7 +11029,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "sp-api", "sp-core", @@ -11033,7 +11039,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "backtrace", "lazy_static", @@ -11043,7 +11049,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "rustc-hash", "serde", @@ -11053,7 +11059,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "either", "hash256-std-hasher", @@ -11075,7 +11081,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -11093,7 +11099,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "Inflector", "proc-macro-crate", @@ -11105,7 +11111,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "scale-info", @@ -11119,7 +11125,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "scale-info", @@ -11131,7 +11137,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "hash-db", "log", @@ -11151,12 +11157,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11169,7 +11175,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "futures-timer", @@ -11184,7 +11190,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "sp-std", @@ -11196,7 +11202,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "sp-api", "sp-runtime", @@ -11205,7 +11211,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "log", @@ -11221,7 +11227,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "ahash 0.8.2", "hash-db", @@ -11244,7 +11250,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11261,7 +11267,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -11272,7 +11278,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -11286,7 +11292,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "parity-scale-codec", "scale-info", @@ -11506,7 +11512,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "platforms", ] @@ -11514,7 +11520,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -11533,7 +11539,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "hyper", "log", @@ -11545,7 +11551,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "jsonrpsee", @@ -11558,7 +11564,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "jsonrpsee", "log", @@ -11577,7 +11583,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "array-bytes", "async-trait", @@ -11603,7 +11609,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "futures", "substrate-test-utils-derive", @@ -11613,7 +11619,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11624,7 +11630,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "ansi_term", "build-helper", @@ -12425,7 +12431,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2cb4825ea0d196d6e23e8e908bc4986413bd5b9f" +source = "git+https://github.com/paritytech/substrate?branch=master#e7aa37ec9601fac11f48d227fc06da84b0a5c521" dependencies = [ "async-trait", "clap 4.0.15", From 51c626c30e15a95b555768ee3632af571376867d Mon Sep 17 00:00:00 2001 From: Aaro Altonen Date: Mon, 6 Mar 2023 18:38:54 +0200 Subject: [PATCH 6/6] cargo fmt --- node/service/src/lib.rs | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 2ab24c96fbb7..e8b56904ea8c 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -713,9 +713,9 @@ where let backoff_authoring_blocks = { let mut backoff = sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging::default(); - if config.chain_spec.is_rococo() - || config.chain_spec.is_wococo() - || config.chain_spec.is_versi() + if config.chain_spec.is_rococo() || + config.chain_spec.is_wococo() || + config.chain_spec.is_versi() { // it's a testnet that's in flux, finality has stalled sometimes due // to operational issues and it's annoying to slow down block @@ -727,10 +727,10 @@ where }; // If not on a known test network, warn the user that BEEFY is still experimental. - if enable_beefy - && !config.chain_spec.is_rococo() - && !config.chain_spec.is_wococo() - && !config.chain_spec.is_versi() + if enable_beefy && + !config.chain_spec.is_rococo() && + !config.chain_spec.is_wococo() && + !config.chain_spec.is_versi() { gum::warn!("BEEFY is still experimental, usage on a production network is discouraged."); } @@ -1312,26 +1312,26 @@ pub fn new_chain_ops( config.keystore = service::config::KeystoreConfig::InMemory; #[cfg(feature = "rococo-native")] - if config.chain_spec.is_rococo() - || config.chain_spec.is_wococo() - || config.chain_spec.is_versi() + if config.chain_spec.is_rococo() || + config.chain_spec.is_wococo() || + config.chain_spec.is_versi() { - return chain_ops!(config, jaeger_agent, None; rococo_runtime, RococoExecutorDispatch, Rococo); + return chain_ops!(config, jaeger_agent, None; rococo_runtime, RococoExecutorDispatch, Rococo) } #[cfg(feature = "kusama-native")] if config.chain_spec.is_kusama() { - return chain_ops!(config, jaeger_agent, None; kusama_runtime, KusamaExecutorDispatch, Kusama); + return chain_ops!(config, jaeger_agent, None; kusama_runtime, KusamaExecutorDispatch, Kusama) } #[cfg(feature = "westend-native")] if config.chain_spec.is_westend() { - return chain_ops!(config, jaeger_agent, None; westend_runtime, WestendExecutorDispatch, Westend); + return chain_ops!(config, jaeger_agent, None; westend_runtime, WestendExecutorDispatch, Westend) } #[cfg(feature = "polkadot-native")] { - return chain_ops!(config, jaeger_agent, None; polkadot_runtime, PolkadotExecutorDispatch, Polkadot); + return chain_ops!(config, jaeger_agent, None; polkadot_runtime, PolkadotExecutorDispatch, Polkadot) } #[cfg(not(feature = "polkadot-native"))] @@ -1366,9 +1366,9 @@ pub fn build_full( hwbench: Option, ) -> Result, Error> { #[cfg(feature = "rococo-native")] - if config.chain_spec.is_rococo() - || config.chain_spec.is_wococo() - || config.chain_spec.is_versi() + if config.chain_spec.is_rococo() || + config.chain_spec.is_wococo() || + config.chain_spec.is_versi() { return new_full::( config, @@ -1384,7 +1384,7 @@ pub fn build_full( malus_finality_delay, hwbench, ) - .map(|full| full.with_client(Client::Rococo)); + .map(|full| full.with_client(Client::Rococo)) } #[cfg(feature = "kusama-native")] @@ -1403,7 +1403,7 @@ pub fn build_full( malus_finality_delay, hwbench, ) - .map(|full| full.with_client(Client::Kusama)); + .map(|full| full.with_client(Client::Kusama)) } #[cfg(feature = "westend-native")] @@ -1422,7 +1422,7 @@ pub fn build_full( malus_finality_delay, hwbench, ) - .map(|full| full.with_client(Client::Westend)); + .map(|full| full.with_client(Client::Westend)) } #[cfg(feature = "polkadot-native")] @@ -1444,7 +1444,7 @@ pub fn build_full( malus_finality_delay, hwbench, ) - .map(|full| full.with_client(Client::Polkadot)); + .map(|full| full.with_client(Client::Polkadot)) } #[cfg(not(feature = "polkadot-native"))] @@ -1483,7 +1483,7 @@ pub fn revert_backend( let revertible = blocks.min(best_number - finalized); if revertible == 0 { - return Ok(()); + return Ok(()) } let number = best_number - revertible;