From 2a9800f20ae49badcc9dd529fc1263a75e82cd90 Mon Sep 17 00:00:00 2001
From: Aaro Altonen <48052676+altonen@users.noreply.github.com>
Date: Mon, 26 Sep 2022 16:15:41 +0300
Subject: [PATCH] Companion for paritytech/substrate#12264 (#5973)
* Companion for paritytech/substrate#12198
* Use `ProtocolName` from sc-network-common
* Update node service
* Revert Cargo.lock changes
* Fix node service test
* cargo-fmt
* disable cancel-pipeline-test-linux-stable to check companion
* update lockfile for {"substrate"}
Co-authored-by: alvicsam <alvicsam@gmail.com>
Co-authored-by: parity-processbot <>
---
polkadot/.gitlab-ci.yml | 2 +-
polkadot/Cargo.lock | 370 ++++++++++--------
polkadot/node/network/protocol/Cargo.toml | 1 +
.../node/network/protocol/src/peer_set.rs | 14 +-
polkadot/node/service/src/lib.rs | 3 +-
polkadot/node/test/service/src/lib.rs | 7 +-
6 files changed, 211 insertions(+), 186 deletions(-)
diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml
index 33ab02c549c..ce9be9af767 100644
--- a/polkadot/.gitlab-ci.yml
+++ b/polkadot/.gitlab-ci.yml
@@ -228,7 +228,7 @@ deploy-parity-testnet:
trigger:
project: "parity/infrastructure/ci_cd/pipeline-stopper"
-cancel-pipeline-test-linux-stable:
+.cancel-pipeline-test-linux-stable:
extends: .cancel-pipeline-template
needs:
- job: test-linux-stable
diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 97786f048db..92fe829400a 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -435,7 +435,7 @@ dependencies = [
[[package]]
name = "beefy-gadget"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"array-bytes",
"async-trait",
@@ -452,6 +452,7 @@ dependencies = [
"sc-finality-grandpa",
"sc-keystore",
"sc-network",
+ "sc-network-common",
"sc-network-gossip",
"sc-utils",
"sp-api",
@@ -471,7 +472,7 @@ dependencies = [
[[package]]
name = "beefy-gadget-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"beefy-gadget",
"beefy-primitives",
@@ -491,7 +492,7 @@ dependencies = [
[[package]]
name = "beefy-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"beefy-primitives",
"sp-api",
@@ -500,7 +501,7 @@ dependencies = [
[[package]]
name = "beefy-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -1997,7 +1998,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
]
@@ -2015,7 +2016,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-system",
@@ -2038,7 +2039,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"Inflector",
"array-bytes",
@@ -2089,7 +2090,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-solution-type"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2100,7 +2101,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-election-provider-solution-type",
"frame-support",
@@ -2116,7 +2117,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-system",
@@ -2145,7 +2146,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"bitflags",
"frame-metadata",
@@ -2177,7 +2178,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"Inflector",
"cfg-expr",
@@ -2191,7 +2192,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -2203,7 +2204,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"proc-macro2",
"quote",
@@ -2213,7 +2214,7 @@ dependencies = [
[[package]]
name = "frame-support-test"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-support-test-pallet",
@@ -2236,7 +2237,7 @@ dependencies = [
[[package]]
name = "frame-support-test-pallet"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-system",
@@ -2247,7 +2248,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"log",
@@ -2265,7 +2266,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2280,7 +2281,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2289,7 +2290,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -2472,7 +2473,7 @@ dependencies = [
[[package]]
name = "generate-bags"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"chrono",
"frame-election-provider-support",
@@ -4830,7 +4831,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4"
[[package]]
name = "pallet-assets"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4844,7 +4845,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-system",
@@ -4860,7 +4861,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-system",
@@ -4875,7 +4876,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4899,7 +4900,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -4919,7 +4920,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list-remote-tests"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-election-provider-support",
"frame-support",
@@ -4938,7 +4939,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4953,7 +4954,7 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"beefy-primitives",
"frame-support",
@@ -4969,7 +4970,7 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"array-bytes",
"beefy-merkle-tree",
@@ -4992,7 +4993,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5010,7 +5011,7 @@ dependencies = [
[[package]]
name = "pallet-child-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5029,7 +5030,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5046,7 +5047,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5062,7 +5063,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5086,7 +5087,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-support-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5099,7 +5100,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5117,7 +5118,7 @@ dependencies = [
[[package]]
name = "pallet-gilt"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5132,7 +5133,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5155,7 +5156,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5171,7 +5172,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5191,7 +5192,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5208,7 +5209,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5225,7 +5226,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"ckb-merkle-mountain-range",
"frame-benchmarking",
@@ -5243,7 +5244,7 @@ dependencies = [
[[package]]
name = "pallet-mmr-rpc"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -5258,7 +5259,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5273,7 +5274,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-system",
@@ -5290,7 +5291,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-benchmarking"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5310,7 +5311,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-runtime-api"
version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -5320,7 +5321,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-system",
@@ -5337,7 +5338,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5360,7 +5361,7 @@ dependencies = [
[[package]]
name = "pallet-preimage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5376,7 +5377,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5391,7 +5392,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5406,7 +5407,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5422,7 +5423,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-system",
@@ -5443,7 +5444,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5459,7 +5460,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-system",
@@ -5473,7 +5474,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5496,7 +5497,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -5507,7 +5508,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"log",
"sp-arithmetic",
@@ -5516,7 +5517,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-system",
@@ -5530,7 +5531,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5548,7 +5549,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5567,7 +5568,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-support",
"frame-system",
@@ -5583,7 +5584,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
@@ -5598,7 +5599,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -5609,7 +5610,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5626,7 +5627,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5642,7 +5643,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6725,6 +6726,7 @@ dependencies = [
"rand_chacha 0.3.1",
"sc-authority-discovery",
"sc-network",
+ "sc-network-common",
"strum",
"thiserror",
"tracing-gum",
@@ -8172,7 +8174,7 @@ dependencies = [
[[package]]
name = "remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"env_logger 0.9.0",
"jsonrpsee",
@@ -8520,7 +8522,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"log",
"sp-core",
@@ -8531,7 +8533,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"futures",
@@ -8558,7 +8560,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"futures-timer",
@@ -8581,7 +8583,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -8597,7 +8599,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"impl-trait-for-tuples",
"memmap2 0.5.0",
@@ -8614,7 +8616,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -8625,7 +8627,7 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"array-bytes",
"chrono",
@@ -8643,6 +8645,7 @@ dependencies = [
"sc-client-db",
"sc-keystore",
"sc-network",
+ "sc-network-common",
"sc-service",
"sc-telemetry",
"sc-tracing",
@@ -8664,7 +8667,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"fnv",
"futures",
@@ -8692,7 +8695,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"hash-db",
"kvdb",
@@ -8717,7 +8720,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"futures",
@@ -8741,7 +8744,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"fork-tree",
@@ -8783,7 +8786,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"jsonrpsee",
@@ -8805,7 +8808,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -8818,7 +8821,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"futures",
@@ -8842,7 +8845,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"lazy_static",
"lru 0.7.8",
@@ -8869,7 +8872,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -8885,7 +8888,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"log",
"parity-scale-codec",
@@ -8900,7 +8903,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -8920,7 +8923,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"ahash",
"array-bytes",
@@ -8961,7 +8964,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"finality-grandpa",
"futures",
@@ -8982,7 +8985,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"ansi_term",
"futures",
@@ -8999,7 +9002,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"array-bytes",
"async-trait",
@@ -9014,7 +9017,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"array-bytes",
"async-trait",
@@ -9061,7 +9064,7 @@ dependencies = [
[[package]]
name = "sc-network-bitswap"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"cid",
"futures",
@@ -9081,13 +9084,15 @@ dependencies = [
[[package]]
name = "sc-network-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"bitflags",
"bytes",
"futures",
+ "futures-timer",
"libp2p",
+ "linked_hash_set",
"parity-scale-codec",
"prost-build 0.10.4",
"sc-consensus",
@@ -9098,13 +9103,14 @@ dependencies = [
"sp-consensus",
"sp-finality-grandpa",
"sp-runtime",
+ "substrate-prometheus-endpoint",
"thiserror",
]
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"ahash",
"futures",
@@ -9122,7 +9128,7 @@ dependencies = [
[[package]]
name = "sc-network-light"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"array-bytes",
"futures",
@@ -9143,7 +9149,7 @@ dependencies = [
[[package]]
name = "sc-network-sync"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"array-bytes",
"fork-tree",
@@ -9168,10 +9174,29 @@ dependencies = [
"thiserror",
]
+[[package]]
+name = "sc-network-transactions"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
+dependencies = [
+ "array-bytes",
+ "futures",
+ "hex",
+ "libp2p",
+ "log",
+ "parity-scale-codec",
+ "pin-project",
+ "sc-network-common",
+ "sc-peerset",
+ "sp-consensus",
+ "sp-runtime",
+ "substrate-prometheus-endpoint",
+]
+
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"array-bytes",
"bytes",
@@ -9201,7 +9226,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"libp2p",
@@ -9214,7 +9239,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -9223,7 +9248,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"hash-db",
@@ -9253,7 +9278,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"jsonrpsee",
@@ -9276,7 +9301,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"jsonrpsee",
@@ -9289,7 +9314,7 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"directories",
@@ -9317,6 +9342,7 @@ dependencies = [
"sc-network-common",
"sc-network-light",
"sc-network-sync",
+ "sc-network-transactions",
"sc-offchain",
"sc-rpc",
"sc-rpc-server",
@@ -9358,7 +9384,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"log",
"parity-scale-codec",
@@ -9372,7 +9398,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -9391,7 +9417,7 @@ dependencies = [
[[package]]
name = "sc-sysinfo"
version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"libc",
@@ -9410,7 +9436,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"chrono",
"futures",
@@ -9428,7 +9454,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"ansi_term",
"atty",
@@ -9459,7 +9485,7 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -9470,7 +9496,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"futures-timer",
@@ -9496,7 +9522,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"log",
@@ -9509,7 +9535,7 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"futures-timer",
@@ -9995,7 +10021,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"hash-db",
"log",
@@ -10013,7 +10039,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"blake2",
"proc-macro-crate",
@@ -10025,7 +10051,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10038,7 +10064,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -10053,7 +10079,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10066,7 +10092,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10078,7 +10104,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10090,7 +10116,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"log",
@@ -10108,7 +10134,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"futures",
@@ -10127,7 +10153,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"merlin",
@@ -10150,7 +10176,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10164,7 +10190,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10177,7 +10203,7 @@ dependencies = [
[[package]]
name = "sp-core"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"array-bytes",
"base58",
@@ -10223,7 +10249,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"blake2",
"byteorder",
@@ -10237,7 +10263,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"proc-macro2",
"quote",
@@ -10248,7 +10274,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -10257,7 +10283,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"proc-macro2",
"quote",
@@ -10267,7 +10293,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -10278,7 +10304,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"finality-grandpa",
"log",
@@ -10296,7 +10322,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -10310,7 +10336,7 @@ dependencies = [
[[package]]
name = "sp-io"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"bytes",
"futures",
@@ -10336,7 +10362,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"lazy_static",
"sp-core",
@@ -10347,7 +10373,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"futures",
@@ -10364,7 +10390,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"thiserror",
"zstd",
@@ -10373,7 +10399,7 @@ dependencies = [
[[package]]
name = "sp-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"log",
"parity-scale-codec",
@@ -10388,7 +10414,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10402,7 +10428,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"sp-api",
"sp-core",
@@ -10412,7 +10438,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"backtrace",
"lazy_static",
@@ -10422,7 +10448,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"rustc-hash",
"serde",
@@ -10432,7 +10458,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"either",
"hash256-std-hasher",
@@ -10455,7 +10481,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -10473,7 +10499,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -10485,7 +10511,7 @@ dependencies = [
[[package]]
name = "sp-sandbox"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"log",
"parity-scale-codec",
@@ -10499,7 +10525,7 @@ dependencies = [
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10513,7 +10539,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10524,7 +10550,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"hash-db",
"log",
@@ -10546,12 +10572,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
[[package]]
name = "sp-storage"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -10564,7 +10590,7 @@ dependencies = [
[[package]]
name = "sp-tasks"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"log",
"sp-core",
@@ -10577,7 +10603,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"futures-timer",
@@ -10593,7 +10619,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -10605,7 +10631,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"sp-api",
"sp-runtime",
@@ -10614,7 +10640,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"async-trait",
"log",
@@ -10630,7 +10656,7 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"ahash",
"hash-db",
@@ -10653,7 +10679,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -10670,7 +10696,7 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"parity-scale-codec",
"proc-macro2",
@@ -10681,7 +10707,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"impl-trait-for-tuples",
"log",
@@ -10694,7 +10720,7 @@ dependencies = [
[[package]]
name = "sp-weights"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -10909,7 +10935,7 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"platforms",
]
@@ -10917,7 +10943,7 @@ dependencies = [
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"frame-system-rpc-runtime-api",
"futures",
@@ -10938,7 +10964,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures-util",
"hyper",
@@ -10951,7 +10977,7 @@ dependencies = [
[[package]]
name = "substrate-state-trie-migration-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"jsonrpsee",
"log",
@@ -10972,7 +10998,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"array-bytes",
"async-trait",
@@ -10998,7 +11024,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"futures",
"substrate-test-utils-derive",
@@ -11008,7 +11034,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -11019,7 +11045,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"ansi_term",
"build-helper",
@@ -11733,7 +11759,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#a0ec652e341f694f182a3c5fcc80d4c3fb280003"
+source = "git+https://github.com/paritytech/substrate?branch=master#f360c87073cb5f59b7b55cfbfef5d91a40d1a217"
dependencies = [
"clap",
"frame-try-runtime",
diff --git a/polkadot/node/network/protocol/Cargo.toml b/polkadot/node/network/protocol/Cargo.toml
index 04347a80109..465cb8d6f98 100644
--- a/polkadot/node/network/protocol/Cargo.toml
+++ b/polkadot/node/network/protocol/Cargo.toml
@@ -13,6 +13,7 @@ polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-jaeger = { path = "../../jaeger" }
parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
strum = { version = "0.24", features = ["derive"] }
futures = "0.3.21"
diff --git a/polkadot/node/network/protocol/src/peer_set.rs b/polkadot/node/network/protocol/src/peer_set.rs
index 4a3220995f9..8c5597a9fc8 100644
--- a/polkadot/node/network/protocol/src/peer_set.rs
+++ b/polkadot/node/network/protocol/src/peer_set.rs
@@ -18,9 +18,9 @@
use derive_more::Display;
use polkadot_primitives::v2::Hash;
-use sc_network::{
+use sc_network_common::{
config::{NonDefaultSetConfig, SetConfig},
- ProtocolName,
+ protocol::ProtocolName,
};
use std::{
collections::{hash_map::Entry, HashMap},
@@ -80,7 +80,7 @@ impl PeerSet {
notifications_protocol: protocol,
fallback_names,
max_notification_size,
- set_config: sc_network::config::SetConfig {
+ set_config: sc_network_common::config::SetConfig {
// we allow full nodes to connect to validators for gossip
// to ensure any `MIN_GOSSIP_PEERS` always include reserved peers
// we limit the amount of non-reserved slots to be less
@@ -88,7 +88,7 @@ impl PeerSet {
in_peers: super::MIN_GOSSIP_PEERS as u32 / 2 - 1,
out_peers: super::MIN_GOSSIP_PEERS as u32 / 2 - 1,
reserved_nodes: Vec::new(),
- non_reserved_mode: sc_network::config::NonReservedPeerMode::Accept,
+ non_reserved_mode: sc_network_common::config::NonReservedPeerMode::Accept,
},
},
PeerSet::Collation => NonDefaultSetConfig {
@@ -101,9 +101,9 @@ impl PeerSet {
out_peers: 0,
reserved_nodes: Vec::new(),
non_reserved_mode: if is_authority == IsAuthority::Yes {
- sc_network::config::NonReservedPeerMode::Accept
+ sc_network_common::config::NonReservedPeerMode::Accept
} else {
- sc_network::config::NonReservedPeerMode::Deny
+ sc_network_common::config::NonReservedPeerMode::Deny
},
},
},
@@ -188,7 +188,7 @@ impl<T> IndexMut<PeerSet> for PerPeerSet<T> {
pub fn peer_sets_info(
is_authority: IsAuthority,
peerset_protocol_names: &PeerSetProtocolNames,
-) -> Vec<sc_network::config::NonDefaultSetConfig> {
+) -> Vec<sc_network_common::config::NonDefaultSetConfig> {
PeerSet::iter()
.map(|s| s.get_info(is_authority, &peerset_protocol_names))
.collect()
diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs
index 774901435e1..3ae207be8e1 100644
--- a/polkadot/node/service/src/lib.rs
+++ b/polkadot/node/service/src/lib.rs
@@ -898,7 +898,7 @@ where
grandpa_hard_forks,
));
- let (network, system_rpc_tx, network_starter) =
+ let (network, system_rpc_tx, tx_handler_controller, network_starter) =
service::build_network(service::BuildNetworkParams {
config: &config,
client: client.clone(),
@@ -968,6 +968,7 @@ where
transaction_pool: transaction_pool.clone(),
task_manager: &mut task_manager,
system_rpc_tx,
+ tx_handler_controller,
telemetry: telemetry.as_mut(),
})?;
diff --git a/polkadot/node/test/service/src/lib.rs b/polkadot/node/test/service/src/lib.rs
index 435bcabb3ef..8fe31ce2b5b 100644
--- a/polkadot/node/test/service/src/lib.rs
+++ b/polkadot/node/test/service/src/lib.rs
@@ -37,11 +37,8 @@ use polkadot_test_runtime::{
};
use sc_chain_spec::ChainSpec;
use sc_client_api::execution_extensions::ExecutionStrategies;
-use sc_network::{
- config::{NetworkConfiguration, TransportConfig},
- multiaddr,
-};
-use sc_network_common::service::NetworkStateInfo;
+use sc_network::{config::NetworkConfiguration, multiaddr};
+use sc_network_common::{config::TransportConfig, service::NetworkStateInfo};
use sc_service::{
config::{
DatabaseSource, KeystoreConfig, MultiaddrWithPeerId, WasmExecutionMethod,
--
GitLab