From 5cc5b674f9a722485b676cb62a028d6b118a7455 Mon Sep 17 00:00:00 2001 From: Adrian Catangiu Date: Thu, 6 Jan 2022 16:33:50 +0200 Subject: [PATCH] Companion for Substrate#10568 - Add new BEEFY RPC (#4638) * support best Beefy RPC through arc * beefy RPC through lockless message passing - wip Not working because channel can't be simply opened and receiver passed to `rpc_extensions_builder` because `rpc_extensions_builder` has to be `Fn` and not `FnOnce`... and and Receiver side of mpsc can't be cloned yay!.. * beefy RPC through lockless message passing * beefy: use specialized type definitions * bubble up service errors from BEEFY RPC * update lockfile for substrate Co-authored-by: parity-processbot <> --- polkadot/Cargo.lock | 333 ++++++++++++++++--------------- polkadot/node/service/src/lib.rs | 22 +- polkadot/rpc/src/lib.rs | 17 +- 3 files changed, 193 insertions(+), 179 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index f1145774a4..c01ffbeb9e 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -448,7 +448,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "beefy-primitives", "fnv", @@ -477,10 +477,11 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "beefy-gadget", "beefy-primitives", + "derive_more", "futures 0.3.19", "jsonrpc-core", "jsonrpc-core-client", @@ -488,21 +489,24 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", + "parking_lot", "sc-rpc", + "sc-utils", "serde", "sp-core", "sp-runtime", + "thiserror", ] [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "scale-info", @@ -1875,7 +1879,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", ] @@ -1893,7 +1897,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -1914,7 +1918,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "Inflector", "chrono", @@ -1940,7 +1944,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -1954,7 +1958,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -1982,7 +1986,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "bitflags", "frame-metadata", @@ -2011,7 +2015,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2023,7 +2027,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -2035,7 +2039,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "proc-macro2", "quote", @@ -2045,7 +2049,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2068,7 +2072,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -2079,7 +2083,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "log", @@ -2096,7 +2100,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -2111,7 +2115,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "sp-api", @@ -2120,7 +2124,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "sp-api", @@ -2316,7 +2320,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "chrono", "frame-election-provider-support", @@ -4577,7 +4581,7 @@ checksum = "2386b4ebe91c2f7f51082d4cefa145d030e33a1842a96b12e4885cc3c01f7a55" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -4591,7 +4595,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -4607,7 +4611,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -4622,7 +4626,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -4646,7 +4650,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4666,7 +4670,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "clap", "frame-election-provider-support", @@ -4688,7 +4692,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -4703,7 +4707,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "beefy-primitives", "frame-support", @@ -4719,7 +4723,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -4744,7 +4748,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -4828,7 +4832,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -4845,7 +4849,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -4861,7 +4865,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4885,7 +4889,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -4903,7 +4907,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -4918,7 +4922,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -4941,7 +4945,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4957,7 +4961,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -4977,7 +4981,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -4994,7 +4998,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5011,7 +5015,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5029,7 +5033,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -5045,7 +5049,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5062,7 +5066,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5077,7 +5081,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -5091,7 +5095,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -5108,7 +5112,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5131,7 +5135,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5147,7 +5151,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5162,7 +5166,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -5176,7 +5180,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5192,7 +5196,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -5213,7 +5217,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5229,7 +5233,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -5243,7 +5247,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5266,7 +5270,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -5277,7 +5281,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "log", "sp-arithmetic", @@ -5286,7 +5290,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -5300,7 +5304,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5318,7 +5322,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5337,7 +5341,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-support", "frame-system", @@ -5354,7 +5358,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5371,7 +5375,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5382,7 +5386,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5399,7 +5403,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5415,7 +5419,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7827,7 +7831,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8118,7 +8122,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "log", "sp-core", @@ -8129,7 +8133,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "derive_more", @@ -8156,7 +8160,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "futures 0.3.19", "futures-timer", @@ -8179,7 +8183,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8195,7 +8199,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8212,7 +8216,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8223,7 +8227,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "chrono", "fdlimit", @@ -8261,7 +8265,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "fnv", "futures 0.3.19", @@ -8289,7 +8293,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "hash-db", "kvdb", @@ -8314,7 +8318,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "futures 0.3.19", @@ -8338,7 +8342,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "derive_more", @@ -8381,7 +8385,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "derive_more", "futures 0.3.19", @@ -8405,7 +8409,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8418,7 +8422,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "assert_matches", "async-trait", @@ -8452,7 +8456,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "futures 0.3.19", @@ -8477,7 +8481,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "sc-client-api", "sp-authorship", @@ -8488,7 +8492,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "lazy_static", "libsecp256k1", @@ -8516,7 +8520,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "derive_more", "environmental", @@ -8534,7 +8538,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "log", "parity-scale-codec", @@ -8550,7 +8554,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8568,7 +8572,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "derive_more", @@ -8606,7 +8610,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "derive_more", "finality-grandpa", @@ -8630,7 +8634,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "ansi_term", "futures 0.3.19", @@ -8647,7 +8651,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "derive_more", @@ -8662,7 +8666,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-std", "async-trait", @@ -8713,7 +8717,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "futures 0.3.19", "futures-timer", @@ -8729,7 +8733,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "bytes 1.1.0", "fnv", @@ -8757,7 +8761,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "futures 0.3.19", "libp2p", @@ -8770,7 +8774,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8779,7 +8783,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "futures 0.3.19", "hash-db", @@ -8810,7 +8814,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "futures 0.3.19", "jsonrpc-core", @@ -8835,7 +8839,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "futures 0.3.19", "jsonrpc-core", @@ -8852,7 +8856,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "directories", @@ -8916,7 +8920,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "log", "parity-scale-codec", @@ -8930,7 +8934,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8952,7 +8956,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "chrono", "futures 0.3.19", @@ -8970,7 +8974,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "ansi_term", "atty", @@ -9001,7 +9005,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9012,7 +9016,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "futures 0.3.19", "futures-timer", @@ -9039,7 +9043,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "derive_more", "futures 0.3.19", @@ -9053,11 +9057,12 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "futures 0.3.19", "futures-timer", "lazy_static", + "parking_lot", "prometheus", ] @@ -9469,7 +9474,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "hash-db", "log", @@ -9486,7 +9491,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -9498,7 +9503,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "scale-info", @@ -9511,7 +9516,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "integer-sqrt", "num-traits", @@ -9526,7 +9531,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "scale-info", @@ -9539,7 +9544,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "parity-scale-codec", @@ -9551,7 +9556,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "sp-api", @@ -9563,7 +9568,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "futures 0.3.19", "log", @@ -9581,7 +9586,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "futures 0.3.19", @@ -9600,7 +9605,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "merlin", @@ -9623,7 +9628,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "scale-info", @@ -9635,7 +9640,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9647,7 +9652,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "base58", "bitflags", @@ -9695,7 +9700,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "blake2-rfc", "byteorder", @@ -9708,7 +9713,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "proc-macro2", "quote", @@ -9719,7 +9724,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "kvdb", "parking_lot", @@ -9728,7 +9733,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "proc-macro2", "quote", @@ -9738,7 +9743,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "environmental", "parity-scale-codec", @@ -9749,7 +9754,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "finality-grandpa", "log", @@ -9767,7 +9772,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9781,7 +9786,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "futures 0.3.19", "hash-db", @@ -9805,7 +9810,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "lazy_static", "sp-core", @@ -9816,7 +9821,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "derive_more", @@ -9833,7 +9838,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "zstd", ] @@ -9841,7 +9846,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "scale-info", @@ -9856,7 +9861,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9867,7 +9872,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "sp-api", "sp-core", @@ -9877,7 +9882,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "backtrace", "lazy_static", @@ -9887,7 +9892,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "rustc-hash", "serde", @@ -9897,7 +9902,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "either", "hash256-std-hasher", @@ -9919,7 +9924,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9936,7 +9941,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -9948,7 +9953,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "serde", "serde_json", @@ -9957,7 +9962,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "scale-info", @@ -9971,7 +9976,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "scale-info", @@ -9982,7 +9987,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "hash-db", "log", @@ -10005,12 +10010,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" [[package]] name = "sp-storage" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10023,7 +10028,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "log", "sp-core", @@ -10036,7 +10041,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "futures-timer", @@ -10052,7 +10057,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "sp-std", @@ -10064,7 +10069,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "sp-api", "sp-runtime", @@ -10073,7 +10078,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "log", @@ -10089,7 +10094,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "hash-db", "memory-db", @@ -10104,7 +10109,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10121,7 +10126,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10132,7 +10137,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "impl-trait-for-tuples", "log", @@ -10345,7 +10350,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "platforms", ] @@ -10353,7 +10358,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.19", @@ -10375,7 +10380,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-std", "derive_more", @@ -10389,7 +10394,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "async-trait", "futures 0.3.19", @@ -10415,7 +10420,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "futures 0.3.19", "substrate-test-utils-derive", @@ -10425,7 +10430,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -10436,7 +10441,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "ansi_term", "build-helper", @@ -10578,7 +10583,7 @@ dependencies = [ [[package]] name = "test-runner" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "frame-system", "futures 0.3.19", @@ -11019,7 +11024,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#0f070c8020fad552247fd4b43c1a6a4506e456b5" +source = "git+https://github.com/paritytech/substrate?branch=master#7409589ab78e7cb508db873dd6384634d667b8f5" dependencies = [ "jsonrpsee", "log", diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs index f81bab064b..d599626a2a 100644 --- a/polkadot/node/service/src/lib.rs +++ b/polkadot/node/service/src/lib.rs @@ -34,6 +34,7 @@ mod tests; #[cfg(feature = "full-node")] use { + beefy_gadget::notification::{BeefyBestBlockSender, BeefySignedCommitmentSender}, grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider}, polkadot_node_core_approval_voting::Config as ApprovalVotingConfig, polkadot_node_core_av_store::Config as AvailabilityConfig, @@ -414,7 +415,7 @@ fn new_partial( >, grandpa::LinkHalf, ChainSelection>, babe::BabeLink, - beefy_gadget::notification::BeefySignedCommitmentSender, + (BeefySignedCommitmentSender, BeefyBestBlockSender), ), grandpa::SharedVoterState, std::time::Duration, // slot-duration @@ -485,8 +486,11 @@ where telemetry.as_ref().map(|x| x.handle()), )?; - let (beefy_link, beefy_commitment_stream) = - beefy_gadget::notification::BeefySignedCommitmentStream::channel(); + let (beefy_commitment_link, beefy_commitment_stream) = + beefy_gadget::notification::BeefySignedCommitmentStream::::channel(); + let (beefy_best_block_link, beefy_best_block_stream) = + beefy_gadget::notification::BeefyBestBlockStream::::channel(); + let beefy_links = (beefy_commitment_link, beefy_best_block_link); let justification_stream = grandpa_link.justification_stream(); let shared_authority_set = grandpa_link.shared_authority_set().clone(); @@ -496,12 +500,12 @@ where Some(shared_authority_set.clone()), ); - let import_setup = (block_import.clone(), grandpa_link, babe_link.clone(), beefy_link); - let rpc_setup = shared_voter_state.clone(); - let shared_epoch_changes = babe_link.epoch_changes().clone(); let slot_duration = babe_config.slot_duration(); + let import_setup = (block_import, grandpa_link, babe_link, beefy_links); + let rpc_setup = shared_voter_state.clone(); + let rpc_extensions_builder = { let client = client.clone(); let keystore = keystore_container.sync_keystore(); @@ -532,6 +536,7 @@ where }, beefy: polkadot_rpc::BeefyDeps { beefy_commitment_stream: beefy_commitment_stream.clone(), + beefy_best_block_stream: beefy_best_block_stream.clone(), subscription_executor, }, }; @@ -893,7 +898,7 @@ where telemetry: telemetry.as_mut(), })?; - let (block_import, link_half, babe_link, beefy_link) = import_setup; + let (block_import, link_half, babe_link, beefy_links) = import_setup; let overseer_client = client.clone(); let spawner = task_manager.spawn_handle(); @@ -1091,7 +1096,8 @@ where backend: backend.clone(), key_store: keystore_opt.clone(), network: network.clone(), - signed_commitment_sender: beefy_link, + signed_commitment_sender: beefy_links.0, + beefy_best_block_sender: beefy_links.1, min_block_delta: if chain_spec.is_wococo() { 4 } else { 8 }, prometheus_registry: prometheus_registry.clone(), protocol_name: beefy_protocol_name, diff --git a/polkadot/rpc/src/lib.rs b/polkadot/rpc/src/lib.rs index bc99dae1b3..e5a216865f 100644 --- a/polkadot/rpc/src/lib.rs +++ b/polkadot/rpc/src/lib.rs @@ -61,10 +61,13 @@ pub struct GrandpaDeps { pub finality_provider: Arc>, } +use beefy_gadget::notification::{BeefyBestBlockStream, BeefySignedCommitmentStream}; /// Dependencies for BEEFY pub struct BeefyDeps { /// Receives notifications about signed commitment events from BEEFY. - pub beefy_commitment_stream: beefy_gadget::notification::BeefySignedCommitmentStream, + pub beefy_commitment_stream: BeefySignedCommitmentStream, + /// Receives notifications about best block events from BEEFY. + pub beefy_best_block_stream: BeefyBestBlockStream, /// Executor to drive the subscription manager in the BEEFY RPC handler. pub subscription_executor: sc_rpc::SubscriptionTaskExecutor, } @@ -155,12 +158,12 @@ where deny_unsafe, )?)); - io.extend_with(beefy_gadget_rpc::BeefyApi::to_delegate( - beefy_gadget_rpc::BeefyRpcHandler::new( - beefy.beefy_commitment_stream, - beefy.subscription_executor, - ), - )); + let handler: beefy_gadget_rpc::BeefyRpcHandler = beefy_gadget_rpc::BeefyRpcHandler::new( + beefy.beefy_commitment_stream, + beefy.beefy_best_block_stream, + beefy.subscription_executor, + )?; + io.extend_with(beefy_gadget_rpc::BeefyApi::to_delegate(handler)); Ok(io) }