From 3338f9c7212ad872db0f0179070f1313c0de3f3a Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Wed, 29 Sep 2021 22:16:50 +0800 Subject: [PATCH] Companion for Substrate#9867 (#3938) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Companion for Substrate#9867 * Fix finality_target_with_fallback() * update substrate Co-authored-by: André Silva --- Cargo.lock | 322 +++++++++++----------- node/service/src/relay_chain_selection.rs | 25 +- 2 files changed, 174 insertions(+), 173 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d27ae76b6abb..604d32212558 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -461,7 +461,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "beefy-primitives", "fnv", @@ -489,7 +489,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -509,12 +509,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "scale-info", @@ -1918,7 +1918,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", ] @@ -1936,7 +1936,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -1956,7 +1956,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "Inflector", "chrono", @@ -1982,7 +1982,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -1996,7 +1996,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -2024,7 +2024,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "bitflags", "frame-metadata", @@ -2051,7 +2051,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2063,7 +2063,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -2075,7 +2075,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "proc-macro2", "quote", @@ -2085,7 +2085,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2108,7 +2108,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -2119,7 +2119,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "log", @@ -2136,7 +2136,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -2151,7 +2151,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "sp-api", @@ -2160,7 +2160,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "sp-api", @@ -2373,7 +2373,7 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generate-bags" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "chrono", "frame-election-provider-support", @@ -4590,7 +4590,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -4604,7 +4604,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -4620,7 +4620,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -4635,7 +4635,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -4659,7 +4659,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4679,7 +4679,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -4694,7 +4694,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "beefy-primitives", "frame-support", @@ -4710,7 +4710,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -4735,7 +4735,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -4820,7 +4820,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -4837,7 +4837,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -4853,7 +4853,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4877,7 +4877,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -4895,7 +4895,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -4910,7 +4910,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -4933,7 +4933,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4949,7 +4949,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -4969,7 +4969,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -4986,7 +4986,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -5003,7 +5003,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5021,7 +5021,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -5037,7 +5037,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5054,7 +5054,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -5069,7 +5069,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -5083,7 +5083,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -5100,7 +5100,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5123,7 +5123,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -5138,7 +5138,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -5152,7 +5152,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -5168,7 +5168,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -5189,7 +5189,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -5205,7 +5205,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -5219,7 +5219,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5242,7 +5242,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -5253,7 +5253,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "log", "sp-arithmetic", @@ -5262,7 +5262,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -5276,7 +5276,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -5294,7 +5294,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -5313,7 +5313,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-support", "frame-system", @@ -5330,7 +5330,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5347,7 +5347,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5358,7 +5358,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -5375,7 +5375,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -5391,7 +5391,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-benchmarking", "frame-support", @@ -7799,7 +7799,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "env_logger 0.9.0", "jsonrpsee-proc-macros", @@ -8062,7 +8062,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "log", "sp-core", @@ -8073,7 +8073,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "derive_more", @@ -8100,7 +8100,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8123,7 +8123,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8139,7 +8139,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8155,7 +8155,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8166,7 +8166,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "chrono", "fdlimit", @@ -8204,7 +8204,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "fnv", "futures 0.3.17", @@ -8232,7 +8232,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "hash-db", "kvdb", @@ -8257,7 +8257,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "futures 0.3.17", @@ -8281,7 +8281,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "derive_more", @@ -8324,7 +8324,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "derive_more", "futures 0.3.17", @@ -8348,7 +8348,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8361,7 +8361,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "assert_matches", "async-trait", @@ -8395,7 +8395,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "futures 0.3.17", @@ -8421,7 +8421,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "sc-client-api", "sp-authorship", @@ -8432,7 +8432,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "lazy_static", "libsecp256k1 0.6.0", @@ -8458,7 +8458,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "derive_more", "environmental", @@ -8476,7 +8476,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "log", "parity-scale-codec", @@ -8492,7 +8492,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8510,7 +8510,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "derive_more", @@ -8547,7 +8547,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "derive_more", "finality-grandpa", @@ -8571,7 +8571,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "ansi_term 0.12.1", "futures 0.3.17", @@ -8588,7 +8588,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "derive_more", @@ -8603,7 +8603,7 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "hash-db", "parity-scale-codec", @@ -8621,7 +8621,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-std", "async-trait", @@ -8672,7 +8672,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8688,7 +8688,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "bytes 1.0.1", "fnv", @@ -8715,7 +8715,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "futures 0.3.17", "libp2p", @@ -8728,7 +8728,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8737,7 +8737,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "futures 0.3.17", "hash-db", @@ -8768,7 +8768,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8793,7 +8793,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8810,7 +8810,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "directories", @@ -8875,7 +8875,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "log", "parity-scale-codec", @@ -8889,7 +8889,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8911,7 +8911,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "chrono", "futures 0.3.17", @@ -8929,7 +8929,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8958,7 +8958,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8969,7 +8969,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "futures 0.3.17", "intervalier", @@ -8996,7 +8996,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "derive_more", "futures 0.3.17", @@ -9010,7 +9010,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -9442,7 +9442,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "hash-db", "log", @@ -9459,7 +9459,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -9471,7 +9471,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "scale-info", @@ -9484,7 +9484,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "integer-sqrt", "num-traits", @@ -9499,7 +9499,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "scale-info", @@ -9512,7 +9512,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "parity-scale-codec", @@ -9524,7 +9524,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "sp-api", @@ -9536,7 +9536,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "futures 0.3.17", "log", @@ -9554,7 +9554,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "futures 0.3.17", @@ -9573,7 +9573,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "merlin", @@ -9596,7 +9596,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "scale-info", @@ -9607,7 +9607,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9619,7 +9619,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "base58", "blake2-rfc", @@ -9664,7 +9664,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -9673,7 +9673,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "proc-macro2", "quote", @@ -9683,7 +9683,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "environmental", "parity-scale-codec", @@ -9694,7 +9694,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "finality-grandpa", "log", @@ -9712,7 +9712,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9726,7 +9726,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "futures 0.3.17", "hash-db", @@ -9750,7 +9750,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "lazy_static", "sp-core", @@ -9761,7 +9761,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "derive_more", @@ -9778,7 +9778,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "zstd", ] @@ -9786,7 +9786,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "scale-info", @@ -9801,7 +9801,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9812,7 +9812,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "sp-api", "sp-core", @@ -9822,7 +9822,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "backtrace", ] @@ -9830,7 +9830,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "rustc-hash", "serde", @@ -9840,7 +9840,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "either", "hash256-std-hasher", @@ -9862,7 +9862,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9879,7 +9879,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -9891,7 +9891,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "serde", "serde_json", @@ -9900,7 +9900,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "scale-info", @@ -9914,7 +9914,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "scale-info", @@ -9925,7 +9925,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "hash-db", "log", @@ -9948,12 +9948,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9966,7 +9966,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "log", "sp-core", @@ -9979,7 +9979,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -9995,7 +9995,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "erased-serde", "log", @@ -10013,7 +10013,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "sp-api", "sp-runtime", @@ -10022,7 +10022,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "log", @@ -10038,7 +10038,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "hash-db", "memory-db", @@ -10053,7 +10053,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10069,7 +10069,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10080,7 +10080,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10276,7 +10276,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "platforms", ] @@ -10284,7 +10284,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.17", @@ -10306,7 +10306,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-std", "derive_more", @@ -10320,7 +10320,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "async-trait", "futures 0.3.17", @@ -10347,7 +10347,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "futures 0.3.17", "substrate-test-utils-derive", @@ -10357,7 +10357,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -10368,7 +10368,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -10521,7 +10521,7 @@ dependencies = [ [[package]] name = "test-runner" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "frame-system", "futures 0.3.17", @@ -10960,7 +10960,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#83ced6b2acb82cddf8ae7cef5bad90482712651f" +source = "git+https://github.com/paritytech/substrate?branch=master#4ecbb1f724801d142d1c0cd30ac30f4a62dca364" dependencies = [ "jsonrpsee-ws-client", "log", diff --git a/node/service/src/relay_chain_selection.rs b/node/service/src/relay_chain_selection.rs index 2033a06a5f22..9635878182fd 100644 --- a/node/service/src/relay_chain_selection.rs +++ b/node/service/src/relay_chain_selection.rs @@ -173,7 +173,7 @@ where &self, target_hash: Hash, maybe_max_number: Option, - ) -> Result, ConsensusError> { + ) -> Result { let longest_chain_best = self.longest_chain.finality_target(target_hash, maybe_max_number).await?; @@ -316,9 +316,9 @@ where pub(crate) async fn finality_target_with_longest_chain( &self, target_hash: Hash, - best_leaf: Option, + best_leaf: Hash, maybe_max_number: Option, - ) -> Result, ConsensusError> { + ) -> Result { let mut overseer = self.overseer.clone(); let subchain_head = if cfg!(feature = "disputes") { @@ -337,13 +337,14 @@ where match best { // No viable leaves containing the block. - None => return Ok(Some(target_hash)), + None => return Ok(target_hash), Some(best) => best, } } else { - match best_leaf { - None => return Ok(Some(target_hash)), - Some(best_leaf) => best_leaf, + if best_leaf == target_hash { + return Ok(target_hash) + } else { + best_leaf } }; @@ -362,7 +363,7 @@ where "`finality_target` max number is less than target number", ); } - return Ok(Some(target_hash)) + return Ok(target_hash) } // find the current number. let subchain_header = self.block_header(subchain_head)?; @@ -423,7 +424,7 @@ where subchain_number, "Mismatch of anticipated block descriptions and block number difference.", ); - return Ok(Some(target_hash)) + return Ok(target_hash) } // 3. Constrain according to disputes: let (tx, rx) = oneshot::channel(); @@ -458,7 +459,7 @@ where if safe_target <= target_number { // Minimal vote needs to be on the target number. - Ok(Some(target_hash)) + Ok(target_hash) } else { // Otherwise we're looking for a descendant. let initial_leaf_header = self.block_header(initial_leaf)?; @@ -469,10 +470,10 @@ where ) .map_err(|e| ConsensusError::ChainLookup(format!("{:?}", e)))?; - Ok(Some(forced_target)) + Ok(forced_target) } } else { - Ok(Some(subchain_head)) + Ok(subchain_head) } } }