From 1bc27770d0aeafa53393e46ac3b125c1521217b5 Mon Sep 17 00:00:00 2001 From: Seun Date: Thu, 23 Apr 2020 17:02:11 +0100 Subject: [PATCH 01/13] WIP --- Cargo.lock | 327 +++--- availability-store/Cargo.toml | 17 +- cli/Cargo.toml | 23 +- collator/Cargo.toml | 19 +- collator/src/lib.rs | 4 +- erasure-coding/Cargo.toml | 4 +- network/Cargo.toml | 17 +- network/test/Cargo.toml | 17 +- parachain/Cargo.toml | 14 +- parachain/test-parachains/adder/Cargo.toml | 2 +- .../test-parachains/adder/collator/Cargo.toml | 5 +- .../test-parachains/code-upgrader/Cargo.toml | 2 +- primitives/Cargo.toml | 20 +- rpc/Cargo.toml | 15 +- rpc/src/lib.rs | 10 +- runtime/common/Cargo.toml | 48 +- runtime/kusama/Cargo.toml | 98 +- runtime/polkadot/Cargo.toml | 92 +- runtime/test-runtime/Cargo.toml | 68 +- runtime/test-runtime/client/Cargo.toml | 17 +- runtime/westend/Cargo.toml | 100 +- service/Cargo.toml | 70 +- service/src/chain_spec.rs | 4 +- service/src/lib.rs | 942 +++++++++--------- statement-table/Cargo.toml | 2 +- validation/Cargo.toml | 32 +- 26 files changed, 961 insertions(+), 1008 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 587078230f98..dc51d703a67f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1227,7 +1227,7 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "fork-tree" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", ] @@ -1235,7 +1235,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -1252,12 +1252,11 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-benchmarking", "parity-scale-codec", "sc-cli", - "sc-client", "sc-client-db", "sc-executor", "sc-service", @@ -1271,7 +1270,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -1286,7 +1285,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "serde", @@ -1297,7 +1296,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "bitmask", "frame-metadata", @@ -1321,7 +1320,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.10", @@ -1332,7 +1331,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1344,7 +1343,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", @@ -1354,7 +1353,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1370,7 +1369,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "sp-api", @@ -3252,7 +3251,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3270,7 +3269,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3287,7 +3286,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3308,7 +3307,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3323,7 +3322,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3339,7 +3338,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3354,7 +3353,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3368,7 +3367,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3384,7 +3383,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3402,7 +3401,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3418,7 +3417,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3437,7 +3436,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3453,7 +3452,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3467,7 +3466,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3481,7 +3480,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3496,7 +3495,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3509,7 +3508,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "enumflags2", "frame-support", @@ -3524,7 +3523,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3539,7 +3538,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3557,7 +3556,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3572,7 +3571,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3593,7 +3592,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", @@ -3604,7 +3603,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3618,7 +3617,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3635,7 +3634,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3648,7 +3647,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3666,7 +3665,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "parity-scale-codec", @@ -3679,7 +3678,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3693,7 +3692,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-support", "frame-system", @@ -3708,7 +3707,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "enumflags2", "frame-support", @@ -4042,7 +4041,6 @@ dependencies = [ "parking_lot 0.9.0", "polkadot-erasure-coding", "polkadot-primitives", - "sc-client", "sc-client-api", "sc-keystore", "sc-network", @@ -4063,7 +4061,6 @@ dependencies = [ "log 0.4.8", "polkadot-service", "sc-cli", - "sc-client", "sc-client-api", "sc-client-db", "sc-executor", @@ -4093,7 +4090,6 @@ dependencies = [ "polkadot-service", "polkadot-validation", "sc-cli", - "sc-client", "sc-client-api", "sc-network", "sp-api", @@ -4134,7 +4130,6 @@ dependencies = [ "polkadot-erasure-coding", "polkadot-primitives", "polkadot-validation", - "sc-client", "sc-network", "sc-network-gossip", "sp-api", @@ -4156,7 +4151,6 @@ dependencies = [ "polkadot-test-runtime-client", "rand 0.7.3", "sc-block-builder", - "sc-client", "sc-client-api", "sc-network", "sc-network-test", @@ -4214,9 +4208,10 @@ dependencies = [ "pallet-transaction-payment-rpc", "parity-scale-codec", "polkadot-primitives", - "sc-client", + "sc-client-api", "sc-rpc", "sp-api", + "sp-blockchain", "sp-runtime", "sp-transaction-pool", "substrate-frame-rpc-system", @@ -4357,7 +4352,6 @@ dependencies = [ "sc-authority-discovery", "sc-block-builder", "sc-chain-spec", - "sc-client", "sc-client-api", "sc-client-db", "sc-consensus-babe", @@ -4463,7 +4457,6 @@ dependencies = [ "polkadot-runtime-common", "polkadot-test-runtime", "sc-block-builder", - "sc-client", "sc-client-api", "sp-api", "sp-blockchain", @@ -5219,7 +5212,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "bytes 0.5.4", "derive_more 0.99.5", @@ -5246,7 +5239,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5262,7 +5255,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5278,7 +5271,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", @@ -5289,7 +5282,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "ansi_term 0.12.1", "app_dirs", @@ -5328,47 +5321,10 @@ dependencies = [ "tokio 0.2.18", ] -[[package]] -name = "sc-client" -version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" -dependencies = [ - "derive_more 0.99.5", - "fnv", - "futures 0.3.4", - "hash-db", - "hex-literal", - "kvdb", - "log 0.4.8", - "parity-scale-codec", - "parking_lot 0.10.2", - "rand 0.7.3", - "sc-block-builder", - "sc-client-api", - "sc-executor", - "sc-telemetry", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-database", - "sp-externalities", - "sp-inherents", - "sp-keyring", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-utils", - "sp-version", - "substrate-prometheus-endpoint", - "tracing", -] - [[package]] name = "sc-client-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "fnv", @@ -5386,6 +5342,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-database", "sp-externalities", "sp-inherents", "sp-keyring", @@ -5402,7 +5359,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "blake2-rfc", "hash-db", @@ -5415,7 +5372,6 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", - "sc-client", "sc-client-api", "sc-executor", "sc-state-db", @@ -5432,7 +5388,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "fork-tree", @@ -5447,7 +5403,6 @@ dependencies = [ "parking_lot 0.10.2", "pdqselect", "rand 0.7.3", - "sc-client", "sc-client-api", "sc-consensus-epochs", "sc-consensus-slots", @@ -5474,7 +5429,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5487,7 +5442,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5508,7 +5463,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "log 0.4.8", "sc-client-api", @@ -5522,7 +5477,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "lazy_static", @@ -5550,7 +5505,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -5567,7 +5522,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5582,7 +5537,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -5603,7 +5558,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "assert_matches", "finality-grandpa", @@ -5616,7 +5571,6 @@ dependencies = [ "pin-project", "rand 0.7.3", "sc-block-builder", - "sc-client", "sc-client-api", "sc-keystore", "sc-network", @@ -5639,7 +5593,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "ansi_term 0.12.1", "futures 0.3.4", @@ -5656,7 +5610,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "hex", @@ -5671,7 +5625,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "bitflags", "bytes 0.5.4", @@ -5697,7 +5651,6 @@ dependencies = [ "prost-build", "rand 0.7.3", "sc-block-builder", - "sc-client", "sc-client-api", "sc-peerset", "serde", @@ -5723,7 +5676,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5739,7 +5692,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "env_logger 0.7.1", "futures 0.3.4", @@ -5749,9 +5702,9 @@ dependencies = [ "parking_lot 0.10.2", "rand 0.7.3", "sc-block-builder", - "sc-client", "sc-client-api", "sc-network", + "sc-service", "sp-blockchain", "sp-consensus", "sp-consensus-babe", @@ -5765,7 +5718,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "bytes 0.5.4", "fnv", @@ -5792,7 +5745,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "futures 0.3.4", "libp2p", @@ -5805,7 +5758,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "futures 0.3.4", "hash-db", @@ -5815,7 +5768,6 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "sc-block-builder", - "sc-client", "sc-client-api", "sc-executor", "sc-keystore", @@ -5838,7 +5790,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -5862,7 +5814,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -5877,13 +5829,14 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "exit-future", "futures 0.1.29", "futures 0.3.4", "futures-timer 3.0.2", + "hash-db", "lazy_static", "log 0.4.8", "netstat2", @@ -5893,8 +5846,9 @@ dependencies = [ "parking_lot 0.10.2", "pin-project", "procfs", + "rand 0.7.3", + "sc-block-builder", "sc-chain-spec", - "sc-client", "sc-client-api", "sc-client-db", "sc-executor", @@ -5911,14 +5865,19 @@ dependencies = [ "slog", "sp-api", "sp-application-crypto", + "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-core", + "sp-externalities", "sp-io", "sp-runtime", "sp-session", + "sp-state-machine", "sp-transaction-pool", + "sp-trie", "sp-utils", + "sp-version", "substrate-prometheus-endpoint", "sysinfo", "tracing", @@ -5928,7 +5887,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5942,7 +5901,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "bytes 0.5.4", "futures 0.3.4", @@ -5964,7 +5923,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "erased-serde", "log 0.4.8", @@ -5979,7 +5938,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -5999,7 +5958,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6384,7 +6343,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -6396,7 +6355,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "hash-db", "parity-scale-codec", @@ -6411,7 +6370,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6423,7 +6382,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "serde", @@ -6435,7 +6394,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "integer-sqrt", "num-traits 0.2.11", @@ -6449,7 +6408,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "sp-api", @@ -6461,7 +6420,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6472,7 +6431,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "sp-api", @@ -6484,7 +6443,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -6500,7 +6459,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "serde", "serde_json", @@ -6509,7 +6468,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6532,7 +6491,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "sp-api", @@ -6546,7 +6505,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "sp-api", @@ -6562,7 +6521,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6574,7 +6533,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "base58", "blake2-rfc", @@ -6615,7 +6574,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -6624,7 +6583,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", @@ -6634,7 +6593,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "environmental", "sp-std", @@ -6644,7 +6603,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "serde", @@ -6657,7 +6616,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6667,7 +6626,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "parity-scale-codec", @@ -6679,7 +6638,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "futures 0.3.4", "hash-db", @@ -6699,7 +6658,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "lazy_static", "sp-core", @@ -6710,7 +6669,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "sp-api", "sp-runtime", @@ -6719,7 +6678,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "backtrace", "log 0.4.8", @@ -6728,7 +6687,7 @@ dependencies = [ [[package]] name = "sp-phragmen" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "serde", @@ -6740,7 +6699,7 @@ dependencies = [ [[package]] name = "sp-phragmen-compact" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", @@ -6751,7 +6710,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "serde", "sp-core", @@ -6760,7 +6719,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", @@ -6781,7 +6740,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "primitive-types", @@ -6796,7 +6755,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "Inflector", "proc-macro-crate", @@ -6808,7 +6767,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "serde", "serde_json", @@ -6817,7 +6776,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "sp-api", "sp-core", @@ -6828,7 +6787,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -6838,7 +6797,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "hash-db", "log 0.4.8", @@ -6857,12 +6816,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" [[package]] name = "sp-storage" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -6874,7 +6833,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6888,7 +6847,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "tracing", ] @@ -6896,7 +6855,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6911,7 +6870,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "hash-db", "memory-db", @@ -6925,7 +6884,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "futures 0.3.4", "futures-core", @@ -6936,7 +6895,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -6948,7 +6907,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7076,7 +7035,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "chrono", "clear_on_drop", @@ -7103,7 +7062,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "platforms", ] @@ -7111,7 +7070,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.4", @@ -7120,7 +7079,7 @@ dependencies = [ "jsonrpc-derive", "log 0.4.8", "parity-scale-codec", - "sc-client", + "sc-client-api", "serde", "sp-api", "sp-blockchain", @@ -7132,7 +7091,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "async-std", "derive_more 0.99.5", @@ -7146,15 +7105,15 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "futures 0.3.4", "hash-db", "parity-scale-codec", - "sc-client", "sc-client-api", "sc-client-db", "sc-executor", + "sc-service", "sp-blockchain", "sp-consensus", "sp-core", @@ -7166,7 +7125,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "cfg-if", "frame-executive", @@ -7179,7 +7138,7 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "parity-util-mem", - "sc-client", + "sc-service", "serde", "sp-api", "sp-application-crypto", @@ -7198,22 +7157,23 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "substrate-wasm-builder-runner 1.0.5 (git+https://github.com/paritytech/substrate)", + "substrate-wasm-builder-runner 1.0.5 (git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor)", "trie-db", ] [[package]] name = "substrate-test-runtime-client" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" dependencies = [ "futures 0.3.4", "parity-scale-codec", "sc-block-builder", - "sc-client", "sc-client-api", + "sc-service", "sp-api", "sp-blockchain", + "sp-consensus", "sp-core", "sp-runtime", "substrate-test-client", @@ -7223,7 +7183,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.5" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#2f104c2abe738d1f78ca28f6ca98b2b73e052ddb" [[package]] name = "substrate-wasm-builder-runner" @@ -7449,7 +7409,6 @@ dependencies = [ "polkadot-collator", "polkadot-parachain", "polkadot-primitives", - "sc-client", "sc-client-api", "sp-core", "test-parachain-adder", diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index 6eed336acd43..ac2a1aa9da6e 100644 --- a/availability-store/Cargo.toml +++ b/availability-store/Cargo.toml @@ -15,15 +15,14 @@ futures = "0.3.4" tokio = { version = "0.2.13", features = ["rt-core"] } exit-future = "0.2.0" codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } kvdb = "0.5.0" kvdb-memorydb = "0.5.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index ea9b86f2b260..313569ad01b3 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -17,26 +17,25 @@ crate-type = ["cdylib", "rlib"] log = "0.4.8" futures = { version = "0.3.4", features = ["compat"] } structopt = "0.3.8" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } service = { package = "polkadot-service", path = "../service", default-features = false } tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } wasm-bindgen = { version = "0.2.57", optional = true } wasm-bindgen-futures = { version = "0.4.7", optional = true } -browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } [features] default = [ "wasmtime", "db", "cli" ] diff --git a/collator/Cargo.toml b/collator/Cargo.toml index d84339f355e6..cf5b21818843 100644 --- a/collator/Cargo.toml +++ b/collator/Cargo.toml @@ -7,15 +7,14 @@ edition = "2018" [dependencies] futures = "0.3.4" -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } polkadot-primitives = { path = "../primitives" } polkadot-cli = { path = "../cli" } polkadot-network = { path = "../network" } @@ -27,4 +26,4 @@ futures-timer = "2.0" codec = { package = "parity-scale-codec", version = "1.3.0" } [dev-dependencies] -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } diff --git a/collator/src/lib.rs b/collator/src/lib.rs index d2fcf0b861a7..7f21249c1749 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -217,8 +217,8 @@ fn build_collator_service( ) -> Result where S: AbstractService, - sc_client::Client: ProvideRuntimeApi, - as ProvideRuntimeApi>::Api: + sc_client::Client: ProvideRuntimeApi, + as ProvideRuntimeApi>::Api: RuntimeApiCollection< Extrinsic, Error = sp_blockchain::Error, diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index e1c6270585c3..c3f8d633ee5b 100644 --- a/erasure-coding/Cargo.toml +++ b/erasure-coding/Cargo.toml @@ -8,6 +8,6 @@ edition = "2018" primitives = { package = "polkadot-primitives", path = "../primitives" } reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2"} codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } derive_more = "0.15.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index 9340a425bfaa..f69ff13111d8 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -15,19 +15,18 @@ polkadot-validation = { path = "../validation" } polkadot-primitives = { path = "../primitives" } polkadot-erasure-coding = { path = "../erasure-coding" } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } futures = "0.3.4" log = "0.4.8" exit-future = "0.2.0" futures-timer = "2.0" -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } wasm-timer = "0.2.4" [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } diff --git a/network/test/Cargo.toml b/network/test/Cargo.toml index c1a6fc9663d1..db971549e885 100644 --- a/network/test/Cargo.toml +++ b/network/test/Cargo.toml @@ -10,13 +10,12 @@ log = "0.4.8" parking_lot = "0.10.0" futures = "0.3.1" rand = "0.7.2" -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" } diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 48aae981d7a1..4aa47a5be7bf 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -10,17 +10,17 @@ edition = "2018" # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing # various unnecessary Substrate-specific endpoints. codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = [ "derive" ] } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } # all optional crates. derive_more = { version = "0.99.2", optional = true } serde = { version = "1.0.102", default-features = false, features = [ "derive" ], optional = true } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true, default-features = false } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true, default-features = false } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } parking_lot = { version = "0.10.0", optional = true } log = { version = "0.4.8", optional = true } diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml index 3834b26e4526..2a1553e204a0 100644 --- a/parachain/test-parachains/adder/Cargo.toml +++ b/parachain/test-parachains/adder/Cargo.toml @@ -13,7 +13,7 @@ tiny-keccak = "1.5.0" dlmalloc = { version = "0.1.3", features = [ "global" ] } # We need to make sure the global allocator is disabled until we have support of full substrate externalities -runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] } +runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 1d56b6924128..7d38a2e7a77f 100644 --- a/parachain/test-parachains/adder/collator/Cargo.toml +++ b/parachain/test-parachains/adder/collator/Cargo.toml @@ -9,9 +9,8 @@ adder = { package = "test-parachain-adder", path = ".." } parachain = { package = "polkadot-parachain", path = "../../.." } collator = { package = "polkadot-collator", path = "../../../../collator" } primitives = { package = "polkadot-primitives", path = "../../../../primitives" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "master" } -client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } parking_lot = "0.10.0" codec = { package = "parity-scale-codec", version = "1.2.0" } futures = "0.3.4" diff --git a/parachain/test-parachains/code-upgrader/Cargo.toml b/parachain/test-parachains/code-upgrader/Cargo.toml index c475334ecfd3..5e8cf3980593 100644 --- a/parachain/test-parachains/code-upgrader/Cargo.toml +++ b/parachain/test-parachains/code-upgrader/Cargo.toml @@ -13,7 +13,7 @@ tiny-keccak = "1.5.0" dlmalloc = { version = "0.1.3", features = [ "global" ] } # We need to make sure the global allocator is disabled until we have support of full substrate externalities -runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] } +runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 7a1e2eb0d786..da35c4ade48a 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,20 +7,20 @@ edition = "2018" [dependencies] serde = { version = "1.0.102", optional = true, features = ["derive"] } parity-scale-codec = { version = "1.3.0", default-features = false, features = ["bit-vec", "derive"] } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } polkadot-parachain = { path = "../parachain", default-features = false } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } [dev-dependencies] -sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } pretty_assertions = "0.5.1" [features] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 7e4d35cb9ace..ec287c6191fb 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -5,13 +5,14 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "master" } jsonrpc-core = "14.0.3" polkadot-primitives = { path = "../primitives" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" } -frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index 3b27b2543435..cc54917ffafe 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -23,6 +23,8 @@ use std::sync::Arc; use polkadot_primitives::{Block, AccountId, Nonce, Balance}; use sp_api::ProvideRuntimeApi; use txpool_api::TransactionPool; +use sp_blockchain::HeaderBackend; +use sc_client_api::light::{Fetcher, RemoteBlockchain}; /// A type representing all RPC extensions. pub type RpcExtension = jsonrpc_core::IoHandler; @@ -30,7 +32,7 @@ pub type RpcExtension = jsonrpc_core::IoHandler; /// Instantiate all RPC extensions. pub fn create_full(client: Arc, pool: Arc

) -> RpcExtension where C: ProvideRuntimeApi, - C: client::blockchain::HeaderBackend, + C: HeaderBackend, C: Send + Sync + 'static, C::Api: frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, @@ -53,18 +55,18 @@ pub fn create_full(client: Arc, pool: Arc

) -> RpcExtension where /// Instantiate all RPC extensions for light node. pub fn create_light( client: Arc, - remote_blockchain: Arc>, + remote_blockchain: Arc>, fetcher: Arc, pool: Arc

, ) -> RpcExtension where C: ProvideRuntimeApi, - C: client::blockchain::HeaderBackend, + C: HeaderBackend, C: Send + Sync + 'static, C::Api: frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, P: TransactionPool + Sync + Send + 'static, - F: client::light::fetcher::Fetcher + 'static, + F: Fetcher + 'static, UE: codec::Codec + Send + Sync + 'static, { use frame_rpc_system::{LightSystem, SystemApi}; diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 9da23b50ca88..4ead0ddf325f 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -12,37 +12,37 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.3.2", default-features = false, optional = true } [dev-dependencies] hex-literal = "0.2.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } trie-db = "0.20.0" serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 9818e00ed9e4..15f76928a2df 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -13,54 +13,54 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -69,8 +69,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index 484af1730e63..1a630882e24f 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -13,51 +13,51 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -66,8 +66,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index e37cb0b60f28..d6ce253229e5 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -13,39 +13,39 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -55,8 +55,8 @@ polkadot-parachain = { path = "../../parachain", default-features = false } hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/runtime/test-runtime/client/Cargo.toml b/runtime/test-runtime/client/Cargo.toml index b540adfb9b49..a24e7b69fde3 100644 --- a/runtime/test-runtime/client/Cargo.toml +++ b/runtime/test-runtime/client/Cargo.toml @@ -6,17 +6,16 @@ edition = "2018" license = "GPL-3.0" [dependencies] -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } polkadot-test-runtime = { path = ".." } polkadot-runtime-common = { path = "../../common" } polkadot-primitives = { path = "../../../primitives" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } codec = { package = "parity-scale-codec", version = "1.0.0" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } futures = "0.3.1" diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index 9099b0dfda35..389dc4f0d9a0 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -13,55 +13,55 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -71,8 +71,8 @@ polkadot-parachain = { path = "../../parachain", default-features = false } hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/service/Cargo.toml b/service/Cargo.toml index 14fffc94f98d..c49d7684e199 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -20,45 +20,45 @@ kusama-runtime = { path = "../runtime/kusama" } westend-runtime = { path = "../runtime/westend" } polkadot-network = { path = "../network", optional = true } polkadot-rpc = { path = "../rpc" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } codec = { package = "parity-scale-codec", version = "1.3.0" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } [dev-dependencies] polkadot-test-runtime-client = { path = "../runtime/test-runtime/client" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } env_logger = "0.7.0" [features] diff --git a/service/src/chain_spec.rs b/service/src/chain_spec.rs index 8d8572e7e7e3..4daf3826c948 100644 --- a/service/src/chain_spec.rs +++ b/service/src/chain_spec.rs @@ -48,9 +48,9 @@ const DEFAULT_PROTOCOL_ID: &str = "dot"; #[serde(rename_all = "camelCase")] pub struct Extensions { /// Block numbers with known hashes. - pub fork_blocks: sc_client::ForkBlocks, + pub fork_blocks: sc_client_api::ForkBlocks, /// Known bad block hashes. - pub bad_blocks: sc_client::BadBlocks, + pub bad_blocks: sc_client_api::BadBlocks, } /// The `ChainSpec parametrised for polkadot runtime`. diff --git a/service/src/lib.rs b/service/src/lib.rs index f27f19e1c721..3f1177acecc5 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -19,7 +19,6 @@ pub mod chain_spec; mod grandpa_support; -use sc_client::LongestChain; use std::sync::Arc; use std::time::Duration; use polkadot_primitives::{parachain, Hash, BlockId, AccountId, Nonce, Balance}; @@ -37,11 +36,10 @@ pub use service::{ }; pub use service::config::{DatabaseConfig, PrometheusConfig}; pub use sc_executor::NativeExecutionDispatch; -pub use sc_client::{ExecutionStrategy, CallExecutor, Client}; -pub use sc_client_api::backend::Backend; +pub use sc_client_api::{Backend, LongestChain, ExecutionStrategy, CallExecutor}; pub use sp_api::{Core as CoreApi, ConstructRuntimeApi, ProvideRuntimeApi, StateBackend}; pub use sp_runtime::traits::{HashFor, NumberFor}; -pub use consensus_common::SelectChain; +pub use consensus_common::{SelectChain, BlockImport, block_validation::Chain}; pub use polkadot_primitives::parachain::{CollatorId, ParachainHost}; pub use polkadot_primitives::Block; pub use sp_runtime::traits::{Block as BlockT, self as runtime_traits, BlakeTwo256}; @@ -53,6 +51,11 @@ pub use polkadot_runtime; pub use kusama_runtime; pub use westend_runtime; use prometheus_endpoint::Registry; +use sp_blockchain::{HeaderBackend, HeaderMetadata, ProvideCache}; +use sc_client_api::{LockImportRun, ProofProvider, ProvideUncles, StorageProvider, ExecutorProvider, Finalizer, BlockchainEvents, BlockBackend, UsageProvider, AuxStore, TransactionFor}; +use sc_block_builder::BlockBuilderProvider; +use sp_runtime::traits::BlockIdTo; +use sp_api::CallApiAt; native_executor_instance!( pub PolkadotExecutor, @@ -76,7 +79,7 @@ native_executor_instance!( ); /// A set of APIs that polkadot-like runtimes must implement. -pub trait RuntimeApiCollection : +pub trait RuntimeApiCollection: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::ApiExt + babe_primitives::BabeApi @@ -156,7 +159,7 @@ macro_rules! new_full_start { Block, $runtime, $executor >($config)? .with_select_chain(|_, backend| { - Ok(sc_client::LongestChain::new(backend.clone())) + Ok(sc_client_api::LongestChain::new(backend.clone())) })? .with_transaction_pool(|config, client, _fetcher, prometheus_registry| { let pool_api = sc_transaction_pool::FullChainApi::new(client.clone()); @@ -223,491 +226,486 @@ where config.keystore = service::config::KeystoreConfig::InMemory; Ok(new_full_start!(config, Runtime, Dispatch).0) } - -/// Create a new Polkadot service for a full node. -#[cfg(feature = "full-node")] -pub fn polkadot_new_full( - config: Configuration, - collating_for: Option<(CollatorId, parachain::Id)>, - max_block_data_size: Option, - authority_discovery_enabled: bool, - slot_duration: u64, - grandpa_pause: Option<(u32, u32)>, -) - -> Result<( - impl AbstractService< - Block = Block, - RuntimeApi = polkadot_runtime::RuntimeApi, - Backend = TFullBackend, - SelectChain = LongestChain, Block>, - CallExecutor = TFullCallExecutor, - >, - FullNodeHandles, - ), ServiceError> -{ - new_full( - config, - collating_for, - max_block_data_size, - authority_discovery_enabled, - slot_duration, - grandpa_pause, - ) -} - -/// Create a new Kusama service for a full node. -#[cfg(feature = "full-node")] -pub fn kusama_new_full( - config: Configuration, - collating_for: Option<(CollatorId, parachain::Id)>, - max_block_data_size: Option, - authority_discovery_enabled: bool, - slot_duration: u64, - grandpa_pause: Option<(u32, u32)>, -) - -> Result<( - impl AbstractService< - Block = Block, - RuntimeApi = kusama_runtime::RuntimeApi, - Backend = TFullBackend, - SelectChain = LongestChain, Block>, - CallExecutor = TFullCallExecutor, - >, - FullNodeHandles, - ), ServiceError> -{ - new_full( - config, - collating_for, - max_block_data_size, - authority_discovery_enabled, - slot_duration, - grandpa_pause, - ) -} - -/// Create a new Kusama service for a full node. -#[cfg(feature = "full-node")] -pub fn westend_new_full( - config: Configuration, - collating_for: Option<(CollatorId, parachain::Id)>, - max_block_data_size: Option, - authority_discovery_enabled: bool, - slot_duration: u64, - grandpa_pause: Option<(u32, u32)>, -) - -> Result<( - impl AbstractService< - Block = Block, - RuntimeApi = westend_runtime::RuntimeApi, - Backend = TFullBackend, - SelectChain = LongestChain, Block>, - CallExecutor = TFullCallExecutor, - >, - FullNodeHandles, - ), ServiceError> -{ - new_full( - config, - collating_for, - max_block_data_size, - authority_discovery_enabled, - slot_duration, - grandpa_pause, - ) -} - -/// Handles to other sub-services that full nodes instantiate, which consumers -/// of the node may use. -#[cfg(feature = "full-node")] -#[derive(Default)] -pub struct FullNodeHandles { - /// A handle to the Polkadot networking protocol. - pub polkadot_network: Option, - /// A handle to the validation service. - pub validation_service_handle: Option, -} - -/// Builds a new service for a full client. -#[cfg(feature = "full-node")] -pub fn new_full( - mut config: Configuration, - collating_for: Option<(CollatorId, parachain::Id)>, - max_block_data_size: Option, - authority_discovery_enabled: bool, - slot_duration: u64, - grandpa_pause: Option<(u32, u32)>, -) - -> Result<( - impl AbstractService< - Block = Block, - RuntimeApi = Runtime, - Backend = TFullBackend, - SelectChain = LongestChain, Block>, - CallExecutor = TFullCallExecutor, - >, - FullNodeHandles, - ), ServiceError> - where - Runtime: ConstructRuntimeApi> + Send + Sync + 'static, - Runtime::RuntimeApi: - RuntimeApiCollection, Block>>, - Dispatch: NativeExecutionDispatch + 'static, - Extrinsic: RuntimeExtrinsic, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - >::StateBackend: sp_api::StateBackend, -{ - use sc_network::Event; - use sc_client_api::ExecutorProvider; - use futures::stream::StreamExt; - - let is_collator = collating_for.is_some(); - let role = config.role.clone(); - let is_authority = role.is_authority() && !is_collator; - let force_authoring = config.force_authoring; - let max_block_data_size = max_block_data_size; - let db_path = match config.database.path() { - Some(path) => std::path::PathBuf::from(path), - None => return Err("Starting a Polkadot service with a custom database isn't supported".to_string().into()), - }; - let disable_grandpa = config.disable_grandpa; - let name = config.network.node_name.clone(); - let authority_discovery_enabled = authority_discovery_enabled; - let slot_duration = slot_duration; - - let (builder, mut import_setup, inherent_data_providers) = 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>; - Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _) - })? - .build()?; - - let (block_import, link_half, babe_link) = import_setup.take() - .expect("Link Half and Block Import are present for Full Services or setup failed before. qed"); - - let client = service.client(); - let known_oracle = client.clone(); - - let mut handles = FullNodeHandles::default(); - let select_chain = if let Some(select_chain) = service.select_chain() { - select_chain - } else { - info!("The node cannot start as an authority because it can't select chain."); - return Ok((service, handles)); - }; - let gossip_validator_select_chain = select_chain.clone(); - - let is_known = move |block_hash: &Hash| { - use consensus_common::BlockStatus; - - match known_oracle.block_status(&BlockId::hash(*block_hash)) { - Err(_) | Ok(BlockStatus::Unknown) | Ok(BlockStatus::Queued) => None, - Ok(BlockStatus::KnownBad) => Some(Known::Bad), - Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => { - match gossip_validator_select_chain.leaves() { - Err(_) => None, - Ok(leaves) => if leaves.contains(block_hash) { - Some(Known::Leaf) - } else { - Some(Known::Old) - }, - } - } - } - }; - - let polkadot_network_service = network_protocol::start( - service.network(), - network_protocol::Config { - collating_for, - }, - (is_known, client.clone()), - client.clone(), - service.spawn_task_handle(), - ).map_err(|e| format!("Could not spawn network worker: {:?}", e))?; - - let authority_handles = if is_collator || role.is_authority() { - let availability_store = { - use std::path::PathBuf; - - let mut path = PathBuf::from(db_path); - path.push("availability"); - - #[cfg(not(target_os = "unknown"))] - { - av_store::Store::new( - ::av_store::Config { - cache_size: None, - path, - }, - polkadot_network_service.clone(), - )? - } - - #[cfg(target_os = "unknown")] - av_store::Store::new_in_memory(gossip) - }; - - polkadot_network_service.register_availability_store(availability_store.clone()); - - let (validation_service_handle, validation_service) = consensus::ServiceBuilder { - client: client.clone(), - network: polkadot_network_service.clone(), - collators: polkadot_network_service.clone(), - spawner: service.spawn_task_handle(), - availability_store: availability_store.clone(), - select_chain: select_chain.clone(), - keystore: service.keystore(), - max_block_data_size, - }.build(); - - service.spawn_essential_task("validation-service", Box::pin(validation_service)); - - handles.validation_service_handle = Some(validation_service_handle.clone()); - - Some((validation_service_handle, availability_store)) - } else { - None - }; - - if role.is_authority() { - let (validation_service_handle, availability_store) = authority_handles - .clone() - .expect("Authority handles are set for authority nodes; qed"); - - let proposer = consensus::ProposerFactory::new( - client.clone(), - service.transaction_pool(), - validation_service_handle, - slot_duration, - backend, - ); - - let select_chain = service.select_chain().ok_or(ServiceError::SelectChainRequired)?; - let can_author_with = - consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone()); - - let block_import = availability_store.block_import( - block_import, - client.clone(), - service.spawn_task_handle(), - service.keystore(), - )?; - - let babe_config = babe::BabeParams { - keystore: service.keystore(), - client, - select_chain, - block_import, - env: proposer, - sync_oracle: service.network(), - inherent_data_providers: inherent_data_providers.clone(), - force_authoring, - babe_link, - can_author_with, - }; - - let babe = babe::start_babe(babe_config)?; - service.spawn_essential_task("babe", babe); - } - - if matches!(role, Role::Authority{..} | Role::Sentry{..}) { - if authority_discovery_enabled { - let (sentries, authority_discovery_role) = match role { - Role::Authority { ref sentry_nodes } => ( - sentry_nodes.clone(), - authority_discovery::Role::Authority ( - service.keystore(), - ), - ), - Role::Sentry {..} => ( - vec![], - authority_discovery::Role::Sentry, - ), - _ => unreachable!("Due to outer matches! constraint; qed."), - }; - - let network = service.network(); - let network_event_stream = network.event_stream("authority-discovery"); - let dht_event_stream = network_event_stream.filter_map(|e| async move { match e { - Event::Dht(e) => Some(e), - _ => None, - }}).boxed(); - let authority_discovery = authority_discovery::AuthorityDiscovery::new( - service.client(), - network, - sentries, - dht_event_stream, - authority_discovery_role, - service.prometheus_registry(), - ); - - service.spawn_task("authority-discovery", authority_discovery); - } - } - - // if the node isn't actively participating in consensus then it doesn't - // need a keystore, regardless of which protocol we use below. - let keystore = if is_authority { - Some(service.keystore()) - } else { - None - }; - - let config = grandpa::Config { - // FIXME substrate#1578 make this available through chainspec - gossip_duration: Duration::from_millis(1000), - justification_period: 512, - name: Some(name), - observer_enabled: false, - keystore, - is_authority: role.is_network_authority(), - }; - - let enable_grandpa = !disable_grandpa; - if enable_grandpa { - // start the full GRANDPA voter - // NOTE: unlike in substrate we are currently running the full - // GRANDPA voter protocol for all full nodes (regardless of whether - // they're validators or not). at this point the full voter should - // provide better guarantees of block and vote data availability than - // the observer. - - // add a custom voting rule to temporarily stop voting for new blocks - // after the given pause block is finalized and restarting after the - // given delay. - let voting_rule = match grandpa_pause { - Some((block, delay)) => { - info!("GRANDPA scheduled voting pause set for block #{} with a duration of {} blocks.", - block, - delay, - ); - - grandpa::VotingRulesBuilder::default() - .add(grandpa_support::PauseAfterBlockFor(block, delay)) - .build() - }, - None => - grandpa::VotingRulesBuilder::default() - .build(), - }; - - let grandpa_config = grandpa::GrandpaParams { - config, - link: link_half, - network: service.network(), - inherent_data_providers: inherent_data_providers.clone(), - telemetry_on_connect: Some(service.telemetry_on_connect_stream()), - voting_rule, - prometheus_registry: service.prometheus_registry(), - }; - - service.spawn_essential_task( - "grandpa-voter", - grandpa::run_grandpa_voter(grandpa_config)? - ); - } else { - grandpa::setup_disabled_grandpa( - service.client(), - &inherent_data_providers, - service.network(), - )?; - } - - handles.polkadot_network = Some(polkadot_network_service); - Ok((service, handles)) -} - -/// Create a new Polkadot service for a light client. -pub fn polkadot_new_light( - config: Configuration, -) - -> Result, - SelectChain = LongestChain, Block>, - CallExecutor = TLightCallExecutor, - >, ServiceError> -{ - new_light(config) -} - -/// Create a new Kusama service for a light client. -pub fn kusama_new_light( - config: Configuration, -) - -> Result, - SelectChain = LongestChain, Block>, - CallExecutor = TLightCallExecutor, - >, ServiceError> -{ - new_light(config) -} - -/// Create a new Westend service for a light client. -pub fn westend_new_light( - config: Configuration, -) - -> Result, - SelectChain = LongestChain, Block>, - CallExecutor = TLightCallExecutor, - >, ServiceError> -{ - new_light(config) -} +// +// /// Create a new Polkadot service for a full node. +// #[cfg(feature = "full-node")] +// pub fn polkadot_new_full( +// config: Configuration, +// collating_for: Option<(CollatorId, parachain::Id)>, +// max_block_data_size: Option, +// authority_discovery_enabled: bool, +// slot_duration: u64, +// grandpa_pause: Option<(u32, u32)>, +// ) +// -> Result<( +// impl AbstractService< +// Block = Block, +// Runtime= polkadot_runtime::RuntimeApi, +// Backend = TFullBackend, +// SelectChain = LongestChain, Block>, +// CallExecutor = TFullCallExecutor, +// >, +// FullNodeHandles, +// ), ServiceError> +// { +// new_full( +// config, +// collating_for, +// max_block_data_size, +// authority_discovery_enabled, +// slot_duration, +// grandpa_pause, +// ) +// } +// +// /// Create a new Kusama service for a full node. +// #[cfg(feature = "full-node")] +// pub fn kusama_new_full( +// config: Configuration, +// collating_for: Option<(CollatorId, parachain::Id)>, +// max_block_data_size: Option, +// authority_discovery_enabled: bool, +// slot_duration: u64, +// grandpa_pause: Option<(u32, u32)>, +// ) +// -> Result<( +// impl AbstractService< +// Block = Block, +// Runtime= kusama_runtime::RuntimeApi, +// Backend = TFullBackend, +// SelectChain = LongestChain, Block>, +// CallExecutor = TFullCallExecutor, +// >, +// FullNodeHandles, +// ), ServiceError> +// { +// new_full( +// config, +// collating_for, +// max_block_data_size, +// authority_discovery_enabled, +// slot_duration, +// grandpa_pause, +// ) +// } +// +// /// Create a new Kusama service for a full node. +// #[cfg(feature = "full-node")] +// pub fn westend_new_full( +// config: Configuration, +// collating_for: Option<(CollatorId, parachain::Id)>, +// max_block_data_size: Option, +// authority_discovery_enabled: bool, +// slot_duration: u64, +// grandpa_pause: Option<(u32, u32)>, +// ) +// -> Result<( +// impl AbstractService< +// Block = Block, +// Runtime= westend_runtime::RuntimeApi, +// Backend = TFullBackend, +// SelectChain = LongestChain, Block>, +// CallExecutor = TFullCallExecutor, +// >, +// FullNodeHandles, +// ), ServiceError> +// { +// new_full( +// config, +// collating_for, +// max_block_data_size, +// authority_discovery_enabled, +// slot_duration, +// grandpa_pause, +// ) +// } +// +// /// Handles to other sub-services that full nodes instantiate, which consumers +// /// of the node may use. +// #[cfg(feature = "full-node")] +// #[derive(Default)] +// pub struct FullNodeHandles { +// /// A handle to the Polkadot networking protocol. +// pub polkadot_network: Option, +// /// A handle to the validation service. +// pub validation_service_handle: Option, +// } +// +// /// Builds a new service for a full client. +// #[cfg(feature = "full-node")] +// pub fn new_full( +// mut config: Configuration, +// collating_for: Option<(CollatorId, parachain::Id)>, +// max_block_data_size: Option, +// authority_discovery_enabled: bool, +// slot_duration: u64, +// grandpa_pause: Option<(u32, u32)>, +// ) +// -> Result<( +// impl AbstractService< +// Block = Block, +// Runtime= Runtime, +// Backend = TFullBackend, +// SelectChain = LongestChain, Block>, +// CallExecutor = TFullCallExecutor, +// >, +// FullNodeHandles, +// ), ServiceError> +// where +// Runtime: ConstructRuntimeApi> + Send + Sync + 'static, +// Runtime::RuntimeApi: +// RuntimeApiCollection, Block>>, +// Dispatch: NativeExecutionDispatch + 'static, +// Extrinsic: RuntimeExtrinsic, +// // Rust bug: https://github.com/rust-lang/rust/issues/24159 +// >::StateBackend: sp_api::StateBackend, +// { +// use sc_network::Event; +// use sc_client_api::ExecutorProvider; +// use futures::stream::StreamExt; +// +// let is_collator = collating_for.is_some(); +// let role = config.role.clone(); +// let is_authority = role.is_authority() && !is_collator; +// let force_authoring = config.force_authoring; +// let max_block_data_size = max_block_data_size; +// let db_path = match config.database.path() { +// Some(path) => std::path::PathBuf::from(path), +// None => return Err("Starting a Polkadot service with a custom database isn't supported".to_string().into()), +// }; +// let disable_grandpa = config.disable_grandpa; +// let name = config.network.node_name.clone(); +// let authority_discovery_enabled = authority_discovery_enabled; +// let slot_duration = slot_duration; +// +// let (builder, mut import_setup, inherent_data_providers) = 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>; +// Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _) +// })? +// .build()?; +// +// let (block_import, link_half, babe_link) = import_setup.take() +// .expect("Link Half and Block Import are present for Full Services or setup failed before. qed"); +// +// let client = service.client(); +// let known_oracle = client.clone(); +// +// let mut handles = FullNodeHandles::default(); +// let select_chain = if let Some(select_chain) = service.select_chain() { +// select_chain +// } else { +// info!("The node cannot start as an authority because it can't select chain."); +// return Ok((service, handles)); +// }; +// let gossip_validator_select_chain = select_chain.clone(); +// +// let is_known = move |block_hash: &Hash| { +// use consensus_common::BlockStatus; +// +// match known_oracle.block_status(&BlockId::hash(*block_hash)) { +// Err(_) | Ok(BlockStatus::Unknown) | Ok(BlockStatus::Queued) => None, +// Ok(BlockStatus::KnownBad) => Some(Known::Bad), +// Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => { +// match gossip_validator_select_chain.leaves() { +// Err(_) => None, +// Ok(leaves) => if leaves.contains(block_hash) { +// Some(Known::Leaf) +// } else { +// Some(Known::Old) +// }, +// } +// } +// } +// }; +// +// let polkadot_network_service = network_protocol::start( +// service.network(), +// network_protocol::Config { +// collating_for, +// }, +// (is_known, client.clone()), +// client.clone(), +// service.spawn_task_handle(), +// ).map_err(|e| format!("Could not spawn network worker: {:?}", e))?; +// +// let authority_handles = if is_collator || role.is_authority() { +// let availability_store = { +// use std::path::PathBuf; +// +// let mut path = PathBuf::from(db_path); +// path.push("availability"); +// +// #[cfg(not(target_os = "unknown"))] +// { +// av_store::Store::new( +// ::av_store::Config { +// cache_size: None, +// path, +// }, +// polkadot_network_service.clone(), +// )? +// } +// +// #[cfg(target_os = "unknown")] +// av_store::Store::new_in_memory(gossip) +// }; +// +// polkadot_network_service.register_availability_store(availability_store.clone()); +// +// let (validation_service_handle, validation_service) = consensus::ServiceBuilder { +// client: client.clone(), +// network: polkadot_network_service.clone(), +// collators: polkadot_network_service.clone(), +// spawner: service.spawn_task_handle(), +// availability_store: availability_store.clone(), +// select_chain: select_chain.clone(), +// keystore: service.keystore(), +// max_block_data_size, +// }.build(); +// +// service.spawn_essential_task("validation-service", Box::pin(validation_service)); +// +// handles.validation_service_handle = Some(validation_service_handle.clone()); +// +// Some((validation_service_handle, availability_store)) +// } else { +// None +// }; +// +// if role.is_authority() { +// let (validation_service_handle, availability_store) = authority_handles +// .clone() +// .expect("Authority handles are set for authority nodes; qed"); +// +// let proposer = consensus::ProposerFactory::new( +// client.clone(), +// service.transaction_pool(), +// validation_service_handle, +// slot_duration, +// backend, +// ); +// +// let select_chain = service.select_chain().ok_or(ServiceError::SelectChainRequired)?; +// let can_author_with = +// consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone()); +// +// let block_import = availability_store.block_import( +// block_import, +// client.clone(), +// service.spawn_task_handle(), +// service.keystore(), +// )?; +// +// let babe_config = babe::BabeParams { +// keystore: service.keystore(), +// client, +// select_chain, +// block_import, +// env: proposer, +// sync_oracle: service.network(), +// inherent_data_providers: inherent_data_providers.clone(), +// force_authoring, +// babe_link, +// can_author_with, +// }; +// +// let babe = babe::start_babe(babe_config)?; +// service.spawn_essential_task("babe", babe); +// } +// +// if matches!(role, Role::Authority{..} | Role::Sentry{..}) { +// if authority_discovery_enabled { +// let (sentries, authority_discovery_role) = match role { +// Role::Authority { ref sentry_nodes } => ( +// sentry_nodes.clone(), +// authority_discovery::Role::Authority ( +// service.keystore(), +// ), +// ), +// Role::Sentry {..} => ( +// vec![], +// authority_discovery::Role::Sentry, +// ), +// _ => unreachable!("Due to outer matches! constraint; qed."), +// }; +// +// let network = service.network(); +// let network_event_stream = network.event_stream("authority-discovery"); +// let dht_event_stream = network_event_stream.filter_map(|e| async move { match e { +// Event::Dht(e) => Some(e), +// _ => None, +// }}).boxed(); +// let authority_discovery = authority_discovery::AuthorityDiscovery::new( +// service.client(), +// network, +// sentries, +// dht_event_stream, +// authority_discovery_role, +// service.prometheus_registry(), +// ); +// +// service.spawn_task("authority-discovery", authority_discovery); +// } +// } +// +// // if the node isn't actively participating in consensus then it doesn't +// // need a keystore, regardless of which protocol we use below. +// let keystore = if is_authority { +// Some(service.keystore()) +// } else { +// None +// }; +// +// let config = grandpa::Config { +// // FIXME substrate#1578 make this available through chainspec +// gossip_duration: Duration::from_millis(1000), +// justification_period: 512, +// name: Some(name), +// observer_enabled: false, +// keystore, +// is_authority: role.is_network_authority(), +// }; +// +// let enable_grandpa = !disable_grandpa; +// if enable_grandpa { +// // start the full GRANDPA voter +// // NOTE: unlike in substrate we are currently running the full +// // GRANDPA voter protocol for all full nodes (regardless of whether +// // they're validators or not). at this point the full voter should +// // provide better guarantees of block and vote data availability than +// // the observer. +// +// // add a custom voting rule to temporarily stop voting for new blocks +// // after the given pause block is finalized and restarting after the +// // given delay. +// let voting_rule = match grandpa_pause { +// Some((block, delay)) => { +// info!("GRANDPA scheduled voting pause set for block #{} with a duration of {} blocks.", +// block, +// delay, +// ); +// +// grandpa::VotingRulesBuilder::default() +// .add(grandpa_support::PauseAfterBlockFor(block, delay)) +// .build() +// }, +// None => +// grandpa::VotingRulesBuilder::default() +// .build(), +// }; +// +// let grandpa_config = grandpa::GrandpaParams { +// config, +// link: link_half, +// network: service.network(), +// inherent_data_providers: inherent_data_providers.clone(), +// telemetry_on_connect: Some(service.telemetry_on_connect_stream()), +// voting_rule, +// prometheus_registry: service.prometheus_registry(), +// }; +// +// service.spawn_essential_task( +// "grandpa-voter", +// grandpa::run_grandpa_voter(grandpa_config)? +// ); +// } else { +// grandpa::setup_disabled_grandpa( +// service.client(), +// &inherent_data_providers, +// service.network(), +// )?; +// } +// +// handles.polkadot_network = Some(polkadot_network_service); +// Ok((service, handles)) +// } +// +// /// Create a new Polkadot service for a light client. +// pub fn polkadot_new_light( +// config: Configuration, +// ) +// -> Result, +// SelectChain = LongestChain, Block>, +// CallExecutor = TLightCallExecutor, +// >, ServiceError> +// { +// new_light(config) +// } +// +// /// Create a new Kusama service for a light client. +// pub fn kusama_new_light( +// config: Configuration, +// ) +// -> Result, +// SelectChain = LongestChain, Block>, +// CallExecutor = TLightCallExecutor, +// >, ServiceError> +// { +// new_light(config) +// } +// +// /// Create a new Westend service for a light client. +// pub fn westend_new_light( +// config: Configuration, +// ) +// -> Result, +// SelectChain = LongestChain, Block>, +// CallExecutor = TLightCallExecutor, +// >, ServiceError> +// { +// new_light(config) +// } // We can't use service::TLightClient due to // Rust bug: https://github.com/rust-lang/rust/issues/43580 -type TLocalLightClient = Client< - sc_client::light::backend::Backend, BlakeTwo256>, - sc_client::light::call_executor::GenesisCallExecutor< - sc_client::light::backend::Backend, BlakeTwo256>, - sc_client::LocalCallExecutor< - sc_client::light::backend::Backend< - sc_client_db::light::LightStorage, - BlakeTwo256 - >, - sc_executor::NativeExecutor - > - >, - Block, - Runtime ->; +// type TLocalLightClient = Client< +// sc_client::light::backend::Backend, BlakeTwo256>, +// sc_client::light::call_executor::GenesisCallExecutor< +// sc_client::light::backend::Backend, BlakeTwo256>, +// sc_client::LocalCallExecutor< +// sc_client::light::backend::Backend< +// sc_client_db::light::LightStorage, +// BlakeTwo256 +// >, +// sc_executor::NativeExecutor +// > +// >, +// Block, +// Runtime +// >; /// Builds a new service for a light client. -pub fn new_light( +pub fn new_light( mut config: Configuration, ) -> Result, SelectChain = LongestChain, Block>, CallExecutor = TLightCallExecutor, >, ServiceError> where - Runtime: Send + Sync + 'static, - Runtime::RuntimeApi: RuntimeApiCollection< + RuntimeApi: RuntimeApiCollection< Extrinsic, StateBackend = sc_client_api::StateBackendFor, Block> >, Dispatch: NativeExecutionDispatch + 'static, Extrinsic: RuntimeExtrinsic, - Runtime: sp_api::ConstructRuntimeApi< - Block, - TLocalLightClient, - >, { set_prometheus_registry(&mut config)?; diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index d20cd4e6fb18..25e43b82d61f 100644 --- a/statement-table/Cargo.toml +++ b/statement-table/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } primitives = { package = "polkadot-primitives", path = "../primitives" } diff --git a/validation/Cargo.toml b/validation/Cargo.toml index d3304f21a9d3..e3449292de74 100644 --- a/validation/Cargo.toml +++ b/validation/Cargo.toml @@ -18,22 +18,22 @@ parachain = { package = "polkadot-parachain", path = "../parachain" } polkadot-primitives = { path = "../primitives" } polkadot-erasure-coding = { path = "../erasure-coding" } table = { package = "polkadot-statement-table", path = "../statement-table" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" } -consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } -block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "master" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } 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" } +runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } From 9a3f4e3655f9a977f6b61683d431ba7459b0df2a Mon Sep 17 00:00:00 2001 From: Seun Date: Fri, 24 Apr 2020 17:49:10 +0100 Subject: [PATCH 02/13] collator --- Cargo.lock | 489 +++++------ availability-store/Cargo.toml | 17 +- cli/Cargo.toml | 23 +- cli/src/command.rs | 120 ++- collator/Cargo.toml | 20 +- collator/src/lib.rs | 88 +- erasure-coding/Cargo.toml | 4 +- network/Cargo.toml | 17 +- network/test/Cargo.toml | 18 +- network/test/src/lib.rs | 20 +- parachain/Cargo.toml | 14 +- parachain/test-parachains/adder/Cargo.toml | 2 +- .../test-parachains/adder/collator/Cargo.toml | 5 +- .../test-parachains/code-upgrader/Cargo.toml | 2 +- primitives/Cargo.toml | 20 +- rpc/Cargo.toml | 15 +- rpc/src/lib.rs | 10 +- runtime/common/Cargo.toml | 48 +- runtime/kusama/Cargo.toml | 98 +-- runtime/polkadot/Cargo.toml | 92 +- runtime/test-runtime/Cargo.toml | 68 +- runtime/test-runtime/client/Cargo.toml | 18 +- runtime/test-runtime/client/src/lib.rs | 43 +- runtime/westend/Cargo.toml | 100 +-- service/Cargo.toml | 70 +- service/src/chain_spec.rs | 4 +- service/src/lib.rs | 831 ++++++++---------- statement-table/Cargo.toml | 2 +- validation/Cargo.toml | 32 +- 29 files changed, 1104 insertions(+), 1186 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 587078230f98..59c3412524e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -167,7 +167,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -503,9 +503,9 @@ checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" [[package]] name = "cc" -version = "1.0.50" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" +checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" dependencies = [ "jobserver", ] @@ -676,7 +676,7 @@ dependencies = [ "gimli", "log 0.4.8", "serde", - "smallvec 1.3.0", + "smallvec 1.4.0", "target-lexicon", "thiserror", ] @@ -714,7 +714,7 @@ checksum = "518344698fa6c976d853319218415fdfb4f1bc6b42d0b2e2df652e55dff1f778" dependencies = [ "cranelift-codegen", "log 0.4.8", - "smallvec 1.3.0", + "smallvec 1.4.0", "target-lexicon", ] @@ -898,7 +898,7 @@ checksum = "e2323f3f47db9a0e77ce7a300605d8d2098597fc451ed1a97bb1f6411bb550a7" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -1018,7 +1018,7 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -1138,7 +1138,7 @@ checksum = "030a733c8287d6213886dd487564ff5c8f6aae10278b3588ed177f9d18f8d231" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", "synstructure", ] @@ -1227,7 +1227,7 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "fork-tree" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", ] @@ -1235,7 +1235,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -1252,12 +1252,11 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-benchmarking", "parity-scale-codec", "sc-cli", - "sc-client", "sc-client-db", "sc-executor", "sc-service", @@ -1271,7 +1270,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -1286,7 +1285,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "serde", @@ -1297,7 +1296,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "bitmask", "frame-metadata", @@ -1321,40 +1320,40 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] name = "frame-support-procedural-tools" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] name = "frame-system" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1370,7 +1369,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "sp-api", @@ -1506,7 +1505,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -1628,7 +1627,7 @@ dependencies = [ "byteorder", "fallible-iterator", "indexmap", - "smallvec 1.3.0", + "smallvec 1.4.0", "stable_deref_trait", ] @@ -1989,7 +1988,7 @@ checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -2139,7 +2138,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -2300,7 +2299,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cad096c6849b2ef027fabe35c4aed356d0e3d3f586d0a8361e5e17f1e50a7ce5" dependencies = [ "parity-util-mem", - "smallvec 1.3.0", + "smallvec 1.4.0", ] [[package]] @@ -2330,7 +2329,7 @@ dependencies = [ "parking_lot 0.10.2", "regex", "rocksdb", - "smallvec 1.3.0", + "smallvec 1.4.0", ] [[package]] @@ -2430,7 +2429,7 @@ dependencies = [ "parity-multiaddr 0.8.0", "parking_lot 0.10.2", "pin-project", - "smallvec 1.3.0", + "smallvec 1.4.0", "wasm-timer", ] @@ -2461,7 +2460,7 @@ dependencies = [ "ring", "rw-stream-sink", "sha2", - "smallvec 1.3.0", + "smallvec 1.4.0", "thiserror", "unsigned-varint", "void", @@ -2475,7 +2474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "329127858e4728db5ab60c33d5ae352a999325fdf190ed022ec7d3a4685ae2e6" dependencies = [ "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -2501,7 +2500,7 @@ dependencies = [ "log 0.4.8", "prost", "prost-build", - "smallvec 1.3.0", + "smallvec 1.4.0", "wasm-timer", ] @@ -2525,7 +2524,7 @@ dependencies = [ "prost-build", "rand 0.7.3", "sha2", - "smallvec 1.3.0", + "smallvec 1.4.0", "uint", "unsigned-varint", "void", @@ -2549,7 +2548,7 @@ dependencies = [ "log 0.4.8", "net2", "rand 0.7.3", - "smallvec 1.3.0", + "smallvec 1.4.0", "void", "wasm-timer", ] @@ -2646,7 +2645,7 @@ dependencies = [ "libp2p-core", "log 0.4.8", "rand 0.7.3", - "smallvec 1.3.0", + "smallvec 1.4.0", "void", "wasm-timer", ] @@ -2716,9 +2715,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "6.6.4" +version = "6.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3b727e2dd20ec2fb7ed93f23d9fd5328a0871185485ebdaff007b47d3e27e4" +checksum = "883213ae3d09bfc3d104aefe94b25ebb183b6f4d3a515b23b14817e1f4854005" dependencies = [ "bindgen", "cc", @@ -3010,7 +3009,7 @@ dependencies = [ "futures 0.3.4", "log 0.4.8", "pin-project", - "smallvec 1.3.0", + "smallvec 1.4.0", "unsigned-varint", ] @@ -3252,7 +3251,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3270,7 +3269,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3287,7 +3286,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3308,7 +3307,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-benchmarking", "frame-support", @@ -3323,7 +3322,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-benchmarking", "frame-support", @@ -3339,7 +3338,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-benchmarking", "frame-support", @@ -3354,7 +3353,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3368,7 +3367,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3384,7 +3383,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3402,7 +3401,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3418,7 +3417,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3437,7 +3436,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3453,7 +3452,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3467,7 +3466,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3481,7 +3480,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3496,7 +3495,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3509,7 +3508,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "enumflags2", "frame-support", @@ -3524,7 +3523,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-benchmarking", "frame-support", @@ -3539,7 +3538,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3557,7 +3556,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3572,7 +3571,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3593,18 +3592,18 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] name = "pallet-sudo" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3618,7 +3617,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-benchmarking", "frame-support", @@ -3635,7 +3634,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3648,7 +3647,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3666,7 +3665,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "parity-scale-codec", @@ -3679,7 +3678,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3693,7 +3692,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-support", "frame-system", @@ -3708,7 +3707,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "enumflags2", "frame-support", @@ -3722,11 +3721,12 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "288f7e4d049b6c9adeb8a69deaa9a4085ec601a1dbf36fe4fd1dd686f44b12cc" +checksum = "00d595e372d119261593297debbe4193811a4dc811d2a1ccbb8caaa6666ad7ab" dependencies = [ "blake2-rfc", + "crc32fast", "libc", "log 0.4.8", "memmap", @@ -3806,7 +3806,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -3827,7 +3827,7 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.10.2", "primitive-types", - "smallvec 1.3.0", + "smallvec 1.4.0", "winapi 0.3.8", ] @@ -3838,7 +3838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2 1.0.10", - "syn 1.0.17", + "syn 1.0.18", "synstructure", ] @@ -3894,7 +3894,7 @@ dependencies = [ "cloudabi", "libc", "redox_syscall", - "smallvec 1.3.0", + "smallvec 1.4.0", "winapi 0.3.8", ] @@ -3917,7 +3917,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -3981,7 +3981,7 @@ checksum = "8988430ce790d8682672117bc06dda364c0be32d3abd738234f19f3240bad99a" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -3992,9 +3992,9 @@ checksum = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae" [[package]] name = "pin-utils" -version = "0.1.0-alpha.4" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" @@ -4042,7 +4042,6 @@ dependencies = [ "parking_lot 0.9.0", "polkadot-erasure-coding", "polkadot-primitives", - "sc-client", "sc-client-api", "sc-keystore", "sc-network", @@ -4063,7 +4062,6 @@ dependencies = [ "log 0.4.8", "polkadot-service", "sc-cli", - "sc-client", "sc-client-api", "sc-client-db", "sc-executor", @@ -4093,9 +4091,9 @@ dependencies = [ "polkadot-service", "polkadot-validation", "sc-cli", - "sc-client", "sc-client-api", "sc-network", + "sc-service", "sp-api", "sp-blockchain", "sp-consensus", @@ -4134,7 +4132,6 @@ dependencies = [ "polkadot-erasure-coding", "polkadot-primitives", "polkadot-validation", - "sc-client", "sc-network", "sc-network-gossip", "sp-api", @@ -4156,10 +4153,10 @@ dependencies = [ "polkadot-test-runtime-client", "rand 0.7.3", "sc-block-builder", - "sc-client", "sc-client-api", "sc-network", "sc-network-test", + "sc-service", "sp-blockchain", "sp-consensus", "sp-core", @@ -4214,9 +4211,10 @@ dependencies = [ "pallet-transaction-payment-rpc", "parity-scale-codec", "polkadot-primitives", - "sc-client", + "sc-client-api", "sc-rpc", "sp-api", + "sp-blockchain", "sp-runtime", "sp-transaction-pool", "substrate-frame-rpc-system", @@ -4357,7 +4355,6 @@ dependencies = [ "sc-authority-discovery", "sc-block-builder", "sc-chain-spec", - "sc-client", "sc-client-api", "sc-client-db", "sc-consensus-babe", @@ -4463,8 +4460,8 @@ dependencies = [ "polkadot-runtime-common", "polkadot-test-runtime", "sc-block-builder", - "sc-client", "sc-client-api", + "sc-service", "sp-api", "sp-blockchain", "sp-core", @@ -4580,7 +4577,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", "version_check", ] @@ -4592,7 +4589,7 @@ checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", "syn-mid", "version_check", ] @@ -4694,7 +4691,7 @@ dependencies = [ "itertools", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -5017,7 +5014,7 @@ version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a415a013dd7c5d4221382329a5a3482566da675737494935cbbbcdec04662f9d" dependencies = [ - "smallvec 1.3.0", + "smallvec 1.4.0", ] [[package]] @@ -5037,7 +5034,7 @@ checksum = "602eb59cda66fcb9aec25841fb76bc01d2b34282dcdd705028da297db6f3eec8" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -5203,9 +5200,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" +checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" [[package]] name = "safe-mix" @@ -5219,7 +5216,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "bytes 0.5.4", "derive_more 0.99.5", @@ -5246,7 +5243,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5262,7 +5259,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5278,18 +5275,18 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] name = "sc-cli" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "ansi_term 0.12.1", "app_dirs", @@ -5328,47 +5325,10 @@ dependencies = [ "tokio 0.2.18", ] -[[package]] -name = "sc-client" -version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" -dependencies = [ - "derive_more 0.99.5", - "fnv", - "futures 0.3.4", - "hash-db", - "hex-literal", - "kvdb", - "log 0.4.8", - "parity-scale-codec", - "parking_lot 0.10.2", - "rand 0.7.3", - "sc-block-builder", - "sc-client-api", - "sc-executor", - "sc-telemetry", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-database", - "sp-externalities", - "sp-inherents", - "sp-keyring", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-utils", - "sp-version", - "substrate-prometheus-endpoint", - "tracing", -] - [[package]] name = "sc-client-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "fnv", @@ -5386,6 +5346,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-database", "sp-externalities", "sp-inherents", "sp-keyring", @@ -5402,7 +5363,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "blake2-rfc", "hash-db", @@ -5415,7 +5376,6 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", - "sc-client", "sc-client-api", "sc-executor", "sc-state-db", @@ -5432,7 +5392,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "fork-tree", @@ -5447,7 +5407,6 @@ dependencies = [ "parking_lot 0.10.2", "pdqselect", "rand 0.7.3", - "sc-client", "sc-client-api", "sc-consensus-epochs", "sc-consensus-slots", @@ -5474,7 +5433,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5487,7 +5446,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5508,7 +5467,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "log 0.4.8", "sc-client-api", @@ -5522,7 +5481,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "lazy_static", @@ -5550,7 +5509,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -5567,7 +5526,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5582,7 +5541,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -5603,7 +5562,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "assert_matches", "finality-grandpa", @@ -5616,7 +5575,6 @@ dependencies = [ "pin-project", "rand 0.7.3", "sc-block-builder", - "sc-client", "sc-client-api", "sc-keystore", "sc-network", @@ -5639,7 +5597,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "ansi_term 0.12.1", "futures 0.3.4", @@ -5656,7 +5614,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "hex", @@ -5671,7 +5629,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "bitflags", "bytes 0.5.4", @@ -5697,7 +5655,6 @@ dependencies = [ "prost-build", "rand 0.7.3", "sc-block-builder", - "sc-client", "sc-client-api", "sc-peerset", "serde", @@ -5723,7 +5680,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5739,7 +5696,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "env_logger 0.7.1", "futures 0.3.4", @@ -5749,9 +5706,9 @@ dependencies = [ "parking_lot 0.10.2", "rand 0.7.3", "sc-block-builder", - "sc-client", "sc-client-api", "sc-network", + "sc-service", "sp-blockchain", "sp-consensus", "sp-consensus-babe", @@ -5765,7 +5722,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "bytes 0.5.4", "fnv", @@ -5792,7 +5749,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "futures 0.3.4", "libp2p", @@ -5805,7 +5762,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "futures 0.3.4", "hash-db", @@ -5815,7 +5772,6 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "sc-block-builder", - "sc-client", "sc-client-api", "sc-executor", "sc-keystore", @@ -5838,7 +5794,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -5862,7 +5818,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -5877,13 +5833,14 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "exit-future", "futures 0.1.29", "futures 0.3.4", "futures-timer 3.0.2", + "hash-db", "lazy_static", "log 0.4.8", "netstat2", @@ -5893,8 +5850,9 @@ dependencies = [ "parking_lot 0.10.2", "pin-project", "procfs", + "rand 0.7.3", + "sc-block-builder", "sc-chain-spec", - "sc-client", "sc-client-api", "sc-client-db", "sc-executor", @@ -5911,14 +5869,19 @@ dependencies = [ "slog", "sp-api", "sp-application-crypto", + "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-core", + "sp-externalities", "sp-io", "sp-runtime", "sp-session", + "sp-state-machine", "sp-transaction-pool", + "sp-trie", "sp-utils", + "sp-version", "substrate-prometheus-endpoint", "sysinfo", "tracing", @@ -5928,7 +5891,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5942,7 +5905,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "bytes 0.5.4", "futures 0.3.4", @@ -5964,7 +5927,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "erased-serde", "log 0.4.8", @@ -5979,7 +5942,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -5999,7 +5962,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6079,7 +6042,7 @@ checksum = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -6094,9 +6057,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572dfa3a0785509e7a44b5b4bebcf94d41ba34e9ed9eb9df722545c3b3c4144a" +checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620" dependencies = [ "bitflags", "core-foundation", @@ -6107,9 +6070,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ddb15a5fec93b7021b8a9e96009c5d8d51c15673569f7c0f6b7204e5b7b404f" +checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" dependencies = [ "core-foundation-sys", "libc", @@ -6165,7 +6128,7 @@ checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -6325,7 +6288,7 @@ checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -6339,9 +6302,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05720e22615919e4734f6a99ceae50d00226c3c5aca406e102ebc33298214e0a" +checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" [[package]] name = "snow" @@ -6376,7 +6339,7 @@ dependencies = [ "log 0.4.8", "rand 0.7.3", "sha1", - "smallvec 1.3.0", + "smallvec 1.4.0", "static_assertions", "thiserror", ] @@ -6384,7 +6347,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -6396,7 +6359,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "hash-db", "parity-scale-codec", @@ -6411,19 +6374,19 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "blake2-rfc", "proc-macro-crate", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] name = "sp-application-crypto" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "serde", @@ -6435,7 +6398,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "integer-sqrt", "num-traits 0.2.11", @@ -6449,7 +6412,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "sp-api", @@ -6461,7 +6424,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6472,7 +6435,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "sp-api", @@ -6484,7 +6447,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -6500,7 +6463,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "serde", "serde_json", @@ -6509,7 +6472,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6532,7 +6495,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "sp-api", @@ -6546,7 +6509,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "sp-api", @@ -6562,7 +6525,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6574,7 +6537,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "base58", "blake2-rfc", @@ -6615,7 +6578,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -6624,17 +6587,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] name = "sp-externalities" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "environmental", "sp-std", @@ -6644,7 +6607,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "serde", @@ -6657,7 +6620,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6667,7 +6630,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "parity-scale-codec", @@ -6679,7 +6642,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "futures 0.3.4", "hash-db", @@ -6699,7 +6662,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "lazy_static", "sp-core", @@ -6710,7 +6673,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "sp-api", "sp-runtime", @@ -6719,7 +6682,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "backtrace", "log 0.4.8", @@ -6728,7 +6691,7 @@ dependencies = [ [[package]] name = "sp-phragmen" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "serde", @@ -6740,18 +6703,18 @@ dependencies = [ [[package]] name = "sp-phragmen-compact" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] name = "sp-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "serde", "sp-core", @@ -6760,7 +6723,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", @@ -6781,7 +6744,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "primitive-types", @@ -6796,19 +6759,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] name = "sp-serializer" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "serde", "serde_json", @@ -6817,7 +6780,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "sp-api", "sp-core", @@ -6828,7 +6791,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -6838,7 +6801,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "hash-db", "log 0.4.8", @@ -6857,12 +6820,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" [[package]] name = "sp-storage" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -6874,7 +6837,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6888,7 +6851,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "tracing", ] @@ -6896,7 +6859,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6911,7 +6874,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "hash-db", "memory-db", @@ -6925,7 +6888,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "futures 0.3.4", "futures-core", @@ -6936,7 +6899,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -6948,7 +6911,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7018,9 +6981,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6da2e8d107dfd7b74df5ef4d205c6aebee0706c647f6bc6a2d5789905c00fb" +checksum = "863246aaf5ddd0d6928dfeb1a9ca65f505599e4e1b399935ef7e75107516b4ef" dependencies = [ "clap", "lazy_static", @@ -7029,15 +6992,15 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a489c87c08fbaf12e386665109dd13470dcc9c4583ea3e10dd2b4523e5ebd9ac" +checksum = "d239ca4b13aee7a2142e6795cbd69e457665ff8037aed33b3effdc430d2f927a" dependencies = [ "heck", "proc-macro-error", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -7058,7 +7021,7 @@ dependencies = [ "heck", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -7076,7 +7039,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "chrono", "clear_on_drop", @@ -7103,7 +7066,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "platforms", ] @@ -7111,7 +7074,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.4", @@ -7120,7 +7083,7 @@ dependencies = [ "jsonrpc-derive", "log 0.4.8", "parity-scale-codec", - "sc-client", + "sc-client-api", "serde", "sp-api", "sp-blockchain", @@ -7132,7 +7095,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "async-std", "derive_more 0.99.5", @@ -7146,15 +7109,15 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "futures 0.3.4", "hash-db", "parity-scale-codec", - "sc-client", "sc-client-api", "sc-client-db", "sc-executor", + "sc-service", "sp-blockchain", "sp-consensus", "sp-core", @@ -7166,7 +7129,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "cfg-if", "frame-executive", @@ -7179,7 +7142,7 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "parity-util-mem", - "sc-client", + "sc-service", "serde", "sp-api", "sp-application-crypto", @@ -7198,22 +7161,23 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "substrate-wasm-builder-runner 1.0.5 (git+https://github.com/paritytech/substrate)", + "substrate-wasm-builder-runner 1.0.5 (git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor)", "trie-db", ] [[package]] name = "substrate-test-runtime-client" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" dependencies = [ "futures 0.3.4", "parity-scale-codec", "sc-block-builder", - "sc-client", "sc-client-api", + "sc-service", "sp-api", "sp-blockchain", + "sp-consensus", "sp-core", "sp-runtime", "substrate-test-client", @@ -7223,7 +7187,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.5" -source = "git+https://github.com/paritytech/substrate#3a36e511a516644c291f99b1ab9a23d097e65c44" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" [[package]] name = "substrate-wasm-builder-runner" @@ -7336,9 +7300,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" +checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", @@ -7353,7 +7317,7 @@ checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -7373,7 +7337,7 @@ checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", "unicode-xid 0.2.0", ] @@ -7449,7 +7413,6 @@ dependencies = [ "polkadot-collator", "polkadot-parachain", "polkadot-primitives", - "sc-client", "sc-client-api", "sp-core", "test-parachain-adder", @@ -7523,7 +7486,7 @@ checksum = "ca972988113b7715266f91250ddb98070d033c62a011fa0fcc57434a649310dd" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -7537,9 +7500,9 @@ dependencies = [ [[package]] name = "threadpool" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" +checksum = "e8dae184447c15d5a6916d973c642aec485105a13cd238192a6927ae3e077d66" dependencies = [ "num_cpus", ] @@ -7862,7 +7825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbad39da2f9af1cae3016339ad7f2c7a9e870f12e8fd04c4fd7ef35b30c0d2b" dependencies = [ "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", ] [[package]] @@ -7890,7 +7853,7 @@ dependencies = [ "hashbrown", "log 0.4.8", "rustc-hex", - "smallvec 1.3.0", + "smallvec 1.4.0", ] [[package]] @@ -7970,7 +7933,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" dependencies = [ - "smallvec 1.3.0", + "smallvec 1.4.0", ] [[package]] @@ -8130,7 +8093,7 @@ dependencies = [ "log 0.4.8", "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", "wasm-bindgen-shared", ] @@ -8164,7 +8127,7 @@ checksum = "d68a5b36eef1be7868f668632863292e37739656a80fc4b9acec7b0bd35a4931" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8536,7 +8499,7 @@ checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", - "syn 1.0.17", + "syn 1.0.18", "synstructure", ] diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index 6eed336acd43..ac2a1aa9da6e 100644 --- a/availability-store/Cargo.toml +++ b/availability-store/Cargo.toml @@ -15,15 +15,14 @@ futures = "0.3.4" tokio = { version = "0.2.13", features = ["rt-core"] } exit-future = "0.2.0" codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } kvdb = "0.5.0" kvdb-memorydb = "0.5.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index ea9b86f2b260..313569ad01b3 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -17,26 +17,25 @@ crate-type = ["cdylib", "rlib"] log = "0.4.8" futures = { version = "0.3.4", features = ["compat"] } structopt = "0.3.8" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } service = { package = "polkadot-service", path = "../service", default-features = false } tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } wasm-bindgen = { version = "0.2.57", optional = true } wasm-bindgen-futures = { version = "0.4.7", optional = true } -browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } [features] default = [ "wasmtime", "db", "cli" ] diff --git a/cli/src/command.rs b/cli/src/command.rs index a63954fe3d55..4775fc2178af 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -15,9 +15,8 @@ // along with Polkadot. If not, see . use log::info; -use sp_runtime::traits::BlakeTwo256; -use service::{IdentifyVariant, Block, self, RuntimeApiCollection, TFullClient}; -use sp_api::ConstructRuntimeApi; +use service::{IdentifyVariant, self}; +use sc_executor::NativeExecutionDispatch; use sc_cli::{SubstrateCli, Result}; use crate::cli::{Cli, Subcommand}; @@ -82,23 +81,56 @@ pub fn run() -> Result<()> { info!(" KUSAMA FOUNDATION "); info!("----------------------------"); - run_node::< - service::kusama_runtime::RuntimeApi, - service::KusamaExecutor, - service::kusama_runtime::UncheckedExtrinsic, - >(runtime, authority_discovery_enabled, grandpa_pause) + runtime.run_node( + |config| { + service::kusama_new_light(config) + }, + |config| { + service::kusama_new_full( + config, + None, + None, + authority_discovery_enabled, + 6000, + grandpa_pause + ).map(|(s, _)| s) + }, + service::KusamaExecutor::native_version().runtime_version + ) } else if config.chain_spec.is_westend() { - run_node::< - service::westend_runtime::RuntimeApi, - service::WestendExecutor, - service::westend_runtime::UncheckedExtrinsic, - >(runtime, authority_discovery_enabled, grandpa_pause) + runtime.run_node( + |config| { + service::westend_new_light(config) + }, + |config| { + service::westend_new_full( + config, + None, + None, + authority_discovery_enabled, + 6000, + grandpa_pause + ).map(|(s, _)| s) + }, + service::WestendExecutor::native_version().runtime_version + ) } else { - run_node::< - service::polkadot_runtime::RuntimeApi, - service::PolkadotExecutor, - service::polkadot_runtime::UncheckedExtrinsic, - >(runtime, authority_discovery_enabled, grandpa_pause) + runtime.run_node( + |config| { + service::polkadot_new_light(config) + }, + |config| { + service::polkadot_new_full( + config, + None, + None, + authority_discovery_enabled, + 6000, + grandpa_pause + ).map(|(s, _)| s) + }, + service::PolkadotExecutor::native_version().runtime_version + ) } }, Some(Subcommand::Base(subcommand)) => { @@ -160,55 +192,3 @@ pub fn run() -> Result<()> { }, } } - -fn run_node( - runtime: sc_cli::Runner, - authority_discovery_enabled: bool, - grandpa_pause: Option<(u32, u32)>, -) -> sc_cli::Result<()> -where - R: ConstructRuntimeApi> - + Send + Sync + 'static, - >>::RuntimeApi: - RuntimeApiCollection, Block>>, - >>::RuntimeApi: - RuntimeApiCollection, Block>>, - E: service::Codec + Send + Sync + 'static, - D: service::NativeExecutionDispatch + 'static, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - <>>::RuntimeApi as sp_api::ApiExt>::StateBackend: - sp_api::StateBackend, - // Rust bug: https://github.com/rust-lang/rust/issues/43580 - R: ConstructRuntimeApi< - Block, - TLightClient - >, -{ - runtime.run_node( - |config| service::new_light::(config), - |config| service::new_full::( - config, - None, - None, - authority_discovery_enabled, - 6000, - grandpa_pause, - ).map(|(s, _)| s), - D::native_version().runtime_version, - ) -} - -// We can't simply use `service::TLightClient` due to a -// Rust bug: https://github.com/rust-lang/rust/issues/43580 -type TLightClient = sc_client::Client< - sc_client::light::backend::Backend, BlakeTwo256>, - sc_client::light::call_executor::GenesisCallExecutor< - sc_client::light::backend::Backend, BlakeTwo256>, - sc_client::LocalCallExecutor< - sc_client::light::backend::Backend, BlakeTwo256>, - sc_executor::NativeExecutor - > - >, - Block, - Runtime ->; diff --git a/collator/Cargo.toml b/collator/Cargo.toml index d84339f355e6..429dc0a90447 100644 --- a/collator/Cargo.toml +++ b/collator/Cargo.toml @@ -7,15 +7,15 @@ edition = "2018" [dependencies] futures = "0.3.4" -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } polkadot-primitives = { path = "../primitives" } polkadot-cli = { path = "../cli" } polkadot-network = { path = "../network" } @@ -27,4 +27,4 @@ futures-timer = "2.0" codec = { package = "parity-scale-codec", version = "1.3.0" } [dev-dependencies] -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } diff --git a/collator/src/lib.rs b/collator/src/lib.rs index d2fcf0b861a7..b523a491c5fd 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -52,7 +52,7 @@ use std::pin::Pin; use futures::{future, Future, Stream, FutureExt, TryFutureExt, StreamExt, task::Spawn}; use log::warn; -use sc_client::BlockchainEvents; +use sc_client_api::{BlockchainEvents, StateBackend}; use sp_core::Pair; use sp_runtime::traits::BlakeTwo256; use polkadot_primitives::{ @@ -72,7 +72,9 @@ pub use polkadot_validation::SignedStatement; pub use polkadot_primitives::parachain::CollatorId; pub use sc_network::PeerId; pub use service::RuntimeApiCollection; +use sc_service::ClientProvider; pub use sc_cli::SubstrateCli; +use sp_api::{ConstructRuntimeApi, ApiExt, HashFor}; const COLLATION_TIMEOUT: Duration = Duration::from_secs(30); @@ -114,34 +116,24 @@ impl fmt::Display for Error { } } -/// The Polkadot client type. -pub type PolkadotClient = sc_client::Client; - /// Something that can build a `ParachainContext`. pub trait BuildParachainContext { /// The parachain context produced by the `build` function. type ParachainContext: self::ParachainContext; /// Build the `ParachainContext`. - fn build( + fn build( self, - client: Arc>, + client: Arc, spawner: SP, network: impl Network + Clone + 'static, ) -> Result where - PolkadotClient: ProvideRuntimeApi, - as ProvideRuntimeApi>::Api: RuntimeApiCollection, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - < as ProvideRuntimeApi>::Api as sp_api::ApiExt>::StateBackend: - sp_api::StateBackend, + Client: ProvideRuntimeApi, + Client::Api: RuntimeApiCollection, + >::StateBackend: StateBackend>, Extrinsic: codec::Codec + Send + Sync + 'static, - E: sc_client::CallExecutor + Clone + Send + Sync + 'static, - SP: Spawn + Clone + Send + Sync + 'static, - R: Send + Sync + 'static, - B: sc_client_api::Backend + 'static, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - B::State: sp_api::StateBackend; + SP: Spawn + Clone + Send + Sync + 'static; } /// Parachain context needed for collation. @@ -209,30 +201,36 @@ pub async fn collate

( Ok(collation) } -fn build_collator_service( - service: (S, polkadot_service::FullNodeHandles), +fn build_collator_service( + service: (Service, polkadot_service::FullNodeHandles), para_id: ParaId, key: Arc, build_parachain_context: P, -) -> Result +) -> Result where - S: AbstractService, - sc_client::Client: ProvideRuntimeApi, - as ProvideRuntimeApi>::Api: + Service: AbstractService, + Service::Client: ClientProvider< + service::Block, + Service::Backend, + Service::CallExecutor, + Service::RuntimeApi + >, + Service::RuntimeApi: ConstructRuntimeApi, + >::RuntimeApi: RuntimeApiCollection< Extrinsic, Error = sp_blockchain::Error, - StateBackend = sc_client_api::StateBackendFor + StateBackend = sc_client_api::StateBackendFor >, + // // Rust bug: https://github.com/rust-lang/rust/issues/24159 + Service::Backend: service::Backend, // Rust bug: https://github.com/rust-lang/rust/issues/24159 - S::Backend: service::Backend, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - >::State: - sp_api::StateBackend>, + >::State: + sp_api::StateBackend, // Rust bug: https://github.com/rust-lang/rust/issues/24159 - S::CallExecutor: service::CallExecutor, + Service::CallExecutor: service::CallExecutor, // Rust bug: https://github.com/rust-lang/rust/issues/24159 - S::SelectChain: service::SelectChain, + Service::SelectChain: service::SelectChain, P: BuildParachainContext, P::ParachainContext: Send + 'static, ::ProduceCandidate: Send, @@ -359,18 +357,32 @@ where ).into(), (true, _) => build_collator_service( - service::kusama_new_full(config, Some((key.public(), para_id)), None, false, 6000, None)?, - para_id, - key, - build_parachain_context, - )?.await, - (false, _) => - build_collator_service( - service::polkadot_new_full(config, Some((key.public(), para_id)), None, false, 6000, None)?, + service::kusama_new_full( + config, + Some((key.public(), para_id)), + None, + false, + 6000, + None + )?, para_id, key, build_parachain_context, )?.await, + (false, _) => Ok(()) + // build_collator_service( + // service::polkadot_new_full( + // config, + // Some((key.public(), para_id)), + // None, + // false, + // 6000, + // None + // )?, + // para_id, + // key, + // build_parachain_context, + // )?.await, } } diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index e1c6270585c3..c3f8d633ee5b 100644 --- a/erasure-coding/Cargo.toml +++ b/erasure-coding/Cargo.toml @@ -8,6 +8,6 @@ edition = "2018" primitives = { package = "polkadot-primitives", path = "../primitives" } reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2"} codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } derive_more = "0.15.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index 9340a425bfaa..f69ff13111d8 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -15,19 +15,18 @@ polkadot-validation = { path = "../validation" } polkadot-primitives = { path = "../primitives" } polkadot-erasure-coding = { path = "../erasure-coding" } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } futures = "0.3.4" log = "0.4.8" exit-future = "0.2.0" futures-timer = "2.0" -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } wasm-timer = "0.2.4" [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } diff --git a/network/test/Cargo.toml b/network/test/Cargo.toml index c1a6fc9663d1..e9a3d96b1464 100644 --- a/network/test/Cargo.toml +++ b/network/test/Cargo.toml @@ -10,13 +10,13 @@ log = "0.4.8" parking_lot = "0.10.0" futures = "0.3.1" rand = "0.7.2" -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "seun-the-great-client-refactor" } +sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" } diff --git a/network/test/src/lib.rs b/network/test/src/lib.rs index 36bdda0ba4d6..576efa552ff0 100644 --- a/network/test/src/lib.rs +++ b/network/test/src/lib.rs @@ -30,12 +30,11 @@ use sp_blockchain::{ use sc_client_api::{ BlockchainEvents, BlockImportNotification, FinalityNotifications, ImportNotifications, - FinalityNotification, + FinalityNotification, LongestChain, client::BlockBackend, backend::{TransactionFor, AuxStore, Backend, Finalizer}, }; use sc_block_builder::{BlockBuilder, BlockBuilderProvider}; -use sc_client::LongestChain; use sp_consensus::block_validation::DefaultBlockAnnounceValidator; use sp_consensus::import_queue::{ BasicQueue, BoxJustificationImport, Verifier, BoxFinalityProofImport, @@ -53,14 +52,23 @@ use sp_runtime::generic::BlockId; use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor}; use sp_runtime::Justification; pub use sc_network_test::PassThroughVerifier; +use sc_service::client::Client; pub use polkadot_test_runtime_client::runtime::{Block, Extrinsic, Hash}; pub use polkadot_test_runtime_client::{TestClient, TestClientBuilder, TestClientBuilderExt}; -pub type PeersFullClient = - sc_client::Client; -pub type PeersLightClient = - sc_client::Client; +pub type PeersFullClient = Client< + polkadot_test_runtime_client::Backend, + polkadot_test_runtime_client::Executor, + Block, + polkadot_test_runtime_client::runtime::RuntimeApi +>; +pub type PeersLightClient = Client< + polkadot_test_runtime_client::LightBackend, + polkadot_test_runtime_client::LightExecutor, + Block, + polkadot_test_runtime_client::runtime::RuntimeApi +>; #[derive(Clone)] pub enum PeersClient { diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 48aae981d7a1..4aa47a5be7bf 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -10,17 +10,17 @@ edition = "2018" # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing # various unnecessary Substrate-specific endpoints. codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = [ "derive" ] } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } # all optional crates. derive_more = { version = "0.99.2", optional = true } serde = { version = "1.0.102", default-features = false, features = [ "derive" ], optional = true } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true, default-features = false } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true, default-features = false } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } parking_lot = { version = "0.10.0", optional = true } log = { version = "0.4.8", optional = true } diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml index 3834b26e4526..2a1553e204a0 100644 --- a/parachain/test-parachains/adder/Cargo.toml +++ b/parachain/test-parachains/adder/Cargo.toml @@ -13,7 +13,7 @@ tiny-keccak = "1.5.0" dlmalloc = { version = "0.1.3", features = [ "global" ] } # We need to make sure the global allocator is disabled until we have support of full substrate externalities -runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] } +runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 1d56b6924128..7d38a2e7a77f 100644 --- a/parachain/test-parachains/adder/collator/Cargo.toml +++ b/parachain/test-parachains/adder/collator/Cargo.toml @@ -9,9 +9,8 @@ adder = { package = "test-parachain-adder", path = ".." } parachain = { package = "polkadot-parachain", path = "../../.." } collator = { package = "polkadot-collator", path = "../../../../collator" } primitives = { package = "polkadot-primitives", path = "../../../../primitives" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "master" } -client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } parking_lot = "0.10.0" codec = { package = "parity-scale-codec", version = "1.2.0" } futures = "0.3.4" diff --git a/parachain/test-parachains/code-upgrader/Cargo.toml b/parachain/test-parachains/code-upgrader/Cargo.toml index c475334ecfd3..5e8cf3980593 100644 --- a/parachain/test-parachains/code-upgrader/Cargo.toml +++ b/parachain/test-parachains/code-upgrader/Cargo.toml @@ -13,7 +13,7 @@ tiny-keccak = "1.5.0" dlmalloc = { version = "0.1.3", features = [ "global" ] } # We need to make sure the global allocator is disabled until we have support of full substrate externalities -runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] } +runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 7a1e2eb0d786..da35c4ade48a 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,20 +7,20 @@ edition = "2018" [dependencies] serde = { version = "1.0.102", optional = true, features = ["derive"] } parity-scale-codec = { version = "1.3.0", default-features = false, features = ["bit-vec", "derive"] } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } polkadot-parachain = { path = "../parachain", default-features = false } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } [dev-dependencies] -sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } pretty_assertions = "0.5.1" [features] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 7e4d35cb9ace..ec287c6191fb 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -5,13 +5,14 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "master" } jsonrpc-core = "14.0.3" polkadot-primitives = { path = "../primitives" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" } -frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index 3b27b2543435..cc54917ffafe 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -23,6 +23,8 @@ use std::sync::Arc; use polkadot_primitives::{Block, AccountId, Nonce, Balance}; use sp_api::ProvideRuntimeApi; use txpool_api::TransactionPool; +use sp_blockchain::HeaderBackend; +use sc_client_api::light::{Fetcher, RemoteBlockchain}; /// A type representing all RPC extensions. pub type RpcExtension = jsonrpc_core::IoHandler; @@ -30,7 +32,7 @@ pub type RpcExtension = jsonrpc_core::IoHandler; /// Instantiate all RPC extensions. pub fn create_full(client: Arc, pool: Arc

) -> RpcExtension where C: ProvideRuntimeApi, - C: client::blockchain::HeaderBackend, + C: HeaderBackend, C: Send + Sync + 'static, C::Api: frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, @@ -53,18 +55,18 @@ pub fn create_full(client: Arc, pool: Arc

) -> RpcExtension where /// Instantiate all RPC extensions for light node. pub fn create_light( client: Arc, - remote_blockchain: Arc>, + remote_blockchain: Arc>, fetcher: Arc, pool: Arc

, ) -> RpcExtension where C: ProvideRuntimeApi, - C: client::blockchain::HeaderBackend, + C: HeaderBackend, C: Send + Sync + 'static, C::Api: frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, P: TransactionPool + Sync + Send + 'static, - F: client::light::fetcher::Fetcher + 'static, + F: Fetcher + 'static, UE: codec::Codec + Send + Sync + 'static, { use frame_rpc_system::{LightSystem, SystemApi}; diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 9da23b50ca88..4ead0ddf325f 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -12,37 +12,37 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.3.2", default-features = false, optional = true } [dev-dependencies] hex-literal = "0.2.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } trie-db = "0.20.0" serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 9818e00ed9e4..15f76928a2df 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -13,54 +13,54 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -69,8 +69,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index 484af1730e63..1a630882e24f 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -13,51 +13,51 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -66,8 +66,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index e37cb0b60f28..d6ce253229e5 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -13,39 +13,39 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -55,8 +55,8 @@ polkadot-parachain = { path = "../../parachain", default-features = false } hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/runtime/test-runtime/client/Cargo.toml b/runtime/test-runtime/client/Cargo.toml index b540adfb9b49..606071fd42dc 100644 --- a/runtime/test-runtime/client/Cargo.toml +++ b/runtime/test-runtime/client/Cargo.toml @@ -6,17 +6,17 @@ edition = "2018" license = "GPL-3.0" [dependencies] -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", features = ["test-helpers"], default-features = false } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } polkadot-test-runtime = { path = ".." } polkadot-runtime-common = { path = "../../common" } polkadot-primitives = { path = "../../../primitives" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } codec = { package = "parity-scale-codec", version = "1.0.0" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } futures = "0.3.1" diff --git a/runtime/test-runtime/client/src/lib.rs b/runtime/test-runtime/client/src/lib.rs index 1bb780f20bbe..99f06d60bec3 100644 --- a/runtime/test-runtime/client/src/lib.rs +++ b/runtime/test-runtime/client/src/lib.rs @@ -22,16 +22,18 @@ use std::sync::Arc; use std::collections::BTreeMap; pub use substrate_test_client::*; pub use polkadot_test_runtime as runtime; -pub use sc_client::LongestChain; use sp_core::{sr25519, ChangesTrieConfiguration, map, twox_128}; use sp_core::storage::{ChildInfo, Storage, StorageChild}; use polkadot_test_runtime::genesismap::GenesisConfig; use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Hash as HashT, HashFor}; -use sc_client::{ - light::fetcher::{ - RemoteCallRequest, RemoteBodyRequest, +use sc_client_api::{LongestChain, light::{RemoteCallRequest, RemoteBodyRequest}}; +use sc_service::client::{ + light::{ + call_executor::GenesisCallExecutor, backend as light_backend, + new_light_blockchain, new_light_backend, }, + genesis, Client as SubstrateClient, LocalCallExecutor }; /// A prelude to import in tests. @@ -57,7 +59,7 @@ sc_executor::native_executor_instance! { pub type Backend = substrate_test_client::Backend; /// Test client executor. -pub type Executor = sc_client::LocalCallExecutor< +pub type Executor = LocalCallExecutor< Backend, NativeExecutor, >; @@ -66,10 +68,10 @@ pub type Executor = sc_client::LocalCallExecutor< pub type LightBackend = substrate_test_client::LightBackend; /// Test client light executor. -pub type LightExecutor = sc_client::light::call_executor::GenesisCallExecutor< +pub type LightExecutor = GenesisCallExecutor< LightBackend, - sc_client::LocalCallExecutor< - sc_client::light::backend::Backend< + LocalCallExecutor< + light_backend::Backend< sc_client_db::light::LightStorage, HashFor >, @@ -120,7 +122,7 @@ impl substrate_test_client::GenesisInit for GenesisParameters { let state_root = <<::Header as HeaderT>::Hashing as HashT>::trie_root( storage.top.clone().into_iter().chain(child_roots).collect() ); - let block: runtime::Block = sc_client::genesis::construct_genesis_block(state_root); + let block: runtime::Block = genesis::construct_genesis_block(state_root); storage.top.extend(additional_storage_with_genesis(&block)); storage @@ -136,9 +138,9 @@ pub type TestClientBuilder = substrate_test_client::TestClientBuilder< >; /// Test client type with `LocalExecutor` and generic Backend. -pub type Client = sc_client::Client< +pub type Client = SubstrateClient< B, - sc_client::LocalCallExecutor>, + LocalCallExecutor>, polkadot_test_runtime::Block, polkadot_test_runtime::RuntimeApi, >; @@ -212,21 +214,21 @@ pub trait TestClientBuilderExt: Sized { } /// Build the test client and longest chain selector. - fn build_with_longest_chain(self) -> (Client, sc_client::LongestChain); + fn build_with_longest_chain(self) -> (Client, LongestChain); /// Build the test client and the backend. fn build_with_backend(self) -> (Client, Arc); } impl TestClientBuilderExt for TestClientBuilder< - sc_client::LocalCallExecutor>, + LocalCallExecutor>, Backend > { fn genesis_init_mut(&mut self) -> &mut GenesisParameters { Self::genesis_init_mut(self) } - fn build_with_longest_chain(self) -> (Client, sc_client::LongestChain) { + fn build_with_longest_chain(self) -> (Client, LongestChain) { self.build_with_native_executor(None) } @@ -277,15 +279,20 @@ pub fn new() -> Client { /// Creates new light client instance used for tests. pub fn new_light() -> ( - sc_client::Client, + SubstrateClient< + LightBackend, + LightExecutor, + polkadot_test_runtime::Block, + polkadot_test_runtime::RuntimeApi + >, Arc, ) { let storage = sc_client_db::light::LightStorage::new_test(); - let blockchain = Arc::new(sc_client::light::blockchain::Blockchain::new(storage)); - let backend = Arc::new(LightBackend::new(blockchain.clone())); + let blockchain =new_light_blockchain(storage); + let backend = new_light_backend(blockchain.clone()); let executor = new_native_executor(); - let local_call_executor = sc_client::LocalCallExecutor::new(backend.clone(), executor, sp_core::tasks::executor(),); + let local_call_executor = LocalCallExecutor::new(backend.clone(), executor, sp_core::tasks::executor(),); let call_executor = LightExecutor::new( backend.clone(), local_call_executor, diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index 9099b0dfda35..389dc4f0d9a0 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -13,55 +13,55 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -71,8 +71,8 @@ polkadot-parachain = { path = "../../parachain", default-features = false } hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/service/Cargo.toml b/service/Cargo.toml index 14fffc94f98d..c49d7684e199 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -20,45 +20,45 @@ kusama-runtime = { path = "../runtime/kusama" } westend-runtime = { path = "../runtime/westend" } polkadot-network = { path = "../network", optional = true } polkadot-rpc = { path = "../rpc" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } codec = { package = "parity-scale-codec", version = "1.3.0" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } [dev-dependencies] polkadot-test-runtime-client = { path = "../runtime/test-runtime/client" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } env_logger = "0.7.0" [features] diff --git a/service/src/chain_spec.rs b/service/src/chain_spec.rs index 8d8572e7e7e3..4daf3826c948 100644 --- a/service/src/chain_spec.rs +++ b/service/src/chain_spec.rs @@ -48,9 +48,9 @@ const DEFAULT_PROTOCOL_ID: &str = "dot"; #[serde(rename_all = "camelCase")] pub struct Extensions { /// Block numbers with known hashes. - pub fork_blocks: sc_client::ForkBlocks, + pub fork_blocks: sc_client_api::ForkBlocks, /// Known bad block hashes. - pub bad_blocks: sc_client::BadBlocks, + pub bad_blocks: sc_client_api::BadBlocks, } /// The `ChainSpec parametrised for polkadot runtime`. diff --git a/service/src/lib.rs b/service/src/lib.rs index f27f19e1c721..a2256a0554cf 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -19,7 +19,6 @@ pub mod chain_spec; mod grandpa_support; -use sc_client::LongestChain; use std::sync::Arc; use std::time::Duration; use polkadot_primitives::{parachain, Hash, BlockId, AccountId, Nonce, Balance}; @@ -27,7 +26,6 @@ use polkadot_primitives::{parachain, Hash, BlockId, AccountId, Nonce, Balance}; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; use service::{error::Error as ServiceError, ServiceBuilder}; use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider}; -use inherents::InherentDataProviders; use sc_executor::native_executor_instance; use log::info; pub use service::{ @@ -37,11 +35,10 @@ pub use service::{ }; pub use service::config::{DatabaseConfig, PrometheusConfig}; pub use sc_executor::NativeExecutionDispatch; -pub use sc_client::{ExecutionStrategy, CallExecutor, Client}; -pub use sc_client_api::backend::Backend; +pub use sc_client_api::{Backend, LongestChain, ExecutionStrategy, CallExecutor}; pub use sp_api::{Core as CoreApi, ConstructRuntimeApi, ProvideRuntimeApi, StateBackend}; pub use sp_runtime::traits::{HashFor, NumberFor}; -pub use consensus_common::SelectChain; +pub use consensus_common::{SelectChain, BlockImport, block_validation::Chain}; pub use polkadot_primitives::parachain::{CollatorId, ParachainHost}; pub use polkadot_primitives::Block; pub use sp_runtime::traits::{Block as BlockT, self as runtime_traits, BlakeTwo256}; @@ -76,7 +73,7 @@ native_executor_instance!( ); /// A set of APIs that polkadot-like runtimes must implement. -pub trait RuntimeApiCollection : +pub trait RuntimeApiCollection: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::ApiExt + babe_primitives::BabeApi @@ -156,7 +153,7 @@ macro_rules! new_full_start { Block, $runtime, $executor >($config)? .with_select_chain(|_, backend| { - Ok(sc_client::LongestChain::new(backend.clone())) + Ok(sc_client_api::LongestChain::new(backend.clone())) })? .with_transaction_pool(|config, client, _fetcher, prometheus_registry| { let pool_api = sc_transaction_pool::FullChainApi::new(client.clone()); @@ -209,6 +206,352 @@ macro_rules! new_full_start { }} } +/// Builds a new service for a full client. +#[macro_export] +macro_rules! new_full { + ( + $config:expr, + $collating_for:expr, + $max_block_data_size:expr, + $authority_discovery_enabled:expr, + $slot_duration:expr, + $grandpa_pause:expr, + $runtime:ty, + $dispatch:ty + ) => {{ + use sc_network::Event; + use sc_client_api::ExecutorProvider; + use futures::stream::StreamExt; + + let is_collator = $collating_for.is_some(); + let role = $config.role.clone(); + let is_authority = role.is_authority() && !is_collator; + let force_authoring = $config.force_authoring; + let max_block_data_size = $max_block_data_size; + let db_path = match $config.database.path() { + Some(path) => std::path::PathBuf::from(path), + None => return Err("Starting a Polkadot service with a custom database isn't supported".to_string().into()), + }; + let disable_grandpa = $config.disable_grandpa; + let name = $config.network.node_name.clone(); + let authority_discovery_enabled = $authority_discovery_enabled; + let slot_duration = $slot_duration; + + let (builder, mut import_setup, inherent_data_providers) = 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>; + Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _) + })? + .build()?; + + let (block_import, link_half, babe_link) = import_setup.take() + .expect("Link Half and Block Import are present for Full Services or setup failed before. qed"); + + let client = service.client(); + let known_oracle = client.clone(); + + let mut handles = FullNodeHandles::default(); + let select_chain = if let Some(select_chain) = service.select_chain() { + select_chain + } else { + info!("The node cannot start as an authority because it can't select chain."); + return Ok((service, handles)); + }; + let gossip_validator_select_chain = select_chain.clone(); + + let is_known = move |block_hash: &Hash| { + use consensus_common::BlockStatus; + + match known_oracle.block_status(&BlockId::hash(*block_hash)) { + Err(_) | Ok(BlockStatus::Unknown) | Ok(BlockStatus::Queued) => None, + Ok(BlockStatus::KnownBad) => Some(Known::Bad), + Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => { + match gossip_validator_select_chain.leaves() { + Err(_) => None, + Ok(leaves) => if leaves.contains(block_hash) { + Some(Known::Leaf) + } else { + Some(Known::Old) + }, + } + } + } + }; + + let polkadot_network_service = network_protocol::start( + service.network(), + network_protocol::Config { + collating_for: $collating_for, + }, + (is_known, client.clone()), + client.clone(), + service.spawn_task_handle(), + ).map_err(|e| format!("Could not spawn network worker: {:?}", e))?; + + let authority_handles = if is_collator || role.is_authority() { + let availability_store = { + use std::path::PathBuf; + + let mut path = PathBuf::from(db_path); + path.push("availability"); + + #[cfg(not(target_os = "unknown"))] + { + av_store::Store::new( + ::av_store::Config { + cache_size: None, + path, + }, + polkadot_network_service.clone(), + )? + } + + #[cfg(target_os = "unknown")] + av_store::Store::new_in_memory(gossip) + }; + + polkadot_network_service.register_availability_store(availability_store.clone()); + + let (validation_service_handle, validation_service) = consensus::ServiceBuilder { + client: client.clone(), + network: polkadot_network_service.clone(), + collators: polkadot_network_service.clone(), + spawner: service.spawn_task_handle(), + availability_store: availability_store.clone(), + select_chain: select_chain.clone(), + keystore: service.keystore(), + max_block_data_size, + }.build(); + + service.spawn_essential_task("validation-service", Box::pin(validation_service)); + + handles.validation_service_handle = Some(validation_service_handle.clone()); + + Some((validation_service_handle, availability_store)) + } else { + None + }; + + if role.is_authority() { + let (validation_service_handle, availability_store) = authority_handles + .clone() + .expect("Authority handles are set for authority nodes; qed"); + + let proposer = consensus::ProposerFactory::new( + client.clone(), + service.transaction_pool(), + validation_service_handle, + slot_duration, + backend, + ); + + let select_chain = service.select_chain().ok_or(ServiceError::SelectChainRequired)?; + let can_author_with = + consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone()); + + let block_import = availability_store.block_import( + block_import, + client.clone(), + service.spawn_task_handle(), + service.keystore(), + )?; + + let babe_config = babe::BabeParams { + keystore: service.keystore(), + client, + select_chain, + block_import, + env: proposer, + sync_oracle: service.network(), + inherent_data_providers: inherent_data_providers.clone(), + force_authoring, + babe_link, + can_author_with, + }; + + let babe = babe::start_babe(babe_config)?; + service.spawn_essential_task("babe", babe); + } + + if matches!(role, Role::Authority{..} | Role::Sentry{..}) { + if authority_discovery_enabled { + let (sentries, authority_discovery_role) = match role { + Role::Authority { ref sentry_nodes } => ( + sentry_nodes.clone(), + authority_discovery::Role::Authority ( + service.keystore(), + ), + ), + Role::Sentry {..} => ( + vec![], + authority_discovery::Role::Sentry, + ), + _ => unreachable!("Due to outer matches! constraint; qed."), + }; + + let network = service.network(); + let network_event_stream = network.event_stream("authority-discovery"); + let dht_event_stream = network_event_stream.filter_map(|e| async move { match e { + Event::Dht(e) => Some(e), + _ => None, + }}).boxed(); + let authority_discovery = authority_discovery::AuthorityDiscovery::new( + service.client(), + network, + sentries, + dht_event_stream, + authority_discovery_role, + service.prometheus_registry(), + ); + + service.spawn_task("authority-discovery", authority_discovery); + } + } + + // if the node isn't actively participating in consensus then it doesn't + // need a keystore, regardless of which protocol we use below. + let keystore = if is_authority { + Some(service.keystore()) + } else { + None + }; + + let config = grandpa::Config { + // FIXME substrate#1578 make this available through chainspec + gossip_duration: Duration::from_millis(1000), + justification_period: 512, + name: Some(name), + observer_enabled: false, + keystore, + is_authority: role.is_network_authority(), + }; + + let enable_grandpa = !disable_grandpa; + if enable_grandpa { + // start the full GRANDPA voter + // NOTE: unlike in substrate we are currently running the full + // GRANDPA voter protocol for all full nodes (regardless of whether + // they're validators or not). at this point the full voter should + // provide better guarantees of block and vote data availability than + // the observer. + + // add a custom voting rule to temporarily stop voting for new blocks + // after the given pause block is finalized and restarting after the + // given delay. + let voting_rule = match $grandpa_pause { + Some((block, delay)) => { + info!("GRANDPA scheduled voting pause set for block #{} with a duration of {} blocks.", + block, + delay, + ); + + grandpa::VotingRulesBuilder::default() + .add(grandpa_support::PauseAfterBlockFor(block, delay)) + .build() + }, + None => + grandpa::VotingRulesBuilder::default() + .build(), + }; + + let grandpa_config = grandpa::GrandpaParams { + config, + link: link_half, + network: service.network(), + inherent_data_providers: inherent_data_providers.clone(), + telemetry_on_connect: Some(service.telemetry_on_connect_stream()), + voting_rule, + prometheus_registry: service.prometheus_registry(), + }; + + service.spawn_essential_task( + "grandpa-voter", + grandpa::run_grandpa_voter(grandpa_config)? + ); + } else { + grandpa::setup_disabled_grandpa( + service.client(), + &inherent_data_providers, + service.network(), + )?; + } + + handles.polkadot_network = Some(polkadot_network_service); + (service, handles) + }} +} + +/// Builds a new service for a light client. +#[macro_export] +macro_rules! new_light { + ($config:expr, $runtime:ty, $dispatch:ty) => {{ + crate::set_prometheus_registry(&mut $config)?; + let inherent_data_providers = inherents::InherentDataProviders::new(); + + ServiceBuilder::new_light::($config)? + .with_select_chain(|_, backend| { + Ok(sc_client_api::LongestChain::new(backend.clone())) + })? + .with_transaction_pool(|config, client, fetcher, prometheus_registry| { + let fetcher = fetcher + .ok_or_else(|| "Trying to start light transaction pool without active fetcher")?; + let pool_api = sc_transaction_pool::LightChainApi::new(client.clone(), fetcher.clone()); + let pool = sc_transaction_pool::BasicPool::with_revalidation_type( + config, Arc::new(pool_api), prometheus_registry, sc_transaction_pool::RevalidationType::Light, + ); + Ok(pool) + })? + .with_import_queue_and_fprb(|_config, client, backend, fetcher, _select_chain, _| { + let fetch_checker = fetcher + .map(|fetcher| fetcher.checker().clone()) + .ok_or_else(|| "Trying to start light import queue without active fetch checker")?; + let grandpa_block_import = grandpa::light_block_import( + client.clone(), backend, &(client.clone() as Arc<_>), Arc::new(fetch_checker) + )?; + + let finality_proof_import = grandpa_block_import.clone(); + let finality_proof_request_builder = + finality_proof_import.create_finality_proof_request_builder(); + + let (babe_block_import, babe_link) = babe::block_import( + babe::Config::get_or_compute(&*client)?, + grandpa_block_import, + client.clone(), + )?; + + // FIXME: pruning task isn't started since light client doesn't do `AuthoritySetup`. + let import_queue = babe::import_queue( + babe_link, + babe_block_import, + None, + Some(Box::new(finality_proof_import)), + client, + inherent_data_providers.clone(), + )?; + + Ok((import_queue, finality_proof_request_builder)) + })? + .with_finality_proof_provider(|client, backend| { + let provider = client as Arc>; + Ok(Arc::new(grandpa::FinalityProofProvider::new(backend, provider)) as _) + })? + .with_rpc_extensions(|builder| + -> Result { + let fetcher = builder.fetcher() + .ok_or_else(|| "Trying to start node RPC without active fetcher")?; + let remote_blockchain = builder.remote_backend() + .ok_or_else(|| "Trying to start node RPC without active remote blockchain")?; + + Ok(polkadot_rpc::create_light(builder.client().clone(), remote_blockchain, fetcher, builder.pool())) + })? + .build() + }} +} + /// Builds a new object suitable for chain operations. pub fn new_chain_ops(mut config: Configuration) -> Result, ServiceError> @@ -227,7 +570,7 @@ where /// Create a new Polkadot service for a full node. #[cfg(feature = "full-node")] pub fn polkadot_new_full( - config: Configuration, + mut config: Configuration, collating_for: Option<(CollatorId, parachain::Id)>, max_block_data_size: Option, authority_discovery_enabled: bool, @@ -245,51 +588,57 @@ pub fn polkadot_new_full( FullNodeHandles, ), ServiceError> { - new_full( + let (service, handles) = new_full!( config, collating_for, max_block_data_size, authority_discovery_enabled, slot_duration, grandpa_pause, - ) + polkadot_runtime::RuntimeApi, + PolkadotExecutor + ); + + Ok((service, handles)) } /// Create a new Kusama service for a full node. #[cfg(feature = "full-node")] pub fn kusama_new_full( - config: Configuration, + mut config: Configuration, collating_for: Option<(CollatorId, parachain::Id)>, max_block_data_size: Option, authority_discovery_enabled: bool, slot_duration: u64, grandpa_pause: Option<(u32, u32)>, -) - -> Result<( - impl AbstractService< - Block = Block, - RuntimeApi = kusama_runtime::RuntimeApi, - Backend = TFullBackend, - SelectChain = LongestChain, Block>, - CallExecutor = TFullCallExecutor, - >, - FullNodeHandles, +) -> Result<( + impl AbstractService< + Block = Block, + RuntimeApi = kusama_runtime::RuntimeApi, + Backend = TFullBackend, + SelectChain = LongestChain, Block>, + CallExecutor = TFullCallExecutor, + >, FullNodeHandles ), ServiceError> { - new_full( + let (service, handles) = new_full!( config, collating_for, max_block_data_size, authority_discovery_enabled, slot_duration, grandpa_pause, - ) + kusama_runtime::RuntimeApi, + KusamaExecutor + ); + + Ok((service, handles)) } /// Create a new Kusama service for a full node. #[cfg(feature = "full-node")] pub fn westend_new_full( - config: Configuration, + mut config: Configuration, collating_for: Option<(CollatorId, parachain::Id)>, max_block_data_size: Option, authority_discovery_enabled: bool, @@ -307,14 +656,18 @@ pub fn westend_new_full( FullNodeHandles, ), ServiceError> { - new_full( + let (service, handles) = new_full!( config, collating_for, max_block_data_size, authority_discovery_enabled, slot_duration, grandpa_pause, - ) + westend_runtime::RuntimeApi, + KusamaExecutor + ); + + Ok((service, handles)) } /// Handles to other sub-services that full nodes instantiate, which consumers @@ -328,305 +681,9 @@ pub struct FullNodeHandles { pub validation_service_handle: Option, } -/// Builds a new service for a full client. -#[cfg(feature = "full-node")] -pub fn new_full( - mut config: Configuration, - collating_for: Option<(CollatorId, parachain::Id)>, - max_block_data_size: Option, - authority_discovery_enabled: bool, - slot_duration: u64, - grandpa_pause: Option<(u32, u32)>, -) - -> Result<( - impl AbstractService< - Block = Block, - RuntimeApi = Runtime, - Backend = TFullBackend, - SelectChain = LongestChain, Block>, - CallExecutor = TFullCallExecutor, - >, - FullNodeHandles, - ), ServiceError> - where - Runtime: ConstructRuntimeApi> + Send + Sync + 'static, - Runtime::RuntimeApi: - RuntimeApiCollection, Block>>, - Dispatch: NativeExecutionDispatch + 'static, - Extrinsic: RuntimeExtrinsic, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - >::StateBackend: sp_api::StateBackend, -{ - use sc_network::Event; - use sc_client_api::ExecutorProvider; - use futures::stream::StreamExt; - - let is_collator = collating_for.is_some(); - let role = config.role.clone(); - let is_authority = role.is_authority() && !is_collator; - let force_authoring = config.force_authoring; - let max_block_data_size = max_block_data_size; - let db_path = match config.database.path() { - Some(path) => std::path::PathBuf::from(path), - None => return Err("Starting a Polkadot service with a custom database isn't supported".to_string().into()), - }; - let disable_grandpa = config.disable_grandpa; - let name = config.network.node_name.clone(); - let authority_discovery_enabled = authority_discovery_enabled; - let slot_duration = slot_duration; - - let (builder, mut import_setup, inherent_data_providers) = 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>; - Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _) - })? - .build()?; - - let (block_import, link_half, babe_link) = import_setup.take() - .expect("Link Half and Block Import are present for Full Services or setup failed before. qed"); - - let client = service.client(); - let known_oracle = client.clone(); - - let mut handles = FullNodeHandles::default(); - let select_chain = if let Some(select_chain) = service.select_chain() { - select_chain - } else { - info!("The node cannot start as an authority because it can't select chain."); - return Ok((service, handles)); - }; - let gossip_validator_select_chain = select_chain.clone(); - - let is_known = move |block_hash: &Hash| { - use consensus_common::BlockStatus; - - match known_oracle.block_status(&BlockId::hash(*block_hash)) { - Err(_) | Ok(BlockStatus::Unknown) | Ok(BlockStatus::Queued) => None, - Ok(BlockStatus::KnownBad) => Some(Known::Bad), - Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => { - match gossip_validator_select_chain.leaves() { - Err(_) => None, - Ok(leaves) => if leaves.contains(block_hash) { - Some(Known::Leaf) - } else { - Some(Known::Old) - }, - } - } - } - }; - - let polkadot_network_service = network_protocol::start( - service.network(), - network_protocol::Config { - collating_for, - }, - (is_known, client.clone()), - client.clone(), - service.spawn_task_handle(), - ).map_err(|e| format!("Could not spawn network worker: {:?}", e))?; - - let authority_handles = if is_collator || role.is_authority() { - let availability_store = { - use std::path::PathBuf; - - let mut path = PathBuf::from(db_path); - path.push("availability"); - - #[cfg(not(target_os = "unknown"))] - { - av_store::Store::new( - ::av_store::Config { - cache_size: None, - path, - }, - polkadot_network_service.clone(), - )? - } - - #[cfg(target_os = "unknown")] - av_store::Store::new_in_memory(gossip) - }; - - polkadot_network_service.register_availability_store(availability_store.clone()); - - let (validation_service_handle, validation_service) = consensus::ServiceBuilder { - client: client.clone(), - network: polkadot_network_service.clone(), - collators: polkadot_network_service.clone(), - spawner: service.spawn_task_handle(), - availability_store: availability_store.clone(), - select_chain: select_chain.clone(), - keystore: service.keystore(), - max_block_data_size, - }.build(); - - service.spawn_essential_task("validation-service", Box::pin(validation_service)); - - handles.validation_service_handle = Some(validation_service_handle.clone()); - - Some((validation_service_handle, availability_store)) - } else { - None - }; - - if role.is_authority() { - let (validation_service_handle, availability_store) = authority_handles - .clone() - .expect("Authority handles are set for authority nodes; qed"); - - let proposer = consensus::ProposerFactory::new( - client.clone(), - service.transaction_pool(), - validation_service_handle, - slot_duration, - backend, - ); - - let select_chain = service.select_chain().ok_or(ServiceError::SelectChainRequired)?; - let can_author_with = - consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone()); - - let block_import = availability_store.block_import( - block_import, - client.clone(), - service.spawn_task_handle(), - service.keystore(), - )?; - - let babe_config = babe::BabeParams { - keystore: service.keystore(), - client, - select_chain, - block_import, - env: proposer, - sync_oracle: service.network(), - inherent_data_providers: inherent_data_providers.clone(), - force_authoring, - babe_link, - can_author_with, - }; - - let babe = babe::start_babe(babe_config)?; - service.spawn_essential_task("babe", babe); - } - - if matches!(role, Role::Authority{..} | Role::Sentry{..}) { - if authority_discovery_enabled { - let (sentries, authority_discovery_role) = match role { - Role::Authority { ref sentry_nodes } => ( - sentry_nodes.clone(), - authority_discovery::Role::Authority ( - service.keystore(), - ), - ), - Role::Sentry {..} => ( - vec![], - authority_discovery::Role::Sentry, - ), - _ => unreachable!("Due to outer matches! constraint; qed."), - }; - - let network = service.network(); - let network_event_stream = network.event_stream("authority-discovery"); - let dht_event_stream = network_event_stream.filter_map(|e| async move { match e { - Event::Dht(e) => Some(e), - _ => None, - }}).boxed(); - let authority_discovery = authority_discovery::AuthorityDiscovery::new( - service.client(), - network, - sentries, - dht_event_stream, - authority_discovery_role, - service.prometheus_registry(), - ); - - service.spawn_task("authority-discovery", authority_discovery); - } - } - - // if the node isn't actively participating in consensus then it doesn't - // need a keystore, regardless of which protocol we use below. - let keystore = if is_authority { - Some(service.keystore()) - } else { - None - }; - - let config = grandpa::Config { - // FIXME substrate#1578 make this available through chainspec - gossip_duration: Duration::from_millis(1000), - justification_period: 512, - name: Some(name), - observer_enabled: false, - keystore, - is_authority: role.is_network_authority(), - }; - - let enable_grandpa = !disable_grandpa; - if enable_grandpa { - // start the full GRANDPA voter - // NOTE: unlike in substrate we are currently running the full - // GRANDPA voter protocol for all full nodes (regardless of whether - // they're validators or not). at this point the full voter should - // provide better guarantees of block and vote data availability than - // the observer. - - // add a custom voting rule to temporarily stop voting for new blocks - // after the given pause block is finalized and restarting after the - // given delay. - let voting_rule = match grandpa_pause { - Some((block, delay)) => { - info!("GRANDPA scheduled voting pause set for block #{} with a duration of {} blocks.", - block, - delay, - ); - - grandpa::VotingRulesBuilder::default() - .add(grandpa_support::PauseAfterBlockFor(block, delay)) - .build() - }, - None => - grandpa::VotingRulesBuilder::default() - .build(), - }; - - let grandpa_config = grandpa::GrandpaParams { - config, - link: link_half, - network: service.network(), - inherent_data_providers: inherent_data_providers.clone(), - telemetry_on_connect: Some(service.telemetry_on_connect_stream()), - voting_rule, - prometheus_registry: service.prometheus_registry(), - }; - - service.spawn_essential_task( - "grandpa-voter", - grandpa::run_grandpa_voter(grandpa_config)? - ); - } else { - grandpa::setup_disabled_grandpa( - service.client(), - &inherent_data_providers, - service.network(), - )?; - } - - handles.polkadot_network = Some(polkadot_network_service); - Ok((service, handles)) -} - /// Create a new Polkadot service for a light client. -pub fn polkadot_new_light( - config: Configuration, -) - -> Result Result< + impl AbstractService< Block = Block, RuntimeApi = polkadot_runtime::RuntimeApi, Backend = TLightBackend, @@ -634,14 +691,12 @@ pub fn polkadot_new_light( CallExecutor = TLightCallExecutor, >, ServiceError> { - new_light(config) + new_light!(config, polkadot_runtime::RuntimeApi, PolkadotExecutor) } /// Create a new Kusama service for a light client. -pub fn kusama_new_light( - config: Configuration, -) - -> Result Result< + impl AbstractService< Block = Block, RuntimeApi = kusama_runtime::RuntimeApi, Backend = TLightBackend, @@ -649,125 +704,19 @@ pub fn kusama_new_light( CallExecutor = TLightCallExecutor, >, ServiceError> { - new_light(config) + new_light!(config, kusama_runtime::RuntimeApi, KusamaExecutor) } /// Create a new Westend service for a light client. -pub fn westend_new_light( - config: Configuration, -) - -> Result Result< + impl AbstractService< Block = Block, RuntimeApi = westend_runtime::RuntimeApi, Backend = TLightBackend, SelectChain = LongestChain, Block>, - CallExecutor = TLightCallExecutor, - >, ServiceError> -{ - new_light(config) -} - -// We can't use service::TLightClient due to -// Rust bug: https://github.com/rust-lang/rust/issues/43580 -type TLocalLightClient = Client< - sc_client::light::backend::Backend, BlakeTwo256>, - sc_client::light::call_executor::GenesisCallExecutor< - sc_client::light::backend::Backend, BlakeTwo256>, - sc_client::LocalCallExecutor< - sc_client::light::backend::Backend< - sc_client_db::light::LightStorage, - BlakeTwo256 - >, - sc_executor::NativeExecutor - > - >, - Block, - Runtime ->; - -/// Builds a new service for a light client. -pub fn new_light( - mut config: Configuration, -) - -> Result, - SelectChain = LongestChain, Block>, - CallExecutor = TLightCallExecutor, - >, ServiceError> -where - Runtime: Send + Sync + 'static, - Runtime::RuntimeApi: RuntimeApiCollection< - Extrinsic, - StateBackend = sc_client_api::StateBackendFor, Block> - >, - Dispatch: NativeExecutionDispatch + 'static, - Extrinsic: RuntimeExtrinsic, - Runtime: sp_api::ConstructRuntimeApi< - Block, - TLocalLightClient, + CallExecutor = TLightCallExecutor >, + ServiceError> { - set_prometheus_registry(&mut config)?; - - let inherent_data_providers = InherentDataProviders::new(); - - ServiceBuilder::new_light::(config)? - .with_select_chain(|_, backend| { - Ok(LongestChain::new(backend.clone())) - })? - .with_transaction_pool(|config, client, fetcher, prometheus_registry| { - let fetcher = fetcher - .ok_or_else(|| "Trying to start light transaction pool without active fetcher")?; - let pool_api = sc_transaction_pool::LightChainApi::new(client.clone(), fetcher.clone()); - let pool = sc_transaction_pool::BasicPool::with_revalidation_type( - config, Arc::new(pool_api), prometheus_registry, sc_transaction_pool::RevalidationType::Light, - ); - Ok(pool) - })? - .with_import_queue_and_fprb(|_config, client, backend, fetcher, _select_chain, _| { - let fetch_checker = fetcher - .map(|fetcher| fetcher.checker().clone()) - .ok_or_else(|| "Trying to start light import queue without active fetch checker")?; - let grandpa_block_import = grandpa::light_block_import( - client.clone(), backend, &(client.clone() as Arc<_>), Arc::new(fetch_checker) - )?; - - let finality_proof_import = grandpa_block_import.clone(); - let finality_proof_request_builder = - finality_proof_import.create_finality_proof_request_builder(); - - let (babe_block_import, babe_link) = babe::block_import( - babe::Config::get_or_compute(&*client)?, - grandpa_block_import, - client.clone(), - )?; - - // FIXME: pruning task isn't started since light client doesn't do `AuthoritySetup`. - let import_queue = babe::import_queue( - babe_link, - babe_block_import, - None, - Some(Box::new(finality_proof_import)), - client, - inherent_data_providers.clone(), - )?; - - Ok((import_queue, finality_proof_request_builder)) - })? - .with_finality_proof_provider(|client, backend| { - let provider = client as Arc>; - Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _) - })? - .with_rpc_extensions(|builder| - -> Result { - let fetcher = builder.fetcher() - .ok_or_else(|| "Trying to start node RPC without active fetcher")?; - let remote_blockchain = builder.remote_backend() - .ok_or_else(|| "Trying to start node RPC without active remote blockchain")?; - - Ok(polkadot_rpc::create_light(builder.client().clone(), remote_blockchain, fetcher, builder.pool())) - })? - .build() + new_light!(config, westend_runtime::RuntimeApi, KusamaExecutor) } diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index d20cd4e6fb18..25e43b82d61f 100644 --- a/statement-table/Cargo.toml +++ b/statement-table/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } primitives = { package = "polkadot-primitives", path = "../primitives" } diff --git a/validation/Cargo.toml b/validation/Cargo.toml index d3304f21a9d3..e3449292de74 100644 --- a/validation/Cargo.toml +++ b/validation/Cargo.toml @@ -18,22 +18,22 @@ parachain = { package = "polkadot-parachain", path = "../parachain" } polkadot-primitives = { path = "../primitives" } polkadot-erasure-coding = { path = "../erasure-coding" } table = { package = "polkadot-statement-table", path = "../statement-table" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" } -consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } -block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "master" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } 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" } +runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } From cdc486b94712381b258a4788ba676d840bcfe8e3 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Fri, 24 Apr 2020 23:48:18 +0200 Subject: [PATCH 03/13] fix missing reference --- collator/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/collator/src/lib.rs b/collator/src/lib.rs index b523a491c5fd..5d905ad659bc 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -425,9 +425,9 @@ mod tests { impl BuildParachainContext for BuildDummyParachainContext { type ParachainContext = DummyParachainContext; - fn build( + fn build( self, - _: Arc>, + _: Arc, _: SP, _: impl Network + Clone + 'static, ) -> Result { From 0754148af12a1af09a624794505f2e8c2de778d1 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Sat, 25 Apr 2020 13:07:35 +0200 Subject: [PATCH 04/13] Make collator builder more generic --- Cargo.lock | 1 + cli/src/command.rs | 6 +-- collator/Cargo.toml | 1 + collator/src/lib.rs | 98 ++++++++++++++++++++++----------------------- service/src/lib.rs | 66 +++++++++++++++--------------- 5 files changed, 88 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 59c3412524e1..bc4e876a67dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4092,6 +4092,7 @@ dependencies = [ "polkadot-validation", "sc-cli", "sc-client-api", + "sc-executor", "sc-network", "sc-service", "sp-api", diff --git a/cli/src/command.rs b/cli/src/command.rs index 4775fc2178af..5101a3c9aaab 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -93,7 +93,7 @@ pub fn run() -> Result<()> { authority_discovery_enabled, 6000, grandpa_pause - ).map(|(s, _)| s) + ).map(|(s, _, _)| s) }, service::KusamaExecutor::native_version().runtime_version ) @@ -110,7 +110,7 @@ pub fn run() -> Result<()> { authority_discovery_enabled, 6000, grandpa_pause - ).map(|(s, _)| s) + ).map(|(s, _, _)| s) }, service::WestendExecutor::native_version().runtime_version ) @@ -127,7 +127,7 @@ pub fn run() -> Result<()> { authority_discovery_enabled, 6000, grandpa_pause - ).map(|(s, _)| s) + ).map(|(s, _, _)| s) }, service::PolkadotExecutor::native_version().runtime_version ) diff --git a/collator/Cargo.toml b/collator/Cargo.toml index 429dc0a90447..3f54f2200f7b 100644 --- a/collator/Cargo.toml +++ b/collator/Cargo.toml @@ -8,6 +8,7 @@ edition = "2018" [dependencies] futures = "0.3.4" sc-service = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } sc-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } diff --git a/collator/src/lib.rs b/collator/src/lib.rs index 5d905ad659bc..39975ca21ae6 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -52,9 +52,8 @@ use std::pin::Pin; use futures::{future, Future, Stream, FutureExt, TryFutureExt, StreamExt, task::Spawn}; use log::warn; -use sc_client_api::{BlockchainEvents, StateBackend}; +use sc_client_api::StateBackend; use sp_core::Pair; -use sp_runtime::traits::BlakeTwo256; use polkadot_primitives::{ BlockId, Hash, Block, parachain::{ @@ -201,44 +200,41 @@ pub async fn collate

( Ok(collation) } -fn build_collator_service( - service: (Service, polkadot_service::FullNodeHandles), + + +fn build_collator_service( + spawner: SP, + handles: polkadot_service::FullNodeHandles, + client: Arc, para_id: ParaId, key: Arc, build_parachain_context: P, -) -> Result +) -> Result + Send + 'static, polkadot_service::Error> where - Service: AbstractService, - Service::Client: ClientProvider< + C: 'static + ClientProvider< service::Block, - Service::Backend, - Service::CallExecutor, - Service::RuntimeApi - >, - Service::RuntimeApi: ConstructRuntimeApi, - >::RuntimeApi: - RuntimeApiCollection< - Extrinsic, - Error = sp_blockchain::Error, - StateBackend = sc_client_api::StateBackendFor + service::TFullBackend, + service::TFullCallExecutor, + R >, - // // Rust bug: https://github.com/rust-lang/rust/issues/24159 - Service::Backend: service::Backend, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - >::State: - sp_api::StateBackend, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - Service::CallExecutor: service::CallExecutor, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - Service::SelectChain: service::SelectChain, + R: ConstructRuntimeApi + Sync + Send, + >::RuntimeApi: + sp_api::ApiExt< + service::Block, + StateBackend = as service::Backend>::State, + > + +RuntimeApiCollection< + Extrinsic, + StateBackend = as service::Backend>::State, + > + + Sync + Send, + E: 'static + sc_executor::NativeExecutionDispatch, P: BuildParachainContext, P::ParachainContext: Send + 'static, ::ProduceCandidate: Send, Extrinsic: service::Codec + Send + Sync + 'static, + SP: Spawn + Clone + Send + Sync + 'static, { - let (service, handles) = service; - let spawner = service.spawn_task_handle(); - let polkadot_network = handles.polkadot_network .ok_or_else(|| "Collator cannot run when Polkadot-specific networking has not been started")?; @@ -248,8 +244,6 @@ fn build_collator_service( handles.validation_service_handle .ok_or_else(|| "Collator cannot run when validation networking has not been started")?; - let client = service.client(); - let parachain_context = match build_parachain_context.build( client.clone(), spawner, @@ -332,9 +326,7 @@ fn build_collator_service( } }.boxed(); - service.spawn_essential_task("collation", work); - - Ok(service) + Ok(work) } /// Async function that will run the collator node with the given `RelayChainContext` and `ParachainContext` @@ -346,7 +338,7 @@ pub async fn start_collator

( config: Configuration, ) -> Result<(), polkadot_service::Error> where - P: BuildParachainContext, + P: 'static + BuildParachainContext, P::ParachainContext: Send + 'static, ::ProduceCandidate: Send, { @@ -355,20 +347,28 @@ where (_, Role::Light) => return Err( polkadot_service::Error::Other("light nodes are unsupported as collator".into()) ).into(), - (true, _) => - build_collator_service( - service::kusama_new_full( - config, - Some((key.public(), para_id)), - None, - false, - 6000, - None - )?, - para_id, - key, - build_parachain_context, - )?.await, + (true, _) => { + let (service, client, handlers) = service::kusama_new_full( + config, + Some((key.public(), para_id)), + None, + false, + 6000, + None + )?; + let spawn_handle = service.spawn_task_handle(); + let work_task = build_collator_service( + spawn_handle, + handlers, + client, + para_id, + key, + build_parachain_context + )?; + + service.spawn_essential_task("collation", work_task); + Ok(()) + }, (false, _) => Ok(()) // build_collator_service( // service::polkadot_new_full( diff --git a/service/src/lib.rs b/service/src/lib.rs index a2256a0554cf..40bc3329a5e4 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -31,7 +31,7 @@ use log::info; pub use service::{ AbstractService, Role, PruningMode, TransactionPoolOptions, Error, RuntimeGenesis, TFullClient, TLightClient, TFullBackend, TLightBackend, TFullCallExecutor, TLightCallExecutor, - Configuration, ChainSpec, ServiceBuilderCommand, + Configuration, ChainSpec, ServiceBuilderCommand, ClientProvider, }; pub use service::config::{DatabaseConfig, PrometheusConfig}; pub use sc_executor::NativeExecutionDispatch; @@ -259,7 +259,7 @@ macro_rules! new_full { select_chain } else { info!("The node cannot start as an authority because it can't select chain."); - return Ok((service, handles)); + return Ok((service, client, handles)); }; let gossip_validator_select_chain = select_chain.clone(); @@ -362,7 +362,7 @@ macro_rules! new_full { let babe_config = babe::BabeParams { keystore: service.keystore(), - client, + client: client.clone(), select_chain, block_import, env: proposer, @@ -474,14 +474,14 @@ macro_rules! new_full { ); } else { grandpa::setup_disabled_grandpa( - service.client(), + client.clone(), &inherent_data_providers, service.network(), )?; } handles.polkadot_network = Some(polkadot_network_service); - (service, handles) + (service, client, handles) }} } @@ -578,17 +578,17 @@ pub fn polkadot_new_full( grandpa_pause: Option<(u32, u32)>, ) -> Result<( - impl AbstractService< - Block = Block, - RuntimeApi = polkadot_runtime::RuntimeApi, - Backend = TFullBackend, - SelectChain = LongestChain, Block>, - CallExecutor = TFullCallExecutor, - >, + impl AbstractService, + Arc, + TFullCallExecutor, + polkadot_runtime::RuntimeApi + >>, FullNodeHandles, ), ServiceError> { - let (service, handles) = new_full!( + let (service, client, handles) = new_full!( config, collating_for, max_block_data_size, @@ -599,7 +599,7 @@ pub fn polkadot_new_full( PolkadotExecutor ); - Ok((service, handles)) + Ok((service, client, handles)) } /// Create a new Kusama service for a full node. @@ -612,16 +612,18 @@ pub fn kusama_new_full( slot_duration: u64, grandpa_pause: Option<(u32, u32)>, ) -> Result<( - impl AbstractService< - Block = Block, - RuntimeApi = kusama_runtime::RuntimeApi, - Backend = TFullBackend, - SelectChain = LongestChain, Block>, - CallExecutor = TFullCallExecutor, - >, FullNodeHandles + impl AbstractService, + Arc, + TFullCallExecutor, + kusama_runtime::RuntimeApi + > + >, + FullNodeHandles ), ServiceError> { - let (service, handles) = new_full!( + let (service, client, handles) = new_full!( config, collating_for, max_block_data_size, @@ -632,7 +634,7 @@ pub fn kusama_new_full( KusamaExecutor ); - Ok((service, handles)) + Ok((service, client, handles)) } /// Create a new Kusama service for a full node. @@ -646,17 +648,17 @@ pub fn westend_new_full( grandpa_pause: Option<(u32, u32)>, ) -> Result<( - impl AbstractService< - Block = Block, - RuntimeApi = westend_runtime::RuntimeApi, - Backend = TFullBackend, - SelectChain = LongestChain, Block>, - CallExecutor = TFullCallExecutor, - >, + impl AbstractService, + Arc, + TFullCallExecutor, + westend_runtime::RuntimeApi + >>, FullNodeHandles, ), ServiceError> { - let (service, handles) = new_full!( + let (service, client, handles) = new_full!( config, collating_for, max_block_data_size, @@ -667,7 +669,7 @@ pub fn westend_new_full( KusamaExecutor ); - Ok((service, handles)) + Ok((service, client, handles)) } /// Handles to other sub-services that full nodes instantiate, which consumers From ed7712000d4e40ca05d83426ec9eb7e4387f6971 Mon Sep 17 00:00:00 2001 From: Seun Date: Sun, 26 Apr 2020 15:43:17 +0100 Subject: [PATCH 05/13] all clear --- collator/src/lib.rs | 10 +++++----- parachain/test-parachains/adder/collator/src/main.rs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/collator/src/lib.rs b/collator/src/lib.rs index 39975ca21ae6..297dfb47f515 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -211,24 +211,24 @@ fn build_collator_service( build_parachain_context: P, ) -> Result + Send + 'static, polkadot_service::Error> where - C: 'static + ClientProvider< + C: ClientProvider< service::Block, service::TFullBackend, service::TFullCallExecutor, R - >, + > + 'static, R: ConstructRuntimeApi + Sync + Send, >::RuntimeApi: sp_api::ApiExt< service::Block, StateBackend = as service::Backend>::State, - > - +RuntimeApiCollection< + > + + RuntimeApiCollection< Extrinsic, StateBackend = as service::Backend>::State, > + Sync + Send, - E: 'static + sc_executor::NativeExecutionDispatch, + E: sc_executor::NativeExecutionDispatch + 'static, P: BuildParachainContext, P::ParachainContext: Send + 'static, ::ProduceCandidate: Send, diff --git a/parachain/test-parachains/adder/collator/src/main.rs b/parachain/test-parachains/adder/collator/src/main.rs index cc61dc2695e2..5ecf063dda85 100644 --- a/parachain/test-parachains/adder/collator/src/main.rs +++ b/parachain/test-parachains/adder/collator/src/main.rs @@ -101,9 +101,9 @@ impl ParachainContext for AdderContext { impl BuildParachainContext for AdderContext { type ParachainContext = Self; - fn build( + fn build( self, - _: Arc>, + _: Arc, _: SP, network: impl Network + Clone + 'static, ) -> Result { From 4a1e50511535aff4db4d451121e562df9d89cb02 Mon Sep 17 00:00:00 2001 From: Seun Date: Sun, 26 Apr 2020 15:54:41 +0100 Subject: [PATCH 06/13] revert start colator fn --- collator/src/lib.rs | 54 +++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/collator/src/lib.rs b/collator/src/lib.rs index 297dfb47f515..15a8cae066cc 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -344,7 +344,7 @@ where { let is_kusama = config.chain_spec.is_kusama(); match (is_kusama, &config.role) { - (_, Role::Light) => return Err( + (_, Role::Light) => Err( polkadot_service::Error::Other("light nodes are unsupported as collator".into()) ).into(), (true, _) => { @@ -357,32 +357,34 @@ where None )?; let spawn_handle = service.spawn_task_handle(); - let work_task = build_collator_service( - spawn_handle, - handlers, - client, - para_id, - key, - build_parachain_context - )?; - - service.spawn_essential_task("collation", work_task); - Ok(()) + build_collator_service( + spawn_handle, + handlers, + client, + para_id, + key, + build_parachain_context + )?.await }, - (false, _) => Ok(()) - // build_collator_service( - // service::polkadot_new_full( - // config, - // Some((key.public(), para_id)), - // None, - // false, - // 6000, - // None - // )?, - // para_id, - // key, - // build_parachain_context, - // )?.await, + (false, _) => { + let (service, client, handles) = service::polkadot_new_full( + config, + Some((key.public(), para_id)), + None, + false, + 6000, + None + )?; + let spawn_handle = service.spawn_task_handle(); + build_collator_service( + spawn_handle, + handles, + client, + para_id, + key, + build_parachain_context, + )?.await + } } } From dd1e21cb27e531d18ea48212fb2c5e0b0fe20e68 Mon Sep 17 00:00:00 2001 From: Seun Date: Sun, 26 Apr 2020 16:53:08 +0100 Subject: [PATCH 07/13] fix return type of start_collator --- collator/src/lib.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/collator/src/lib.rs b/collator/src/lib.rs index 15a8cae066cc..53a63ed71de1 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -364,7 +364,8 @@ where para_id, key, build_parachain_context - )?.await + )?.await; + Ok(()) }, (false, _) => { let (service, client, handles) = service::polkadot_new_full( @@ -383,7 +384,8 @@ where para_id, key, build_parachain_context, - )?.await + )?.await; + Ok(()) } } } From 0915761163487e0ccceeda444b4e59bb16cfa6d6 Mon Sep 17 00:00:00 2001 From: Seun Date: Mon, 27 Apr 2020 14:45:46 +0100 Subject: [PATCH 08/13] sc-consensus --- Cargo.lock | 266 ++++++++++++++++++++++++--------------------- service/Cargo.toml | 1 + service/src/lib.rs | 7 +- 3 files changed, 146 insertions(+), 128 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc4e876a67dc..5e0001656e6e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1227,7 +1227,7 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "fork-tree" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", ] @@ -1235,7 +1235,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -1252,7 +1252,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1270,7 +1270,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -1285,7 +1285,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "serde", @@ -1296,7 +1296,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "bitmask", "frame-metadata", @@ -1320,7 +1320,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.10", @@ -1331,7 +1331,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1343,7 +1343,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", @@ -1353,7 +1353,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1369,7 +1369,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "sp-api", @@ -3251,7 +3251,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3269,7 +3269,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3286,7 +3286,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3307,7 +3307,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-benchmarking", "frame-support", @@ -3322,7 +3322,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-benchmarking", "frame-support", @@ -3338,7 +3338,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-benchmarking", "frame-support", @@ -3353,7 +3353,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3367,7 +3367,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3383,7 +3383,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3401,7 +3401,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3417,7 +3417,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3436,7 +3436,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3452,7 +3452,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3466,7 +3466,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3480,7 +3480,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3495,7 +3495,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3508,7 +3508,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "enumflags2", "frame-support", @@ -3523,7 +3523,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-benchmarking", "frame-support", @@ -3538,7 +3538,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3556,7 +3556,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3571,7 +3571,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3592,7 +3592,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", @@ -3603,7 +3603,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3617,7 +3617,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-benchmarking", "frame-support", @@ -3634,7 +3634,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3647,7 +3647,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3665,7 +3665,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "parity-scale-codec", @@ -3678,7 +3678,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3692,7 +3692,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-support", "frame-system", @@ -3707,7 +3707,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "enumflags2", "frame-support", @@ -4358,6 +4358,7 @@ dependencies = [ "sc-chain-spec", "sc-client-api", "sc-client-db", + "sc-consensus", "sc-consensus-babe", "sc-executor", "sc-finality-grandpa", @@ -5217,7 +5218,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "bytes 0.5.4", "derive_more 0.99.5", @@ -5244,7 +5245,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5260,7 +5261,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5276,7 +5277,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", @@ -5287,7 +5288,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "ansi_term 0.12.1", "app_dirs", @@ -5329,7 +5330,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "fnv", @@ -5364,7 +5365,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "blake2-rfc", "hash-db", @@ -5390,10 +5391,21 @@ dependencies = [ "substrate-prometheus-endpoint", ] +[[package]] +name = "sc-consensus" +version = "0.8.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" +dependencies = [ + "sc-client-api", + "sp-blockchain", + "sp-consensus", + "sp-runtime", +] + [[package]] name = "sc-consensus-babe" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "fork-tree", @@ -5434,7 +5446,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5447,7 +5459,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5468,7 +5480,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "log 0.4.8", "sc-client-api", @@ -5482,7 +5494,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "lazy_static", @@ -5510,7 +5522,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -5527,7 +5539,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5542,7 +5554,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -5563,7 +5575,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "assert_matches", "finality-grandpa", @@ -5577,6 +5589,7 @@ dependencies = [ "rand 0.7.3", "sc-block-builder", "sc-client-api", + "sc-consensus", "sc-keystore", "sc-network", "sc-network-gossip", @@ -5598,7 +5611,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "ansi_term 0.12.1", "futures 0.3.4", @@ -5615,7 +5628,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "hex", @@ -5630,7 +5643,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "bitflags", "bytes 0.5.4", @@ -5681,7 +5694,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5697,7 +5710,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "env_logger 0.7.1", "futures 0.3.4", @@ -5708,6 +5721,7 @@ dependencies = [ "rand 0.7.3", "sc-block-builder", "sc-client-api", + "sc-consensus", "sc-network", "sc-service", "sp-blockchain", @@ -5723,7 +5737,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "bytes 0.5.4", "fnv", @@ -5750,7 +5764,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "futures 0.3.4", "libp2p", @@ -5763,7 +5777,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "futures 0.3.4", "hash-db", @@ -5795,7 +5809,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -5819,7 +5833,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -5834,7 +5848,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "exit-future", @@ -5892,7 +5906,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5906,7 +5920,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "bytes 0.5.4", "futures 0.3.4", @@ -5928,7 +5942,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "erased-serde", "log 0.4.8", @@ -5943,7 +5957,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -5963,7 +5977,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6348,7 +6362,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -6360,7 +6374,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "hash-db", "parity-scale-codec", @@ -6375,7 +6389,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6387,7 +6401,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "serde", @@ -6399,7 +6413,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "integer-sqrt", "num-traits 0.2.11", @@ -6413,7 +6427,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "sp-api", @@ -6425,7 +6439,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6436,7 +6450,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "sp-api", @@ -6448,7 +6462,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -6464,7 +6478,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "serde", "serde_json", @@ -6473,7 +6487,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6496,7 +6510,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "sp-api", @@ -6510,7 +6524,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "sp-api", @@ -6526,7 +6540,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6538,7 +6552,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "base58", "blake2-rfc", @@ -6579,7 +6593,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -6588,7 +6602,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", @@ -6598,7 +6612,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "environmental", "sp-std", @@ -6608,7 +6622,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "serde", @@ -6621,7 +6635,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6631,7 +6645,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "parity-scale-codec", @@ -6643,7 +6657,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "futures 0.3.4", "hash-db", @@ -6663,7 +6677,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "lazy_static", "sp-core", @@ -6674,7 +6688,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "sp-api", "sp-runtime", @@ -6683,7 +6697,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "backtrace", "log 0.4.8", @@ -6692,7 +6706,7 @@ dependencies = [ [[package]] name = "sp-phragmen" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "serde", @@ -6704,7 +6718,7 @@ dependencies = [ [[package]] name = "sp-phragmen-compact" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", @@ -6715,7 +6729,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "serde", "sp-core", @@ -6724,7 +6738,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", @@ -6745,7 +6759,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "primitive-types", @@ -6760,7 +6774,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "Inflector", "proc-macro-crate", @@ -6772,7 +6786,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "serde", "serde_json", @@ -6781,7 +6795,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "sp-api", "sp-core", @@ -6792,7 +6806,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -6802,7 +6816,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "hash-db", "log 0.4.8", @@ -6821,12 +6835,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" [[package]] name = "sp-storage" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -6838,7 +6852,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6852,7 +6866,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "tracing", ] @@ -6860,7 +6874,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6875,7 +6889,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "hash-db", "memory-db", @@ -6889,7 +6903,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "futures 0.3.4", "futures-core", @@ -6900,7 +6914,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -6912,7 +6926,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7040,7 +7054,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "chrono", "clear_on_drop", @@ -7067,7 +7081,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "platforms", ] @@ -7075,7 +7089,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.4", @@ -7096,7 +7110,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "async-std", "derive_more 0.99.5", @@ -7110,13 +7124,14 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "futures 0.3.4", "hash-db", "parity-scale-codec", "sc-client-api", "sc-client-db", + "sc-consensus", "sc-executor", "sc-service", "sp-blockchain", @@ -7130,7 +7145,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "cfg-if", "frame-executive", @@ -7169,12 +7184,13 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" dependencies = [ "futures 0.3.4", "parity-scale-codec", "sc-block-builder", "sc-client-api", + "sc-consensus", "sc-service", "sp-api", "sp-blockchain", @@ -7188,7 +7204,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.5" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#ca5eb6f487940efc703bfaa64ab06abeec3b9269" +source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" [[package]] name = "substrate-wasm-builder-runner" diff --git a/service/Cargo.toml b/service/Cargo.toml index c49d7684e199..02e9a25b83cd 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -29,6 +29,7 @@ sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seu sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } diff --git a/service/src/lib.rs b/service/src/lib.rs index 40bc3329a5e4..5a684fae6a67 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -35,7 +35,8 @@ pub use service::{ }; pub use service::config::{DatabaseConfig, PrometheusConfig}; pub use sc_executor::NativeExecutionDispatch; -pub use sc_client_api::{Backend, LongestChain, ExecutionStrategy, CallExecutor}; +pub use sc_client_api::{Backend, ExecutionStrategy, CallExecutor}; +pub use sc_consensus::LongestChain; pub use sp_api::{Core as CoreApi, ConstructRuntimeApi, ProvideRuntimeApi, StateBackend}; pub use sp_runtime::traits::{HashFor, NumberFor}; pub use consensus_common::{SelectChain, BlockImport, block_validation::Chain}; @@ -153,7 +154,7 @@ macro_rules! new_full_start { Block, $runtime, $executor >($config)? .with_select_chain(|_, backend| { - Ok(sc_client_api::LongestChain::new(backend.clone())) + Ok(sc_consensus::LongestChain::new(backend.clone())) })? .with_transaction_pool(|config, client, _fetcher, prometheus_registry| { let pool_api = sc_transaction_pool::FullChainApi::new(client.clone()); @@ -494,7 +495,7 @@ macro_rules! new_light { ServiceBuilder::new_light::($config)? .with_select_chain(|_, backend| { - Ok(sc_client_api::LongestChain::new(backend.clone())) + Ok(sc_consensus::LongestChain::new(backend.clone())) })? .with_transaction_pool(|config, client, fetcher, prometheus_registry| { let fetcher = fetcher From f70e9d22bee9192bff43c0c26678b8b269d954bd Mon Sep 17 00:00:00 2001 From: Seun Date: Tue, 28 Apr 2020 13:45:31 +0100 Subject: [PATCH 09/13] bump back to master --- Cargo.lock | 271 +++++++++--------- availability-store/Cargo.toml | 16 +- cli/Cargo.toml | 22 +- collator/Cargo.toml | 22 +- erasure-coding/Cargo.toml | 4 +- network/Cargo.toml | 16 +- network/test/Cargo.toml | 20 +- parachain/Cargo.toml | 14 +- parachain/test-parachains/adder/Cargo.toml | 2 +- .../test-parachains/adder/collator/Cargo.toml | 4 +- .../test-parachains/code-upgrader/Cargo.toml | 2 +- primitives/Cargo.toml | 20 +- rpc/Cargo.toml | 16 +- runtime/common/Cargo.toml | 48 ++-- runtime/kusama/Cargo.toml | 102 +++---- runtime/polkadot/Cargo.toml | 96 +++---- runtime/test-runtime/Cargo.toml | 68 ++--- runtime/test-runtime/client/Cargo.toml | 20 +- runtime/westend/Cargo.toml | 104 +++---- service/Cargo.toml | 72 ++--- statement-table/Cargo.toml | 2 +- validation/Cargo.toml | 32 +-- 22 files changed, 492 insertions(+), 481 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9c5abb490ee3..a530c6e83f3e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1227,7 +1227,7 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "fork-tree" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", ] @@ -1235,7 +1235,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -1252,7 +1252,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1270,7 +1270,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -1285,7 +1285,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "serde", @@ -1296,7 +1296,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "bitmask", "frame-metadata", @@ -1320,7 +1320,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.10", @@ -1331,7 +1331,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1343,7 +1343,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", @@ -1353,7 +1353,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1369,7 +1369,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "sp-api", @@ -3259,7 +3259,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3277,7 +3277,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3294,7 +3294,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3315,7 +3315,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -3330,7 +3330,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -3346,7 +3346,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -3361,7 +3361,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3375,7 +3375,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3391,7 +3391,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3409,7 +3409,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3425,7 +3425,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -3445,7 +3445,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3461,7 +3461,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3475,7 +3475,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3489,7 +3489,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3504,7 +3504,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -3523,7 +3523,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3536,7 +3536,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "enumflags2", "frame-support", @@ -3551,7 +3551,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -3566,7 +3566,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3584,7 +3584,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -3598,7 +3598,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3613,7 +3613,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -3636,7 +3636,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", @@ -3647,7 +3647,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3661,7 +3661,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -3679,7 +3679,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "frame-system", @@ -3692,7 +3692,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3710,7 +3710,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-support", "parity-scale-codec", @@ -3723,7 +3723,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -3738,7 +3738,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -3754,7 +3754,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4861,7 +4861,7 @@ dependencies = [ "rand_isaac", "rand_jitter", "rand_os", - "rand_pcg", + "rand_pcg 0.1.2", "rand_xorshift", "winapi 0.3.8", ] @@ -4877,6 +4877,7 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc 0.2.0", + "rand_pcg 0.2.1", ] [[package]] @@ -4986,6 +4987,15 @@ dependencies = [ "rand_core 0.4.2", ] +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + [[package]] name = "rand_xorshift" version = "0.1.1" @@ -5270,7 +5280,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "bytes 0.5.4", "derive_more 0.99.5", @@ -5297,7 +5307,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5313,7 +5323,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5329,7 +5339,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", @@ -5340,7 +5350,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "ansi_term 0.12.1", "app_dirs", @@ -5382,7 +5392,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "fnv", @@ -5418,7 +5428,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "blake2-rfc", "hash-db", @@ -5447,7 +5457,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#9be97898371459597c667c3246d56f2f8e506106" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5458,7 +5468,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "fork-tree", @@ -5499,7 +5509,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5512,7 +5522,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5533,7 +5543,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "log 0.4.8", "sc-client-api", @@ -5547,7 +5557,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "lazy_static", @@ -5575,7 +5585,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -5592,7 +5602,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5607,7 +5617,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -5628,7 +5638,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "assert_matches", "finality-grandpa", @@ -5664,7 +5674,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "ansi_term 0.12.1", "futures 0.3.4", @@ -5681,7 +5691,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "hex", @@ -5696,7 +5706,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "bitflags", "bytes 0.5.4", @@ -5748,7 +5758,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -5764,7 +5774,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "env_logger 0.7.1", "futures 0.3.4", @@ -5791,7 +5801,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "bytes 0.5.4", "fnv", @@ -5818,7 +5828,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "futures 0.3.4", "libp2p", @@ -5831,7 +5841,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "futures 0.3.4", "hash-db", @@ -5863,7 +5873,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -5887,7 +5897,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -5902,7 +5912,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "exit-future", @@ -5960,7 +5970,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5974,7 +5984,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "bytes 0.5.4", "futures 0.3.4", @@ -5996,7 +6006,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "erased-serde", "log 0.4.8", @@ -6011,7 +6021,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6031,7 +6041,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6416,7 +6426,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -6428,7 +6438,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "hash-db", "parity-scale-codec", @@ -6443,7 +6453,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6455,7 +6465,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "serde", @@ -6467,7 +6477,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "integer-sqrt", "num-traits 0.2.11", @@ -6481,7 +6491,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "sp-api", @@ -6493,7 +6503,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6504,7 +6514,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "sp-api", @@ -6516,7 +6526,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "log 0.4.8", @@ -6532,7 +6542,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "serde", "serde_json", @@ -6541,7 +6551,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6564,7 +6574,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "sp-api", @@ -6578,7 +6588,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "sp-api", @@ -6594,7 +6604,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6606,7 +6616,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "base58", "blake2-rfc", @@ -6647,7 +6657,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -6656,7 +6666,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "proc-macro2 1.0.10", "quote 1.0.3", @@ -6666,9 +6676,10 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "environmental", + "parity-scale-codec", "sp-std", "sp-storage", ] @@ -6676,7 +6687,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "serde", @@ -6689,7 +6700,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6699,7 +6710,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "parity-scale-codec", @@ -6711,7 +6722,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "futures 0.3.4", "hash-db", @@ -6731,7 +6742,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "lazy_static", "sp-core", @@ -6742,7 +6753,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "sp-api", "sp-core", @@ -6752,7 +6763,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "backtrace", "log 0.4.8", @@ -6761,7 +6772,7 @@ dependencies = [ [[package]] name = "sp-phragmen" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "serde", @@ -6773,7 +6784,7 @@ dependencies = [ [[package]] name = "sp-phragmen-compact" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.10", @@ -6784,7 +6795,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "serde", "sp-core", @@ -6793,7 +6804,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", @@ -6814,7 +6825,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "primitive-types", @@ -6829,7 +6840,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "Inflector", "proc-macro-crate", @@ -6841,7 +6852,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "serde", "serde_json", @@ -6850,7 +6861,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "sp-api", "sp-core", @@ -6861,7 +6872,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -6871,7 +6882,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "hash-db", "log 0.4.8", @@ -6890,12 +6901,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" [[package]] name = "sp-storage" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -6907,7 +6918,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6921,7 +6932,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "tracing", ] @@ -6929,7 +6940,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "derive_more 0.99.5", "futures 0.3.4", @@ -6944,7 +6955,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "hash-db", "memory-db", @@ -6958,7 +6969,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "futures 0.3.4", "futures-core", @@ -6969,7 +6980,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -6981,7 +6992,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7109,7 +7120,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "chrono", "clear_on_drop", @@ -7136,7 +7147,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "platforms", ] @@ -7144,7 +7155,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.4", @@ -7165,7 +7176,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "async-std", "derive_more 0.99.5", @@ -7179,7 +7190,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "futures 0.3.4", "hash-db", @@ -7200,7 +7211,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "cfg-if", "frame-executive", @@ -7232,14 +7243,14 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "substrate-wasm-builder-runner 1.0.5 (git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor)", + "substrate-wasm-builder-runner 1.0.5 (git+https://github.com/paritytech/substrate)", "trie-db", ] [[package]] name = "substrate-test-runtime-client" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" dependencies = [ "futures 0.3.4", "parity-scale-codec", @@ -7259,7 +7270,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.5" -source = "git+https://github.com/paritytech/substrate?branch=seun-the-great-client-refactor#967d8a7573021f7d2eea890137cd30bef979f157" +source = "git+https://github.com/paritytech/substrate#fc6d55c9c9cfe50ec7d8d8671cd39b669cebc1ab" [[package]] name = "substrate-wasm-builder-runner" diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index 33ac36cb20d6..556b4c6d0314 100644 --- a/availability-store/Cargo.toml +++ b/availability-store/Cargo.toml @@ -15,14 +15,14 @@ futures = "0.3.4" tokio = { version = "0.2.13", features = ["rt-core"] } exit-future = "0.2.0" codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } kvdb = "0.5.0" kvdb-memorydb = "0.5.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f531cefe33f3..d54d161458c2 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -17,25 +17,25 @@ crate-type = ["cdylib", "rlib"] log = "0.4.8" futures = { version = "0.3.4", features = ["compat"] } structopt = "0.3.8" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } service = { package = "polkadot-service", path = "../service", default-features = false } tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } wasm-bindgen = { version = "0.2.57", optional = true } wasm-bindgen-futures = { version = "0.4.7", optional = true } -browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } +browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = [ "wasmtime", "db", "cli" ] diff --git a/collator/Cargo.toml b/collator/Cargo.toml index 7a95ef52467a..ad38cc7f3210 100644 --- a/collator/Cargo.toml +++ b/collator/Cargo.toml @@ -7,16 +7,16 @@ edition = "2018" [dependencies] futures = "0.3.4" -sc-service = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-primitives = { path = "../primitives" } polkadot-cli = { path = "../cli" } polkadot-network = { path = "../network" } @@ -28,4 +28,4 @@ futures-timer = "2.0" codec = { package = "parity-scale-codec", version = "1.3.0" } [dev-dependencies] -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index 4b1063776680..5b4b8046a647 100644 --- a/erasure-coding/Cargo.toml +++ b/erasure-coding/Cargo.toml @@ -8,6 +8,6 @@ edition = "2018" primitives = { package = "polkadot-primitives", path = "../primitives" } reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2"} codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } derive_more = "0.15.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index 77b44367430a..d60f941c4526 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -15,18 +15,18 @@ polkadot-validation = { path = "../validation" } polkadot-primitives = { path = "../primitives" } polkadot-erasure-coding = { path = "../erasure-coding" } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } futures = "0.3.4" log = "0.4.8" exit-future = "0.2.0" futures-timer = "2.0" -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } wasm-timer = "0.2.4" [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/network/test/Cargo.toml b/network/test/Cargo.toml index d3f62d05bf38..3761527a7a40 100644 --- a/network/test/Cargo.toml +++ b/network/test/Cargo.toml @@ -10,14 +10,14 @@ log = "0.4.8" parking_lot = "0.10.0" futures = "0.3.1" rand = "0.7.2" -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "seun-the-great-client-refactor" } -sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "master" } +sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" } diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 23afde9c85d8..17679ae80635 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -10,17 +10,17 @@ edition = "2018" # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing # various unnecessary Substrate-specific endpoints. codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = [ "derive" ] } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } # all optional crates. derive_more = { version = "0.99.2", optional = true } serde = { version = "1.0.102", default-features = false, features = [ "derive" ], optional = true } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true, default-features = false } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", optional = true } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true, default-features = false } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } parking_lot = { version = "0.10.0", optional = true } log = { version = "0.4.8", optional = true } diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml index 5e8c55613630..2aa1530e36ff 100644 --- a/parachain/test-parachains/adder/Cargo.toml +++ b/parachain/test-parachains/adder/Cargo.toml @@ -13,7 +13,7 @@ tiny-keccak = "1.5.0" dlmalloc = { version = "0.1.3", features = [ "global" ] } # We need to make sure the global allocator is disabled until we have support of full substrate externalities -runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, features = [ "disable_allocator" ] } +runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 7d38a2e7a77f..3363a908a943 100644 --- a/parachain/test-parachains/adder/collator/Cargo.toml +++ b/parachain/test-parachains/adder/collator/Cargo.toml @@ -9,8 +9,8 @@ adder = { package = "test-parachain-adder", path = ".." } parachain = { package = "polkadot-parachain", path = "../../.." } collator = { package = "polkadot-collator", path = "../../../../collator" } primitives = { package = "polkadot-primitives", path = "../../../../primitives" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } parking_lot = "0.10.0" codec = { package = "parity-scale-codec", version = "1.2.0" } futures = "0.3.4" diff --git a/parachain/test-parachains/code-upgrader/Cargo.toml b/parachain/test-parachains/code-upgrader/Cargo.toml index 5e8cf3980593..c475334ecfd3 100644 --- a/parachain/test-parachains/code-upgrader/Cargo.toml +++ b/parachain/test-parachains/code-upgrader/Cargo.toml @@ -13,7 +13,7 @@ tiny-keccak = "1.5.0" dlmalloc = { version = "0.1.3", features = [ "global" ] } # We need to make sure the global allocator is disabled until we have support of full substrate externalities -runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, features = [ "disable_allocator" ] } +runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 020cfd12c206..65cd1f0ba03b 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,20 +7,20 @@ edition = "2018" [dependencies] serde = { version = "1.0.102", optional = true, features = ["derive"] } parity-scale-codec = { version = "1.3.0", default-features = false, features = ["bit-vec", "derive"] } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } polkadot-parachain = { path = "../parachain", default-features = false } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } [dev-dependencies] -sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" } pretty_assertions = "0.5.1" [features] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 78dd16a8faa3..9660ce3ec968 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -7,12 +7,12 @@ edition = "2018" [dependencies] jsonrpc-core = "14.0.3" polkadot-primitives = { path = "../primitives" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" } +frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index e20d27823fbd..573b1f6be396 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -12,37 +12,37 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.3.2", default-features = false, optional = true } [dev-dependencies] hex-literal = "0.2.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } trie-db = "0.20.0" serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 05e589dec02d..907507887859 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -13,57 +13,57 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -72,8 +72,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index 30784bc1fbe8..673fe59ee769 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -13,54 +13,54 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -69,8 +69,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index c3755fe2d227..f3d0eb690bdd 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -13,39 +13,39 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -55,8 +55,8 @@ polkadot-parachain = { path = "../../parachain", default-features = false } hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/runtime/test-runtime/client/Cargo.toml b/runtime/test-runtime/client/Cargo.toml index 2edffdacab32..ff94572b5f8e 100644 --- a/runtime/test-runtime/client/Cargo.toml +++ b/runtime/test-runtime/client/Cargo.toml @@ -6,18 +6,18 @@ edition = "2018" license = "GPL-3.0" [dependencies] -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", features = ["test-helpers"], default-features = false } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["test-helpers"], default-features = false } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-test-runtime = { path = ".." } polkadot-runtime-common = { path = "../../common" } polkadot-primitives = { path = "../../../primitives" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } codec = { package = "parity-scale-codec", version = "1.0.0" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } futures = "0.3.1" diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index 82aef1c12eed..8105888342bc 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -13,58 +13,58 @@ rustc-hex = { version = "2.0.1", default-features = false } serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -74,8 +74,8 @@ polkadot-parachain = { path = "../../parachain", default-features = false } hex-literal = "0.2.1" libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } trie-db = "0.20.0" serde_json = "1.0.41" diff --git a/service/Cargo.toml b/service/Cargo.toml index 996fed6d664a..7a0094b6ee93 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -20,46 +20,46 @@ kusama-runtime = { path = "../runtime/kusama" } westend-runtime = { path = "../runtime/westend" } polkadot-network = { path = "../network", optional = true } polkadot-rpc = { path = "../rpc" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "master" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "master" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master" } codec = { package = "parity-scale-codec", version = "1.3.0" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] polkadot-test-runtime-client = { path = "../runtime/test-runtime/client" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } env_logger = "0.7.0" [features] diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index 251f4a831092..091368920618 100644 --- a/statement-table/Cargo.toml +++ b/statement-table/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } primitives = { package = "polkadot-primitives", path = "../primitives" } diff --git a/validation/Cargo.toml b/validation/Cargo.toml index c5b5c12db781..7aca50bd16a8 100644 --- a/validation/Cargo.toml +++ b/validation/Cargo.toml @@ -18,22 +18,22 @@ parachain = { package = "polkadot-parachain", path = "../parachain" } polkadot-primitives = { path = "../primitives" } polkadot-erasure-coding = { path = "../erasure-coding" } table = { package = "polkadot-statement-table", path = "../statement-table" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" } +consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } +block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "master" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master" } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } -runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +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" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "seun-the-great-client-refactor" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } From aec8ac8d3764a0fdfc248b45faf824d77f234440 Mon Sep 17 00:00:00 2001 From: Seun Lanlege Date: Tue, 28 Apr 2020 13:46:18 +0100 Subject: [PATCH 10/13] Update collator/src/lib.rs Co-Authored-By: Benjamin Kampmann --- collator/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/collator/src/lib.rs b/collator/src/lib.rs index 53a63ed71de1..544c83d06baf 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -201,7 +201,6 @@ pub async fn collate

( } - fn build_collator_service( spawner: SP, handles: polkadot_service::FullNodeHandles, From 75edb5f2da404bc581532ac59a93f63ea014aa22 Mon Sep 17 00:00:00 2001 From: Seun Lanlege Date: Tue, 28 Apr 2020 14:01:58 +0100 Subject: [PATCH 11/13] Update collator/src/lib.rs Co-Authored-By: Pierre Krieger --- collator/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collator/src/lib.rs b/collator/src/lib.rs index 544c83d06baf..3e01e4cbb72c 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -201,7 +201,7 @@ pub async fn collate

( } -fn build_collator_service( +fn build_collator_service( spawner: SP, handles: polkadot_service::FullNodeHandles, client: Arc, From 26b8f85a2c2adc377c27e8afb291c8e42327eadd Mon Sep 17 00:00:00 2001 From: Seun Date: Tue, 28 Apr 2020 14:02:42 +0100 Subject: [PATCH 12/13] uncomment type MaxIterations --- runtime/common/src/parachains.rs | 2 +- runtime/common/src/registrar.rs | 2 +- runtime/kusama/src/lib.rs | 2 +- runtime/polkadot/src/lib.rs | 2 +- runtime/test-runtime/src/lib.rs | 2 +- runtime/westend/src/lib.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs index 91e68703e391..957135410919 100644 --- a/runtime/common/src/parachains.rs +++ b/runtime/common/src/parachains.rs @@ -1781,7 +1781,7 @@ mod tests { type ElectionLookahead = ElectionLookahead; type Call = Call; type UnsignedPriority = StakingUnsignedPriority; - // type MaxIterations = (); + type MaxIterations = (); } impl attestations::Trait for Test { diff --git a/runtime/common/src/registrar.rs b/runtime/common/src/registrar.rs index ac086a6252f8..e17f484273e0 100644 --- a/runtime/common/src/registrar.rs +++ b/runtime/common/src/registrar.rs @@ -844,7 +844,7 @@ mod tests { type ElectionLookahead = ElectionLookahead; type Call = Call; type UnsignedPriority = StakingUnsignedPriority; - // type MaxIterations = (); + type MaxIterations = (); } impl timestamp::Trait for Test { diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 00870d8e8f7b..5cbf5ee163b1 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -331,7 +331,7 @@ impl staking::Trait for Runtime { type ElectionLookahead = ElectionLookahead; type Call = Call; type UnsignedPriority = StakingUnsignedPriority; - // type MaxIterations = MaxIterations; + type MaxIterations = MaxIterations; } parameter_types! { diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index cf7d3718dda2..7f629252a2bb 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -336,7 +336,7 @@ impl staking::Trait for Runtime { type ElectionLookahead = ElectionLookahead; type Call = Call; type UnsignedPriority = StakingUnsignedPriority; - // type MaxIterations = MaxIterations; + type MaxIterations = MaxIterations; } parameter_types! { diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index f9c8bb6c2c7b..baebe4c50df8 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -311,7 +311,7 @@ impl staking::Trait for Runtime { type ElectionLookahead = ElectionLookahead; type Call = Call; type UnsignedPriority = StakingUnsignedPriority; - // type MaxIterations = MaxIterations; + type MaxIterations = MaxIterations; } impl grandpa::Trait for Runtime { diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 4ab7091e5599..1c8f9ab2aac1 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -323,7 +323,7 @@ impl staking::Trait for Runtime { type ElectionLookahead = ElectionLookahead; type Call = Call; type UnsignedPriority = StakingUnsignedPriority; - // type MaxIterations = MaxIterations; + type MaxIterations = MaxIterations; } parameter_types! { From 1507f16e2c8e3bd3e5894c3f5cf60fde956e5ee5 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 28 Apr 2020 16:05:06 +0200 Subject: [PATCH 13/13] reactivate append storage feature --- parachain/src/wasm_executor/mod.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/parachain/src/wasm_executor/mod.rs b/parachain/src/wasm_executor/mod.rs index 6ca3e3c98d35..5be160a8dd65 100644 --- a/parachain/src/wasm_executor/mod.rs +++ b/parachain/src/wasm_executor/mod.rs @@ -262,13 +262,13 @@ impl sp_externalities::Externalities for ValidationExternalities { panic!("next_storage_key: unsupported feature for parachain validation") } - // fn storage_append( - // &mut self, - // _key: Vec, - // _value: Vec, - // ) { - // panic!("storage_append: unsupported feature for parachain validation") - // } + fn storage_append( + &mut self, + _key: Vec, + _value: Vec, + ) { + panic!("storage_append: unsupported feature for parachain validation") + } fn wipe(&mut self) { panic!("wipe: unsupported feature for parachain validation")