From 7ea6595497648665bbb6ed61f42ec19fb2d920ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 17 Nov 2021 11:35:02 +0100 Subject: [PATCH] Substrate companion: Authority discovery multiple peer ids (#4295) * Substrate companion: Authority discovery multiple peer ids Authority discovery before had a fixed mapping from `PeerId` to `AuthorityId`. This wasn't correct, as a `PeerId` can actually map to multiple `AuthorityId`s. The linked Substrate pr fixes this. https://github.com/paritytech/substrate/pull/10259 * Update node/network/availability-distribution/src/requester/mod.rs * Update node/network/collator-protocol/src/validator_side/mod.rs * Update node/network/statement-distribution/src/tests.rs * Update guide * Adapt to Substrate pr * Update Substrate --- Cargo.lock | 326 +++++++++--------- node/network/bridge/src/lib.rs | 2 +- node/network/bridge/src/tests.rs | 6 +- .../network/bridge/src/validator_discovery.rs | 34 +- .../src/collator_side/mod.rs | 22 +- .../src/collator_side/tests.rs | 4 +- .../dispute-distribution/src/receiver/mod.rs | 2 +- .../dispute-distribution/src/tests/mock.rs | 17 +- node/network/gossip-support/src/lib.rs | 23 +- node/network/gossip-support/src/tests.rs | 43 ++- .../protocol/src/authority_discovery.rs | 16 +- .../network/statement-distribution/src/lib.rs | 16 +- .../statement-distribution/src/tests.rs | 18 +- node/subsystem-types/src/messages.rs | 2 +- .../src/messages/network_bridge_event.rs | 2 +- .../implementers-guide/src/types/network.md | 2 +- .../src/types/overseer-protocol.md | 2 +- 17 files changed, 281 insertions(+), 256 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 00f361cbedf2..3016a823dcd1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -454,7 +454,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "beefy-primitives", "fnv", @@ -482,7 +482,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -502,12 +502,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "scale-info", @@ -1902,7 +1902,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", ] @@ -1920,7 +1920,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -1940,7 +1940,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "Inflector", "chrono", @@ -1966,7 +1966,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -1980,7 +1980,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -2008,7 +2008,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "bitflags", "frame-metadata", @@ -2037,7 +2037,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2049,7 +2049,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -2061,7 +2061,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "proc-macro2", "quote", @@ -2071,7 +2071,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2094,7 +2094,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -2105,7 +2105,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "log", @@ -2122,7 +2122,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -2137,7 +2137,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "sp-api", @@ -2146,7 +2146,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "sp-api", @@ -2359,7 +2359,7 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "chrono", "frame-election-provider-support", @@ -4657,7 +4657,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4671,7 +4671,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -4687,7 +4687,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -4702,7 +4702,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4726,7 +4726,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4746,7 +4746,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "clap", "frame-election-provider-support", @@ -4768,7 +4768,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4783,7 +4783,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "beefy-primitives", "frame-support", @@ -4799,7 +4799,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -4824,7 +4824,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4909,7 +4909,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4926,7 +4926,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4942,7 +4942,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4966,7 +4966,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4984,7 +4984,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4999,7 +4999,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5022,7 +5022,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5038,7 +5038,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5058,7 +5058,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5075,7 +5075,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5092,7 +5092,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5110,7 +5110,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -5126,7 +5126,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5143,7 +5143,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5158,7 +5158,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -5172,7 +5172,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -5189,7 +5189,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5212,7 +5212,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5227,7 +5227,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -5241,7 +5241,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5257,7 +5257,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -5278,7 +5278,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5294,7 +5294,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -5308,7 +5308,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5331,7 +5331,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -5342,7 +5342,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "log", "sp-arithmetic", @@ -5351,7 +5351,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -5365,7 +5365,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5383,7 +5383,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5402,7 +5402,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-support", "frame-system", @@ -5419,7 +5419,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5436,7 +5436,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5447,7 +5447,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5464,7 +5464,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5480,7 +5480,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-benchmarking", "frame-support", @@ -7885,7 +7885,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8173,7 +8173,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "log", "sp-core", @@ -8184,7 +8184,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "derive_more", @@ -8211,7 +8211,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8234,7 +8234,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8250,7 +8250,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8267,7 +8267,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8278,7 +8278,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "chrono", "fdlimit", @@ -8316,7 +8316,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "fnv", "futures 0.3.17", @@ -8344,7 +8344,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "hash-db", "kvdb", @@ -8369,7 +8369,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "futures 0.3.17", @@ -8393,7 +8393,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "derive_more", @@ -8436,7 +8436,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "derive_more", "futures 0.3.17", @@ -8460,7 +8460,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8473,7 +8473,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "assert_matches", "async-trait", @@ -8507,7 +8507,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "futures 0.3.17", @@ -8533,7 +8533,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "sc-client-api", "sp-authorship", @@ -8544,7 +8544,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "lazy_static", "libsecp256k1 0.6.0", @@ -8571,7 +8571,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "derive_more", "environmental", @@ -8589,7 +8589,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "log", "parity-scale-codec", @@ -8605,7 +8605,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8623,7 +8623,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "derive_more", @@ -8660,7 +8660,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "derive_more", "finality-grandpa", @@ -8684,7 +8684,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "ansi_term 0.12.1", "futures 0.3.17", @@ -8701,7 +8701,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "derive_more", @@ -8716,7 +8716,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-std", "async-trait", @@ -8767,7 +8767,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8783,7 +8783,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "bytes 1.0.1", "fnv", @@ -8811,7 +8811,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "futures 0.3.17", "libp2p", @@ -8824,7 +8824,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8833,7 +8833,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "futures 0.3.17", "hash-db", @@ -8864,7 +8864,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8889,7 +8889,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8906,7 +8906,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "directories", @@ -8970,7 +8970,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "log", "parity-scale-codec", @@ -8984,7 +8984,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9006,7 +9006,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "chrono", "futures 0.3.17", @@ -9024,7 +9024,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9055,7 +9055,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9066,7 +9066,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "futures 0.3.17", "intervalier", @@ -9093,7 +9093,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "derive_more", "futures 0.3.17", @@ -9107,7 +9107,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -9538,7 +9538,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "hash-db", "log", @@ -9555,7 +9555,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -9567,7 +9567,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "scale-info", @@ -9580,7 +9580,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "integer-sqrt", "num-traits", @@ -9595,7 +9595,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "scale-info", @@ -9608,7 +9608,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "parity-scale-codec", @@ -9620,7 +9620,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "sp-api", @@ -9632,7 +9632,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "futures 0.3.17", "log", @@ -9650,7 +9650,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "futures 0.3.17", @@ -9669,7 +9669,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "merlin", @@ -9692,7 +9692,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "scale-info", @@ -9704,7 +9704,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9716,7 +9716,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "base58", "bitflags", @@ -9764,7 +9764,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "blake2-rfc", "byteorder", @@ -9777,7 +9777,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "proc-macro2", "quote", @@ -9788,7 +9788,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "kvdb", "parking_lot", @@ -9797,7 +9797,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "proc-macro2", "quote", @@ -9807,7 +9807,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "environmental", "parity-scale-codec", @@ -9818,7 +9818,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "finality-grandpa", "log", @@ -9836,7 +9836,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9850,7 +9850,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "futures 0.3.17", "hash-db", @@ -9874,7 +9874,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "lazy_static", "sp-core", @@ -9885,7 +9885,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "derive_more", @@ -9902,7 +9902,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "zstd", ] @@ -9910,7 +9910,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "scale-info", @@ -9925,7 +9925,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9936,7 +9936,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "sp-api", "sp-core", @@ -9946,7 +9946,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "backtrace", "lazy_static", @@ -9956,7 +9956,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "rustc-hash", "serde", @@ -9966,7 +9966,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "either", "hash256-std-hasher", @@ -9988,7 +9988,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10005,7 +10005,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -10017,7 +10017,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "serde", "serde_json", @@ -10026,7 +10026,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "scale-info", @@ -10040,7 +10040,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "scale-info", @@ -10051,7 +10051,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "hash-db", "log", @@ -10074,12 +10074,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10092,7 +10092,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "log", "sp-core", @@ -10105,7 +10105,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -10121,7 +10121,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "sp-std", @@ -10133,7 +10133,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "sp-api", "sp-runtime", @@ -10142,7 +10142,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "log", @@ -10158,7 +10158,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "hash-db", "memory-db", @@ -10173,7 +10173,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10189,7 +10189,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10200,7 +10200,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10389,7 +10389,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "platforms", ] @@ -10397,7 +10397,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.17", @@ -10419,7 +10419,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-std", "derive_more", @@ -10433,7 +10433,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "async-trait", "futures 0.3.17", @@ -10459,7 +10459,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "futures 0.3.17", "substrate-test-utils-derive", @@ -10469,7 +10469,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -10480,7 +10480,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -10616,7 +10616,7 @@ dependencies = [ [[package]] name = "test-runner" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "frame-system", "futures 0.3.17", @@ -11058,7 +11058,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#cc4bf9134b492d3a11f45c6b1cfa4fdf307e63e2" +source = "git+https://github.com/paritytech/substrate?branch=master#0baa586a57803dffa09ce1051ef54a63ad6f40d1" dependencies = [ "jsonrpsee", "log", diff --git a/node/network/bridge/src/lib.rs b/node/network/bridge/src/lib.rs index 0ca63f027fa2..dd67d615e2c8 100644 --- a/node/network/bridge/src/lib.rs +++ b/node/network/bridge/src/lib.rs @@ -661,7 +661,7 @@ async fn handle_network_messages( }; let maybe_authority = - authority_discovery_service.get_authority_id_by_peer_id(peer).await; + authority_discovery_service.get_authority_ids_by_peer_id(peer).await; match peer_set { PeerSet::Validation => { diff --git a/node/network/bridge/src/tests.rs b/node/network/bridge/src/tests.rs index 3be01dd8ae76..ec83d223352f 100644 --- a/node/network/bridge/src/tests.rs +++ b/node/network/bridge/src/tests.rs @@ -143,14 +143,14 @@ impl validator_discovery::AuthorityDiscovery for TestAuthorityDiscovery { async fn get_addresses_by_authority_id( &mut self, _authority: AuthorityDiscoveryId, - ) -> Option> { + ) -> Option> { None } - async fn get_authority_id_by_peer_id( + async fn get_authority_ids_by_peer_id( &mut self, _peer_id: PeerId, - ) -> Option { + ) -> Option> { None } } diff --git a/node/network/bridge/src/validator_discovery.rs b/node/network/bridge/src/validator_discovery.rs index c338e0e62f70..324a7f29055a 100644 --- a/node/network/bridge/src/validator_discovery.rs +++ b/node/network/bridge/src/validator_discovery.rs @@ -159,7 +159,10 @@ mod tests { use polkadot_node_network_protocol::{request_response::outgoing::Requests, PeerId}; use sc_network::{Event as NetworkEvent, IfDisconnected}; use sp_keyring::Sr25519Keyring; - use std::{borrow::Cow, collections::HashMap}; + use std::{ + borrow::Cow, + collections::{HashMap, HashSet}, + }; fn new_service() -> Service { Service::new() @@ -176,8 +179,8 @@ mod tests { #[derive(Default, Clone, Debug)] struct TestAuthorityDiscovery { - by_authority_id: HashMap, - by_peer_id: HashMap, + by_authority_id: HashMap>, + by_peer_id: HashMap>, } impl TestAuthorityDiscovery { @@ -187,12 +190,15 @@ mod tests { let multiaddr = known_multiaddr().into_iter().zip(peer_ids.iter().cloned()).map( |(mut addr, peer_id)| { addr.push(multiaddr::Protocol::P2p(peer_id.into())); - addr + HashSet::from([addr]) }, ); Self { by_authority_id: authorities.iter().cloned().zip(multiaddr).collect(), - by_peer_id: peer_ids.into_iter().zip(authorities.into_iter()).collect(), + by_peer_id: peer_ids + .into_iter() + .zip(authorities.into_iter().map(|a| HashSet::from([a]))) + .collect(), } } } @@ -246,14 +252,14 @@ mod tests { async fn get_addresses_by_authority_id( &mut self, authority: AuthorityDiscoveryId, - ) -> Option> { - self.by_authority_id.get(&authority).cloned().map(|addr| vec![addr]) + ) -> Option> { + self.by_authority_id.get(&authority).cloned() } - async fn get_authority_id_by_peer_id( + async fn get_authority_ids_by_peer_id( &mut self, peer_id: PeerId, - ) -> Option { + ) -> Option> { self.by_peer_id.get(&peer_id).cloned() } } @@ -283,7 +289,8 @@ mod tests { let (ns, ads) = new_network(); - let authority_ids: Vec<_> = ads.by_peer_id.values().cloned().collect(); + let authority_ids: Vec<_> = + ads.by_peer_id.values().map(|v| v.iter()).flatten().cloned().collect(); futures::executor::block_on(async move { let (failed, _) = oneshot::channel(); @@ -299,7 +306,7 @@ mod tests { let state = &service.state[PeerSet::Validation]; assert_eq!(state.previously_requested.len(), 1); let peer_1 = extract_peer_ids( - vec![ads.by_authority_id.get(&authority_ids[1]).unwrap().clone()].into_iter(), + ads.by_authority_id.get(&authority_ids[1]).unwrap().clone().into_iter(), ) .iter() .cloned() @@ -315,7 +322,8 @@ mod tests { let (ns, ads) = new_network(); - let authority_ids: Vec<_> = ads.by_peer_id.values().cloned().collect(); + let authority_ids: Vec<_> = + ads.by_peer_id.values().map(|v| v.iter()).flatten().cloned().collect(); futures::executor::block_on(async move { let (failed, failed_rx) = oneshot::channel(); @@ -333,7 +341,7 @@ mod tests { let state = &service.state[PeerSet::Validation]; assert_eq!(state.previously_requested.len(), 1); let peer_0 = extract_peer_ids( - vec![ads.by_authority_id.get(&authority_ids[0]).unwrap().clone()].into_iter(), + ads.by_authority_id.get(&authority_ids[0]).unwrap().clone().into_iter(), ) .iter() .cloned() diff --git a/node/network/collator-protocol/src/collator_side/mod.rs b/node/network/collator-protocol/src/collator_side/mod.rs index 2784bc37c9b8..9bfe3a56ed9c 100644 --- a/node/network/collator-protocol/src/collator_side/mod.rs +++ b/node/network/collator-protocol/src/collator_side/mod.rs @@ -165,11 +165,11 @@ impl ValidatorGroup { /// Returns `true` if we should advertise our collation to the given peer. fn should_advertise_to( &self, - peer_ids: &HashMap, + peer_ids: &HashMap>, peer: &PeerId, ) -> bool { match peer_ids.get(peer) { - Some(discovery_id) => !self.advertised_to.contains(discovery_id), + Some(discovery_ids) => !discovery_ids.iter().any(|d| self.advertised_to.contains(d)), None => false, } } @@ -177,11 +177,13 @@ impl ValidatorGroup { /// Should be called after we advertised our collation to the given `peer` to keep track of it. fn advertised_to_peer( &mut self, - peer_ids: &HashMap, + peer_ids: &HashMap>, peer: &PeerId, ) { - if let Some(validator_id) = peer_ids.get(peer) { - self.advertised_to.insert(validator_id.clone()); + if let Some(authority_ids) = peer_ids.get(peer) { + authority_ids.iter().for_each(|a| { + self.advertised_to.insert(a.clone()); + }); } } } @@ -274,9 +276,9 @@ struct State { /// Our validator groups per active leaf. our_validators_groups: HashMap, - /// The mapping from [`PeerId`] to [`ValidatorId`]. This is filled over time as we learn the [`PeerId`]'s + /// The mapping from [`PeerId`] to [`HashSet`]. This is filled over time as we learn the [`PeerId`]'s /// by `PeerConnected` events. - peer_ids: HashMap, + peer_ids: HashMap>, /// Metrics. metrics: Metrics, @@ -907,14 +909,14 @@ where // If it is possible that a disconnected validator would attempt a reconnect // it should be handled here. tracing::trace!(target: LOG_TARGET, ?peer_id, ?observed_role, "Peer connected"); - if let Some(authority) = maybe_authority { + if let Some(authority_ids) = maybe_authority { tracing::trace!( target: LOG_TARGET, - ?authority, + ?authority_ids, ?peer_id, "Connected to requested validator" ); - state.peer_ids.insert(peer_id, authority); + state.peer_ids.insert(peer_id, authority_ids); declare(ctx, state, peer_id).await; } diff --git a/node/network/collator-protocol/src/collator_side/tests.rs b/node/network/collator-protocol/src/collator_side/tests.rs index bef02c42cd55..343243cc7140 100644 --- a/node/network/collator-protocol/src/collator_side/tests.rs +++ b/node/network/collator-protocol/src/collator_side/tests.rs @@ -16,7 +16,7 @@ use super::*; -use std::{sync::Arc, time::Duration}; +use std::{collections::HashSet, sync::Arc, time::Duration}; use assert_matches::assert_matches; use futures::{executor, future, Future, SinkExt}; @@ -405,7 +405,7 @@ async fn connect_peer( CollatorProtocolMessage::NetworkBridgeUpdateV1(NetworkBridgeEvent::PeerConnected( peer.clone(), polkadot_node_network_protocol::ObservedRole::Authority, - authority_id, + authority_id.map(|v| HashSet::from([v])), )), ) .await; diff --git a/node/network/dispute-distribution/src/receiver/mod.rs b/node/network/dispute-distribution/src/receiver/mod.rs index 5bd8b6712ba8..32e5a686b4d8 100644 --- a/node/network/dispute-distribution/src/receiver/mod.rs +++ b/node/network/dispute-distribution/src/receiver/mod.rs @@ -197,7 +197,7 @@ where let peer = incoming.peer; // Only accept messages from validators: - if self.authority_discovery.get_authority_id_by_peer_id(peer).await.is_none() { + if self.authority_discovery.get_authority_ids_by_peer_id(peer).await.is_none() { incoming .send_outgoing_response(OutgoingResponse { result: Err(()), diff --git a/node/network/dispute-distribution/src/tests/mock.rs b/node/network/dispute-distribution/src/tests/mock.rs index be3c3c4d40b1..1cca0e2ed049 100644 --- a/node/network/dispute-distribution/src/tests/mock.rs +++ b/node/network/dispute-distribution/src/tests/mock.rs @@ -17,7 +17,10 @@ //! Mock data and utility functions for unit tests in this subsystem. -use std::{collections::HashMap, sync::Arc}; +use std::{ + collections::{HashMap, HashSet}, + sync::Arc, +}; use async_trait::async_trait; use lazy_static::lazy_static; @@ -171,19 +174,23 @@ impl AuthorityDiscovery for MockAuthorityDiscovery { async fn get_addresses_by_authority_id( &mut self, _authority: polkadot_primitives::v1::AuthorityDiscoveryId, - ) -> Option> { + ) -> Option> { panic!("Not implemented"); } - async fn get_authority_id_by_peer_id( + async fn get_authority_ids_by_peer_id( &mut self, peer_id: polkadot_node_network_protocol::PeerId, - ) -> Option { + ) -> Option> { for (a, p) in self.peer_ids.iter() { if p == &peer_id { - return Some(MOCK_VALIDATORS_DISCOVERY_KEYS.get(&a).unwrap().clone()) + return Some(HashSet::from([MOCK_VALIDATORS_DISCOVERY_KEYS + .get(&a) + .unwrap() + .clone()])) } } + None } } diff --git a/node/network/gossip-support/src/lib.rs b/node/network/gossip-support/src/lib.rs index 0679c3ffe2de..5873ef2586bd 100644 --- a/node/network/gossip-support/src/lib.rs +++ b/node/network/gossip-support/src/lib.rs @@ -25,7 +25,7 @@ //! the `NetworkBridgeMessage::NewGossipTopology` message. use std::{ - collections::HashMap, + collections::{HashMap, HashSet}, fmt, time::{Duration, Instant}, }; @@ -94,14 +94,14 @@ pub struct GossipSupport { /// Successfully resolved connections /// /// waiting for actual connection. - resolved_authorities: HashMap>, + resolved_authorities: HashMap>, /// Actually connected authorities. connected_authorities: HashMap, /// By `PeerId`. /// /// Needed for efficient handling of disconnect events. - connected_authorities_by_peer_id: HashMap, + connected_authorities_by_peer_id: HashMap>, /// Authority discovery service. authority_discovery: AD, } @@ -299,14 +299,19 @@ where fn handle_connect_disconnect(&mut self, ev: NetworkBridgeEvent) { match ev { NetworkBridgeEvent::PeerConnected(peer_id, _, o_authority) => { - if let Some(authority) = o_authority { - self.connected_authorities.insert(authority.clone(), peer_id); - self.connected_authorities_by_peer_id.insert(peer_id, authority); + if let Some(authority_ids) = o_authority { + authority_ids.iter().for_each(|a| { + self.connected_authorities.insert(a.clone(), peer_id); + }); + self.connected_authorities_by_peer_id.insert(peer_id, authority_ids); } }, NetworkBridgeEvent::PeerDisconnected(peer_id) => { - if let Some(authority) = self.connected_authorities_by_peer_id.remove(&peer_id) { - self.connected_authorities.remove(&authority); + if let Some(authority_ids) = self.connected_authorities_by_peer_id.remove(&peer_id) + { + authority_ids.into_iter().for_each(|a| { + self.connected_authorities.remove(&a); + }); } }, NetworkBridgeEvent::OurViewChange(_) => {}, @@ -474,7 +479,7 @@ struct PrettyAuthorities(I); impl<'a, I> fmt::Display for PrettyAuthorities where - I: Iterator)> + Clone, + I: Iterator)> + Clone, { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let mut authorities = self.0.clone().peekable(); diff --git a/node/network/gossip-support/src/tests.rs b/node/network/gossip-support/src/tests.rs index 1220f1a5461f..a3267a1daa11 100644 --- a/node/network/gossip-support/src/tests.rs +++ b/node/network/gossip-support/src/tests.rs @@ -16,7 +16,7 @@ //! Unit tests for Gossip Support Subsystem. -use std::{sync::Arc, time::Duration}; +use std::{collections::HashSet, sync::Arc, time::Duration}; use assert_matches::assert_matches; use async_trait::async_trait; @@ -64,8 +64,8 @@ type VirtualOverseer = test_helpers::TestSubsystemContextHandle>, - authorities: HashMap, + addrs: HashMap>, + authorities: HashMap>, } impl MockAuthorityDiscovery { @@ -77,10 +77,13 @@ impl MockAuthorityDiscovery { .into_iter() .map(|(p, a)| { let multiaddr = Multiaddr::empty().with(Protocol::P2p(p.into())); - (a, vec![multiaddr]) + (a, HashSet::from([multiaddr])) }) .collect(); - Self { addrs, authorities } + Self { + addrs, + authorities: authorities.into_iter().map(|(p, a)| (p, HashSet::from([a]))).collect(), + } } } @@ -89,18 +92,18 @@ impl AuthorityDiscovery for MockAuthorityDiscovery { async fn get_addresses_by_authority_id( &mut self, authority: polkadot_primitives::v1::AuthorityDiscoveryId, - ) -> Option> { + ) -> Option> { self.addrs.get(&authority).cloned() } - async fn get_authority_id_by_peer_id( + async fn get_authority_ids_by_peer_id( &mut self, peer_id: polkadot_node_network_protocol::PeerId, - ) -> Option { + ) -> Option> { self.authorities.get(&peer_id).cloned() } } -async fn get_other_authorities_addrs() -> Vec> { +async fn get_other_authorities_addrs() -> Vec> { let mut addrs = Vec::with_capacity(OTHER_AUTHORITIES.len()); let mut discovery = MOCK_AUTHORITY_DISCOVERY.clone(); for authority in OTHER_AUTHORITIES.iter().cloned() { @@ -111,7 +114,7 @@ async fn get_other_authorities_addrs() -> Vec> { addrs } -async fn get_other_authorities_addrs_map() -> HashMap> { +async fn get_other_authorities_addrs_map() -> HashMap> { let mut addrs = HashMap::with_capacity(OTHER_AUTHORITIES.len()); let mut discovery = MOCK_AUTHORITY_DISCOVERY.clone(); for authority in OTHER_AUTHORITIES.iter().cloned() { @@ -332,11 +335,11 @@ fn test_log_output() { let mut m = HashMap::new(); let peer_id = PeerId::random(); let addr = Multiaddr::empty().with(Protocol::P2p(peer_id.into())); - let addrs = vec![addr.clone(), addr]; + let addrs = HashSet::from([addr.clone(), addr]); m.insert(alice, addrs); let peer_id = PeerId::random(); let addr = Multiaddr::empty().with(Protocol::P2p(peer_id.into())); - let addrs = vec![addr.clone(), addr]; + let addrs = HashSet::from([addr.clone(), addr]); m.insert(bob, addrs); m }; @@ -389,16 +392,14 @@ fn issues_a_connection_request_when_last_request_was_mostly_unresolved() { assert_matches!( overseer_recv(overseer).await, AllMessages::NetworkBridge(NetworkBridgeMessage::ConnectToResolvedValidators { - mut validator_addrs, + validator_addrs, peer_set, }) => { let mut expected = get_other_authorities_addrs_map().await; expected.remove(&alice); expected.remove(&bob); - let mut expected: Vec> = expected.into_iter().map(|(_,v)| v).collect(); - validator_addrs.sort(); - expected.sort(); - assert_eq!(validator_addrs, expected); + let expected: HashSet = expected.into_iter().map(|(_,v)| v.into_iter()).flatten().collect(); + assert_eq!(validator_addrs.into_iter().map(|v| v.into_iter()).flatten().collect::>(), expected); assert_eq!(peer_set, PeerSet::Validation); } ); @@ -443,15 +444,13 @@ fn issues_a_connection_request_when_last_request_was_mostly_unresolved() { assert_matches!( overseer_recv(overseer).await, AllMessages::NetworkBridge(NetworkBridgeMessage::ConnectToResolvedValidators { - mut validator_addrs, + validator_addrs, peer_set, }) => { let mut expected = get_other_authorities_addrs_map().await; expected.remove(&bob); - let mut expected: Vec> = expected.into_iter().map(|(_,v)| v).collect(); - expected.sort(); - validator_addrs.sort(); - assert_eq!(validator_addrs, expected); + let expected: HashSet = expected.into_iter().map(|(_,v)| v.into_iter()).flatten().collect(); + assert_eq!(validator_addrs.into_iter().map(|v| v.into_iter()).flatten().collect::>(), expected); assert_eq!(peer_set, PeerSet::Validation); } ); diff --git a/node/network/protocol/src/authority_discovery.rs b/node/network/protocol/src/authority_discovery.rs index 03e8a5cb2980..b769ecad1746 100644 --- a/node/network/protocol/src/authority_discovery.rs +++ b/node/network/protocol/src/authority_discovery.rs @@ -16,7 +16,7 @@ //! Authority discovery service interfacing. -use std::fmt::Debug; +use std::{collections::HashSet, fmt::Debug}; use async_trait::async_trait; @@ -34,12 +34,12 @@ pub trait AuthorityDiscovery: Send + Debug + 'static { async fn get_addresses_by_authority_id( &mut self, authority: AuthorityDiscoveryId, - ) -> Option>; + ) -> Option>; /// Get the [`AuthorityId`] for the given [`PeerId`] from the local address cache. - async fn get_authority_id_by_peer_id( + async fn get_authority_ids_by_peer_id( &mut self, peer_id: PeerId, - ) -> Option; + ) -> Option>; } #[async_trait] @@ -47,14 +47,14 @@ impl AuthorityDiscovery for AuthorityDiscoveryService { async fn get_addresses_by_authority_id( &mut self, authority: AuthorityDiscoveryId, - ) -> Option> { + ) -> Option> { AuthorityDiscoveryService::get_addresses_by_authority_id(self, authority).await } - async fn get_authority_id_by_peer_id( + async fn get_authority_ids_by_peer_id( &mut self, peer_id: PeerId, - ) -> Option { - AuthorityDiscoveryService::get_authority_id_by_peer_id(self, peer_id).await + ) -> Option> { + AuthorityDiscoveryService::get_authority_ids_by_peer_id(self, peer_id).await } } diff --git a/node/network/statement-distribution/src/lib.rs b/node/network/statement-distribution/src/lib.rs index a810a663a87d..e07321e8e42a 100644 --- a/node/network/statement-distribution/src/lib.rs +++ b/node/network/statement-distribution/src/lib.rs @@ -413,8 +413,8 @@ impl PeerRelayParentKnowledge { struct PeerData { view: View, view_knowledge: HashMap, - // Peer might be an authority. - maybe_authority: Option, + /// Peer might be known as authority with the given ids. + maybe_authority: Option>, } impl PeerData { @@ -1466,14 +1466,18 @@ async fn handle_network_update( maybe_authority: maybe_authority.clone(), }, ); - if let Some(authority) = maybe_authority { - authorities.insert(authority, peer); + if let Some(authority_ids) = maybe_authority { + authority_ids.into_iter().for_each(|a| { + authorities.insert(a, peer); + }); } }, NetworkBridgeEvent::PeerDisconnected(peer) => { tracing::trace!(target: LOG_TARGET, ?peer, "Peer disconnected"); - if let Some(auth_id) = peers.remove(&peer).and_then(|p| p.maybe_authority) { - authorities.remove(&auth_id); + if let Some(auth_ids) = peers.remove(&peer).and_then(|p| p.maybe_authority) { + auth_ids.into_iter().for_each(|a| { + authorities.remove(&a); + }); } }, NetworkBridgeEvent::NewGossipTopology(new_peers) => { diff --git a/node/network/statement-distribution/src/tests.rs b/node/network/statement-distribution/src/tests.rs index 80fdb50a4f26..adc423f57f20 100644 --- a/node/network/statement-distribution/src/tests.rs +++ b/node/network/statement-distribution/src/tests.rs @@ -944,7 +944,7 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing( NetworkBridgeEvent::PeerConnected( peer_a.clone(), ObservedRole::Full, - Some(Sr25519Keyring::Alice.public().into()), + Some(HashSet::from([Sr25519Keyring::Alice.public().into()])), ), ), }) @@ -956,7 +956,7 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing( NetworkBridgeEvent::PeerConnected( peer_b.clone(), ObservedRole::Full, - Some(Sr25519Keyring::Bob.public().into()), + Some(HashSet::from([Sr25519Keyring::Bob.public().into()])), ), ), }) @@ -967,7 +967,7 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing( NetworkBridgeEvent::PeerConnected( peer_c.clone(), ObservedRole::Full, - Some(Sr25519Keyring::Charlie.public().into()), + Some(HashSet::from([Sr25519Keyring::Charlie.public().into()])), ), ), }) @@ -1444,7 +1444,7 @@ fn share_prioritizes_backing_group() { NetworkBridgeEvent::PeerConnected( peer, ObservedRole::Full, - Some(pair.public().into()), + Some(HashSet::from([pair.public().into()])), ), ), }) @@ -1466,7 +1466,7 @@ fn share_prioritizes_backing_group() { NetworkBridgeEvent::PeerConnected( peer_a.clone(), ObservedRole::Full, - Some(Sr25519Keyring::Alice.public().into()), + Some(HashSet::from([Sr25519Keyring::Alice.public().into()])), ), ), }) @@ -1477,7 +1477,7 @@ fn share_prioritizes_backing_group() { NetworkBridgeEvent::PeerConnected( peer_b.clone(), ObservedRole::Full, - Some(Sr25519Keyring::Bob.public().into()), + Some(HashSet::from([Sr25519Keyring::Bob.public().into()])), ), ), }) @@ -1488,7 +1488,7 @@ fn share_prioritizes_backing_group() { NetworkBridgeEvent::PeerConnected( peer_c.clone(), ObservedRole::Full, - Some(Sr25519Keyring::Charlie.public().into()), + Some(HashSet::from([Sr25519Keyring::Charlie.public().into()])), ), ), }) @@ -1506,7 +1506,7 @@ fn share_prioritizes_backing_group() { NetworkBridgeEvent::PeerConnected( peer_other_group.clone(), ObservedRole::Full, - Some(Sr25519Keyring::Dave.public().into()), + Some(HashSet::from([Sr25519Keyring::Dave.public().into()])), ), ), }) @@ -1728,7 +1728,7 @@ fn peer_cant_flood_with_large_statements() { NetworkBridgeEvent::PeerConnected( peer_a.clone(), ObservedRole::Full, - Some(Sr25519Keyring::Alice.public().into()), + Some(HashSet::from([Sr25519Keyring::Alice.public().into()])), ), ), }) diff --git a/node/subsystem-types/src/messages.rs b/node/subsystem-types/src/messages.rs index c89ccd118904..75b9b3f9d331 100644 --- a/node/subsystem-types/src/messages.rs +++ b/node/subsystem-types/src/messages.rs @@ -355,7 +355,7 @@ pub enum NetworkBridgeMessage { /// connected to. ConnectToResolvedValidators { /// Each entry corresponds to the addresses of an already resolved validator. - validator_addrs: Vec>, + validator_addrs: Vec>, /// The peer set we want the connection on. peer_set: PeerSet, }, diff --git a/node/subsystem-types/src/messages/network_bridge_event.rs b/node/subsystem-types/src/messages/network_bridge_event.rs index 2b53d0cd0be9..959181a2bd1b 100644 --- a/node/subsystem-types/src/messages/network_bridge_event.rs +++ b/node/subsystem-types/src/messages/network_bridge_event.rs @@ -25,7 +25,7 @@ use polkadot_primitives::v1::AuthorityDiscoveryId; #[derive(Debug, Clone, PartialEq)] pub enum NetworkBridgeEvent { /// A peer has connected. - PeerConnected(PeerId, ObservedRole, Option), + PeerConnected(PeerId, ObservedRole, Option>), /// A peer has disconnected. PeerDisconnected(PeerId), diff --git a/roadmap/implementers-guide/src/types/network.md b/roadmap/implementers-guide/src/types/network.md index edd039a127dd..b51015c3848e 100644 --- a/roadmap/implementers-guide/src/types/network.md +++ b/roadmap/implementers-guide/src/types/network.md @@ -144,7 +144,7 @@ These updates are posted from the [Network Bridge Subsystem](../node/utility/net ```rust enum NetworkBridgeEvent { /// A peer with given ID is now connected. - PeerConnected(PeerId, ObservedRole), + PeerConnected(PeerId, ObservedRole, Option>), /// A peer with given ID is now disconnected. PeerDisconnected(PeerId), /// Our neighbors in the new gossip topology. diff --git a/roadmap/implementers-guide/src/types/overseer-protocol.md b/roadmap/implementers-guide/src/types/overseer-protocol.md index f3195e713399..0e06d30753aa 100644 --- a/roadmap/implementers-guide/src/types/overseer-protocol.md +++ b/roadmap/implementers-guide/src/types/overseer-protocol.md @@ -567,7 +567,7 @@ enum NetworkBridgeMessage { /// `PeerConnected` events from the network bridge. ConnectToValidators { /// Ids of the validators to connect to. - validator_ids: Vec, + validator_ids: HashSet, /// The underlying protocol to use for this request. peer_set: PeerSet, /// Sends back the number of `AuthorityDiscoveryId`s which