diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index e313d3b708f98f12c3d448b08fe9e80395d14675..c5a2d7e8b2a08a838985e91acc698ed7c573b774 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1268,7 +1268,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "fork-tree"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
]
@@ -1276,7 +1276,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -1293,7 +1293,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"parity-scale-codec",
@@ -1311,7 +1311,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -1326,7 +1326,7 @@ dependencies = [
[[package]]
name = "frame-metadata"
version = "11.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"serde",
@@ -1337,7 +1337,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"bitmask",
"frame-metadata",
@@ -1362,7 +1362,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support-procedural-tools",
"proc-macro2 1.0.17",
@@ -1373,7 +1373,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -1385,7 +1385,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"proc-macro2 1.0.17",
"quote 1.0.6",
@@ -1395,7 +1395,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"impl-trait-for-tuples",
@@ -1411,7 +1411,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -1425,7 +1425,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -1502,6 +1502,15 @@ dependencies = [
"futures-sink",
]
+[[package]]
+name = "futures-channel-preview"
+version = "0.3.0-alpha.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a"
+dependencies = [
+ "futures-core-preview",
+]
+
[[package]]
name = "futures-core"
version = "0.3.5"
@@ -1632,6 +1641,18 @@ dependencies = [
"slab",
]
+[[package]]
+name = "futures-util-preview"
+version = "0.3.0-alpha.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ce968633c17e5f97936bd2797b6e38fb56cf16a7422319f7ec2e30d3c470e8d"
+dependencies = [
+ "futures-channel-preview",
+ "futures-core-preview",
+ "pin-utils",
+ "slab",
+]
+
[[package]]
name = "futures_codec"
version = "0.3.4"
@@ -1962,7 +1983,7 @@ dependencies = [
"time",
"tokio 0.1.22",
"tokio-buf",
- "tokio-executor",
+ "tokio-executor 0.1.10",
"tokio-io",
"tokio-reactor",
"tokio-tcp",
@@ -3344,7 +3365,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3360,7 +3381,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3375,7 +3396,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3397,7 +3418,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3411,7 +3432,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3427,7 +3448,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3442,7 +3463,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3457,7 +3478,7 @@ dependencies = [
[[package]]
name = "pallet-finality-tracker"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3473,7 +3494,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3493,7 +3514,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -3509,7 +3530,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3529,7 +3550,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3545,7 +3566,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3559,7 +3580,7 @@ dependencies = [
[[package]]
name = "pallet-nicks"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3573,7 +3594,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3588,7 +3609,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3609,7 +3630,7 @@ dependencies = [
[[package]]
name = "pallet-randomness-collective-flip"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3622,7 +3643,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"enumflags2",
"frame-support",
@@ -3637,7 +3658,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3652,7 +3673,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3670,7 +3691,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3684,7 +3705,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3698,7 +3719,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3720,7 +3741,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"proc-macro-crate",
"proc-macro2 1.0.17",
@@ -3731,7 +3752,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3745,7 +3766,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3763,7 +3784,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"frame-system",
@@ -3777,7 +3798,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -3795,7 +3816,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -3808,7 +3829,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3823,7 +3844,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3839,7 +3860,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -4653,11 +4674,11 @@ dependencies = [
"polkadot-parachain",
"polkadot-primitives",
"polkadot-statement-table",
+ "sc-basic-authorship",
"sc-block-builder",
"sc-client-api",
"sc-finality-grandpa",
"sc-keystore",
- "sc-proposer-metrics",
"sp-api",
"sp-blockchain",
"sp-consensus",
@@ -5405,7 +5426,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"bytes 0.5.4",
"derive_more 0.99.7",
@@ -5429,10 +5450,34 @@ dependencies = [
"substrate-prometheus-endpoint",
]
+[[package]]
+name = "sc-basic-authorship"
+version = "0.8.0-rc2"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
+dependencies = [
+ "futures 0.3.5",
+ "futures-timer 3.0.2",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "sc-block-builder",
+ "sc-client-api",
+ "sc-proposer-metrics",
+ "sc-telemetry",
+ "sp-api",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-core",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-transaction-pool",
+ "substrate-prometheus-endpoint",
+ "tokio-executor 0.2.0-alpha.6",
+]
+
[[package]]
name = "sc-block-builder"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -5448,7 +5493,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"impl-trait-for-tuples",
"sc-chain-spec-derive",
@@ -5464,7 +5509,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"proc-macro-crate",
"proc-macro2 1.0.17",
@@ -5475,7 +5520,7 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"ansi_term 0.12.1",
"atty",
@@ -5516,7 +5561,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"fnv",
@@ -5552,7 +5597,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"blake2-rfc",
"hash-db",
@@ -5581,7 +5626,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"sc-client-api",
"sp-blockchain",
@@ -5592,7 +5637,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"fork-tree",
@@ -5634,7 +5679,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"futures 0.3.5",
@@ -5657,7 +5702,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -5670,7 +5715,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"futures 0.3.5",
"futures-timer 3.0.2",
@@ -5692,7 +5737,7 @@ dependencies = [
[[package]]
name = "sc-consensus-uncles"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"log 0.4.8",
"sc-client-api",
@@ -5706,7 +5751,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"lazy_static",
@@ -5734,7 +5779,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"log 0.4.8",
@@ -5751,7 +5796,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"log 0.4.8",
"parity-scale-codec",
@@ -5766,7 +5811,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"cranelift-codegen",
"cranelift-wasm",
@@ -5787,7 +5832,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"assert_matches",
"derive_more 0.99.7",
@@ -5824,7 +5869,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa-rpc"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"finality-grandpa",
@@ -5841,7 +5886,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"ansi_term 0.12.1",
"futures 0.3.5",
@@ -5858,7 +5903,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"hex",
@@ -5873,7 +5918,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"bitflags",
"bs58",
@@ -5925,7 +5970,7 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"futures 0.3.5",
"futures-timer 3.0.2",
@@ -5940,7 +5985,7 @@ dependencies = [
[[package]]
name = "sc-network-test"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"env_logger",
"futures 0.3.5",
@@ -5967,7 +6012,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"bytes 0.5.4",
"fnv",
@@ -5994,7 +6039,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"futures 0.3.5",
"libp2p",
@@ -6007,7 +6052,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"log 0.4.8",
"substrate-prometheus-endpoint",
@@ -6016,7 +6061,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"futures 0.3.5",
"hash-db",
@@ -6048,7 +6093,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"futures 0.3.5",
@@ -6072,7 +6117,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"jsonrpc-core",
"jsonrpc-http-server",
@@ -6087,7 +6132,7 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"exit-future",
@@ -6145,7 +6190,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"log 0.4.8",
"parity-scale-codec",
@@ -6159,7 +6204,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"bytes 0.5.4",
"futures 0.3.5",
@@ -6181,7 +6226,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"erased-serde",
"log 0.4.8",
@@ -6196,7 +6241,7 @@ dependencies = [
[[package]]
name = "sc-transaction-graph"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"futures 0.3.5",
@@ -6216,7 +6261,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"futures 0.3.5",
@@ -6628,7 +6673,7 @@ dependencies = [
[[package]]
name = "sp-allocator"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"log 0.4.8",
@@ -6640,7 +6685,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"hash-db",
"parity-scale-codec",
@@ -6655,7 +6700,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"blake2-rfc",
"proc-macro-crate",
@@ -6667,7 +6712,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"serde",
@@ -6679,7 +6724,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"integer-sqrt",
"num-traits 0.2.11",
@@ -6692,7 +6737,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -6704,7 +6749,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"sp-inherents",
@@ -6715,7 +6760,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -6727,7 +6772,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"log 0.4.8",
@@ -6743,7 +6788,7 @@ dependencies = [
[[package]]
name = "sp-chain-spec"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"serde",
"serde_json",
@@ -6752,7 +6797,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"futures 0.3.5",
@@ -6775,7 +6820,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -6789,7 +6834,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"merlin",
"parity-scale-codec",
@@ -6806,7 +6851,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"schnorrkel",
@@ -6818,7 +6863,7 @@ dependencies = [
[[package]]
name = "sp-core"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"base58",
"blake2-rfc",
@@ -6860,7 +6905,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"kvdb",
"parking_lot 0.10.2",
@@ -6869,7 +6914,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"proc-macro2 1.0.17",
"quote 1.0.6",
@@ -6879,7 +6924,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -6890,7 +6935,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"finality-grandpa",
"log 0.4.8",
@@ -6906,7 +6951,7 @@ dependencies = [
[[package]]
name = "sp-finality-tracker"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"sp-inherents",
@@ -6916,7 +6961,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"parity-scale-codec",
@@ -6928,7 +6973,7 @@ dependencies = [
[[package]]
name = "sp-io"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"futures 0.3.5",
"hash-db",
@@ -6948,7 +6993,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"lazy_static",
"sp-core",
@@ -6959,7 +7004,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"sp-api",
"sp-core",
@@ -6969,7 +7014,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"backtrace",
"log 0.4.8",
@@ -6978,7 +7023,7 @@ dependencies = [
[[package]]
name = "sp-phragmen"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"serde",
@@ -6990,7 +7035,7 @@ dependencies = [
[[package]]
name = "sp-phragmen-compact"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"proc-macro-crate",
"proc-macro2 1.0.17",
@@ -7001,7 +7046,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"serde",
"sp-core",
@@ -7010,7 +7055,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"hash256-std-hasher",
"impl-trait-for-tuples",
@@ -7031,7 +7076,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"primitive-types",
@@ -7046,7 +7091,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -7058,7 +7103,7 @@ dependencies = [
[[package]]
name = "sp-serializer"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"serde",
"serde_json",
@@ -7067,7 +7112,7 @@ dependencies = [
[[package]]
name = "sp-session"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -7080,7 +7125,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -7090,7 +7135,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"hash-db",
"log 0.4.8",
@@ -7109,12 +7154,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
[[package]]
name = "sp-storage"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"impl-serde 0.2.3",
"ref-cast",
@@ -7126,7 +7171,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -7140,7 +7185,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"tracing",
]
@@ -7148,7 +7193,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"derive_more 0.99.7",
"futures 0.3.5",
@@ -7163,7 +7208,7 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"hash-db",
"memory-db",
@@ -7177,7 +7222,7 @@ dependencies = [
[[package]]
name = "sp-utils"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"futures 0.3.5",
"futures-core",
@@ -7188,7 +7233,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"impl-serde 0.2.3",
"parity-scale-codec",
@@ -7200,7 +7245,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -7328,7 +7373,7 @@ dependencies = [
[[package]]
name = "substrate-browser-utils"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"chrono",
"clear_on_drop",
@@ -7355,7 +7400,7 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"platforms",
]
@@ -7363,7 +7408,7 @@ dependencies = [
[[package]]
name = "substrate-frame-rpc-system"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"frame-system-rpc-runtime-api",
"futures 0.3.5",
@@ -7384,7 +7429,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.8.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"async-std 1.6.0",
"derive_more 0.99.7",
@@ -7398,7 +7443,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"futures 0.3.5",
"hash-db",
@@ -7419,7 +7464,7 @@ dependencies = [
[[package]]
name = "substrate-test-runtime"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"cfg-if",
"frame-executive",
@@ -7459,7 +7504,7 @@ dependencies = [
[[package]]
name = "substrate-test-runtime-client"
version = "2.0.0-rc2"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
dependencies = [
"futures 0.3.5",
"parity-scale-codec",
@@ -7479,7 +7524,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder-runner"
version = "1.0.6"
-source = "git+https://github.com/paritytech/substrate#df59acf4e8aaad672fc40146a1001d0177cb8ed3"
+source = "git+https://github.com/paritytech/substrate#cd305af2a9f8ec7d13081b6dc6807014b207dab8"
[[package]]
name = "substrate-wasm-builder-runner"
@@ -7875,11 +7920,11 @@ dependencies = [
"num_cpus",
"tokio-codec",
"tokio-current-thread",
- "tokio-executor",
+ "tokio-executor 0.1.10",
"tokio-fs",
"tokio-io",
"tokio-reactor",
- "tokio-sync",
+ "tokio-sync 0.1.8",
"tokio-tcp",
"tokio-threadpool",
"tokio-timer",
@@ -7938,7 +7983,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
dependencies = [
"futures 0.1.29",
- "tokio-executor",
+ "tokio-executor 0.1.10",
]
[[package]]
@@ -7951,6 +7996,17 @@ dependencies = [
"futures 0.1.29",
]
+[[package]]
+name = "tokio-executor"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ee9ceecf69145923834ea73f32ba40c790fd877b74a7817dd0b089f1eb9c7c8"
+dependencies = [
+ "futures-util-preview",
+ "lazy_static",
+ "tokio-sync 0.2.0-alpha.6",
+]
+
[[package]]
name = "tokio-fs"
version = "0.1.7"
@@ -7987,9 +8043,9 @@ dependencies = [
"num_cpus",
"parking_lot 0.9.0",
"slab",
- "tokio-executor",
+ "tokio-executor 0.1.10",
"tokio-io",
- "tokio-sync",
+ "tokio-sync 0.1.8",
]
[[package]]
@@ -8014,6 +8070,17 @@ dependencies = [
"futures 0.1.29",
]
+[[package]]
+name = "tokio-sync"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f1aaeb685540f7407ea0e27f1c9757d258c7c6bf4e3eb19da6fc59b747239d2"
+dependencies = [
+ "fnv",
+ "futures-core-preview",
+ "futures-util-preview",
+]
+
[[package]]
name = "tokio-tcp"
version = "0.1.4"
@@ -8042,7 +8109,7 @@ dependencies = [
"log 0.4.8",
"num_cpus",
"slab",
- "tokio-executor",
+ "tokio-executor 0.1.10",
]
[[package]]
@@ -8054,7 +8121,7 @@ dependencies = [
"crossbeam-utils 0.7.2",
"futures 0.1.29",
"slab",
- "tokio-executor",
+ "tokio-executor 0.1.10",
]
[[package]]
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index 8c0f84314c9c599f955546703bee3df6caa55705..14357db8535a0bd3abee8172f5f33096c5477bf2 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -88,7 +88,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("polkadot"),
impl_name: create_runtime_str!("parity-polkadot"),
authoring_version: 0,
- spec_version: 1,
+ spec_version: 2,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 0,
diff --git a/polkadot/service/src/lib.rs b/polkadot/service/src/lib.rs
index 79228a5e6403daa82c03c7de21af577ad3a3893a..51d83d82b5a32acea40d2fbe976658f8580183d6 100644
--- a/polkadot/service/src/lib.rs
+++ b/polkadot/service/src/lib.rs
@@ -293,8 +293,6 @@ macro_rules! new_full {
let (builder, mut import_setup, inherent_data_providers, mut rpc_setup) =
new_full_start!($config, $runtime, $dispatch);
- let backend = builder.backend().clone();
-
let service = builder
.with_finality_proof_provider(|client, backend| {
let provider = client as Arc<dyn grandpa::StorageAndProofProvider<_, _>>;
@@ -403,7 +401,6 @@ macro_rules! new_full {
service.transaction_pool(),
validation_service_handle,
slot_duration,
- backend,
service.prometheus_registry().as_ref(),
);
diff --git a/polkadot/validation/Cargo.toml b/polkadot/validation/Cargo.toml
index 57a29efc1194a163ff95a40be19e454bb97ac417..9f6a3240c40f5c8c72d602f7a18414838fb98fe1 100644
--- a/polkadot/validation/Cargo.toml
+++ b/polkadot/validation/Cargo.toml
@@ -34,8 +34,8 @@ bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-proposer-metrics = { git = "https://github.com/paritytech/substrate", branch = "master" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
[dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/validation/src/block_production.rs b/polkadot/validation/src/block_production.rs
index 76e91e7db0df43c1b3e6f7c3eb72efd7b8e520fd..30b7ac3ccd46b979acb9cf91a337a729b10c0334 100644
--- a/polkadot/validation/src/block_production.rs
+++ b/polkadot/validation/src/block_production.rs
@@ -26,24 +26,21 @@ use std::{
};
use sp_blockchain::HeaderBackend;
-use block_builder::BlockBuilderApi;
-use codec::Encode;
+use block_builder::{BlockBuilderApi, BlockBuilderProvider};
use consensus::{Proposal, RecordProof};
-use polkadot_primitives::{Hash, Block, BlockId, Header};
+use polkadot_primitives::{Block, Header};
use polkadot_primitives::parachain::{
- ParachainHost, AttestedCandidate, NEW_HEADS_IDENTIFIER,
+ ParachainHost, NEW_HEADS_IDENTIFIER,
};
use runtime_primitives::traits::{DigestFor, HashFor};
use futures_timer::Delay;
-use txpool_api::{TransactionPool, InPoolTransaction};
+use txpool_api::TransactionPool;
use futures::prelude::*;
use inherents::InherentData;
use sp_timestamp::TimestampInherentData;
-use log::{info, debug, warn, trace};
use sp_api::{ApiExt, ProvideRuntimeApi};
use prometheus_endpoint::Registry as PrometheusRegistry;
-use sc_proposer_metrics::MetricsLink as PrometheusMetrics;
use crate::{
Error,
@@ -51,17 +48,11 @@ use crate::{
validation_service::ServiceHandle,
};
-// block size limit.
-pub(crate) const MAX_TRANSACTIONS_SIZE: usize = 4 * 1024 * 1024;
-
// Polkadot proposer factory.
pub struct ProposerFactory<Client, TxPool, Backend> {
- client: Arc<Client>,
- transaction_pool: Arc<TxPool>,
service_handle: ServiceHandle,
babe_slot_duration: u64,
- backend: Arc<Backend>,
- metrics: PrometheusMetrics,
+ factory: sc_basic_authorship::ProposerFactory<TxPool, Backend, Client>,
}
impl<Client, TxPool, Backend> ProposerFactory<Client, TxPool, Backend> {
@@ -71,16 +62,17 @@ impl<Client, TxPool, Backend> ProposerFactory<Client, TxPool, Backend> {
transaction_pool: Arc<TxPool>,
service_handle: ServiceHandle,
babe_slot_duration: u64,
- backend: Arc<Backend>,
prometheus: Option<&PrometheusRegistry>,
) -> Self {
- ProposerFactory {
+ let factory = sc_basic_authorship::ProposerFactory::new(
client,
transaction_pool,
- service_handle: service_handle,
+ prometheus,
+ );
+ ProposerFactory {
+ service_handle,
babe_slot_duration,
- backend,
- metrics: PrometheusMetrics::new(prometheus),
+ factory,
}
}
}
@@ -89,7 +81,7 @@ impl<Client, TxPool, Backend> consensus::Environment<Block>
for ProposerFactory<Client, TxPool, Backend>
where
TxPool: TransactionPool<Block=Block> + 'static,
- Client: ProvideRuntimeApi<Block> + HeaderBackend<Block> + Send + Sync + 'static,
+ Client: BlockBuilderProvider<Backend, Block, Client> + ProvideRuntimeApi<Block> + HeaderBackend<Block> + Send + Sync + 'static,
Client::Api: ParachainHost<Block> + BlockBuilderApi<Block>
+ ApiExt<Block, Error = sp_blockchain::Error>,
Backend: sc_client_api::Backend<
@@ -110,45 +102,35 @@ where
parent_header: &Header,
) -> Self::CreateProposer {
let parent_hash = parent_header.hash();
- let parent_id = BlockId::hash(parent_hash);
-
- let client = self.client.clone();
- let transaction_pool = self.transaction_pool.clone();
- let backend = self.backend.clone();
let slot_duration = self.babe_slot_duration.clone();
- let metrics = self.metrics.clone();
+ let proposer = self.factory.init(parent_header).into_inner();
let maybe_proposer = self.service_handle
.clone()
.get_validation_instance(parent_hash)
- .and_then(move |tracker| future::ready(Ok(Proposer {
- client,
- tracker,
- parent_id,
- transaction_pool,
- slot_duration,
- backend,
- metrics,
- })));
+ .and_then(move |tracker| future::ready(proposer
+ .map_err(Into::into)
+ .map(|proposer| Proposer {
+ tracker,
+ slot_duration,
+ proposer,
+ })
+ ));
Box::pin(maybe_proposer)
}
}
/// The Polkadot proposer logic.
-pub struct Proposer<Client, TxPool, Backend> {
- client: Arc<Client>,
- parent_id: BlockId,
+pub struct Proposer<Client, TxPool: TransactionPool<Block=Block>, Backend> {
tracker: crate::validation_service::ValidationInstanceHandle,
- transaction_pool: Arc<TxPool>,
slot_duration: u64,
- backend: Arc<Backend>,
- metrics: PrometheusMetrics,
+ proposer: sc_basic_authorship::Proposer<Backend, Block, Client, TxPool>,
}
impl<Client, TxPool, Backend> consensus::Proposer<Block> for Proposer<Client, TxPool, Backend> where
TxPool: TransactionPool<Block=Block> + 'static,
- Client: ProvideRuntimeApi<Block> + HeaderBackend<Block> + Send + Sync + 'static,
+ Client: BlockBuilderProvider<Backend, Block, Client> + ProvideRuntimeApi<Block> + HeaderBackend<Block> + Send + Sync + 'static,
Client::Api: ParachainHost<Block> + BlockBuilderApi<Block> + ApiExt<Block, Error = sp_blockchain::Error>,
Backend: sc_client_api::Backend<Block, State = sp_api::StateBackendFor<Client, Block>> + 'static,
// Rust bug: https://github.com/rust-lang/rust/issues/24159
@@ -163,7 +145,8 @@ impl<Client, TxPool, Backend> consensus::Proposer<Block> for Proposer<Client, Tx
>
>;
- fn propose(&mut self,
+ fn propose(
+ self,
inherent_data: InherentData,
inherent_digests: DigestFor<Block>,
max_duration: Duration,
@@ -180,15 +163,7 @@ impl<Client, TxPool, Backend> consensus::Proposer<Block> for Proposer<Client, Tx
Duration::from_millis(self.slot_duration / SLOT_DURATION_DENOMINATOR),
);
- let parent_id = self.parent_id.clone();
- let client = self.client.clone();
- let transaction_pool = self.transaction_pool.clone();
- let table = self.tracker.table().clone();
- let backend = self.backend.clone();
- let metrics = self.metrics.clone();
-
async move {
- let block_timer = metrics.report(|metrics| metrics.block_constructed.start_timer());
let enough_candidates = dynamic_inclusion.acceptable_in(
now,
initial_included,
@@ -200,22 +175,6 @@ impl<Client, TxPool, Backend> consensus::Proposer<Block> for Proposer<Client, Tx
};
let deadline_diff = max_duration - max_duration / 3;
- let deadline = match Instant::now().checked_add(deadline_diff) {
- None => return Err(Error::DeadlineComputeFailure(deadline_diff)),
- Some(d) => d,
- };
-
- let data = CreateProposalData {
- parent_id,
- client,
- transaction_pool,
- inherent_data: Some(inherent_data),
- inherent_digests,
- // leave some time for the proposal finalisation
- deadline,
- record_proof,
- backend,
- };
// set up delay until next allowed timestamp.
let current_timestamp = current_timestamp();
@@ -226,18 +185,18 @@ impl<Client, TxPool, Backend> consensus::Proposer<Block> for Proposer<Client, Tx
Delay::new(enough_candidates).await;
- let result = tokio::task::spawn_blocking(
- move || {
- let proposed_candidates = table.proposed_set();
- data.propose_with(proposed_candidates)
- }
- ).await?;
+ let proposed_candidates = self.tracker.table().proposed_set();
- drop(block_timer);
- let transactions = result.as_ref().map(|proposal| proposal.block.extrinsics.len()).unwrap_or_default();
- metrics.report(|metrics| metrics.number_of_transactions.set(transactions as u64));
+ let mut inherent_data = inherent_data;
+ inherent_data.put_data(NEW_HEADS_IDENTIFIER, &proposed_candidates)
+ .map_err(Error::InherentError)?;
- result
+ self.proposer.propose(
+ inherent_data,
+ inherent_digests.clone(),
+ deadline_diff,
+ record_proof
+ ).await.map_err(Into::into)
}.boxed()
}
}
@@ -247,114 +206,3 @@ fn current_timestamp() -> u64 {
.expect("now always later than unix epoch; qed")
.as_millis() as u64
}
-
-/// Inner data of the create proposal.
-struct CreateProposalData<Client, TxPool, Backend> {
- parent_id: BlockId,
- client: Arc<Client>,
- transaction_pool: Arc<TxPool>,
- inherent_data: Option<InherentData>,
- inherent_digests: DigestFor<Block>,
- deadline: Instant,
- record_proof: RecordProof,
- backend: Arc<Backend>,
-}
-
-impl<Client, TxPool, Backend> CreateProposalData<Client, TxPool, Backend> where
- TxPool: TransactionPool<Block=Block>,
- Client: ProvideRuntimeApi<Block> + HeaderBackend<Block> + Send + Sync,
- Client::Api: ParachainHost<Block> + BlockBuilderApi<Block> + ApiExt<Block, Error = sp_blockchain::Error>,
- Backend: sc_client_api::Backend<Block, State = sp_api::StateBackendFor<Client, Block>> + 'static,
- // Rust bug: https://github.com/rust-lang/rust/issues/24159
- sp_api::StateBackendFor<Client, Block>: sp_api::StateBackend<HashFor<Block>> + Send,
-{
- fn propose_with(
- mut self,
- candidates: Vec<AttestedCandidate>,
- ) -> Result<Proposal<Block, sp_api::TransactionFor<Client, Block>>, Error> {
- use runtime_primitives::traits::{Hash as HashT, BlakeTwo256};
-
- const MAX_TRANSACTIONS: usize = 1200;
-
- let mut inherent_data = self.inherent_data
- .take()
- .expect("CreateProposal is not polled after finishing; qed");
- inherent_data.put_data(NEW_HEADS_IDENTIFIER, &candidates)
- .map_err(Error::InherentError)?;
-
- let runtime_api = self.client.runtime_api();
-
- let mut block_builder = block_builder::BlockBuilder::new(
- &*self.client,
- self.client.expect_block_hash_from_id(&self.parent_id)?,
- self.client.expect_block_number_from_id(&self.parent_id)?,
- self.record_proof,
- self.inherent_digests.clone(),
- &*self.backend,
- )?;
-
- {
- let inherents = runtime_api.inherent_extrinsics(&self.parent_id, inherent_data)?;
- for inherent in inherents {
- match block_builder.push(inherent) {
- Err(sp_blockchain::Error::ApplyExtrinsicFailed(sp_blockchain::ApplyExtrinsicFailed::Validity(e)))
- if e.exhausted_resources() => {
- warn!("âš ï¸ Dropping non-mandatory inherent from overweight block.");
- }
- Err(e) => {
- warn!("â—ï¸ Inherent extrinsic returned unexpected error: {}. Dropping.", e);
- }
- Ok(_) => {}
- }
- }
-
- let mut unqueue_invalid = Vec::new();
- let mut pending_size = 0;
-
- let ready_iter = self.transaction_pool.ready();
- for ready in ready_iter.take(MAX_TRANSACTIONS) {
- let encoded_size = ready.data().encode().len();
- if pending_size + encoded_size >= MAX_TRANSACTIONS_SIZE {
- break;
- }
- if Instant::now() > self.deadline {
- debug!("Consensus deadline reached when pushing block transactions, proceeding with proposing.");
- break;
- }
-
- match block_builder.push(ready.data().clone()) {
- Ok(()) => {
- debug!("[{:?}] Pushed to the block.", ready.hash());
- pending_size += encoded_size;
- }
- Err(sp_blockchain::Error::ApplyExtrinsicFailed(sp_blockchain::ApplyExtrinsicFailed::Validity(e)))
- if e.exhausted_resources() =>
- {
- debug!("Block is full, proceed with proposing.");
- break;
- }
- Err(e) => {
- trace!(target: "transaction-pool", "Invalid transaction: {}", e);
- unqueue_invalid.push(ready.hash().clone());
- }
- }
- }
-
- self.transaction_pool.remove_invalid(&unqueue_invalid);
- }
-
- let (new_block, storage_changes, proof) = block_builder.build()?.into_inner();
-
- info!("🎠Prepared block for proposing at {} [hash: {:?}; parent_hash: {}; extrinsics: [{}]]",
- new_block.header.number,
- Hash::from(new_block.header.hash()),
- new_block.header.parent_hash,
- new_block.extrinsics.iter()
- .map(|xt| format!("{}", BlakeTwo256::hash_of(xt)))
- .collect::<Vec<_>>()
- .join(", ")
- );
-
- Ok(Proposal { block: new_block, storage_changes, proof })
- }
-}