From 7a956fb8d9a43b0f9aed021671f31ca402c73176 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 12 Jun 2020 15:50:53 +0200 Subject: [PATCH 01/92] WIP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 2 ++ runtime/test-runtime/Cargo.toml | 1 + runtime/test-runtime/src/lib.rs | 6 ++++++ service/Cargo.toml | 2 ++ service/src/lib.rs | 38 +++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index a03cef0855e6..1dd4e893047a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4483,6 +4483,7 @@ dependencies = [ "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", + "polkadot-test-runtime", "polkadot-test-runtime-client", "polkadot-validation", "sc-authority-discovery", @@ -4572,6 +4573,7 @@ dependencies = [ "sp-inherents", "sp-io", "sp-keyring", + "sp-offchain", "sp-runtime", "sp-session", "sp-staking", diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index 809a11965dd6..e857944bb657 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -17,6 +17,7 @@ smallvec = "1.4.0" 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 } 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 } diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index d7e6884fc4b2..93fc3ba092cd 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -618,6 +618,12 @@ sp_api::impl_runtime_apis! { } } + impl offchain_primitives::OffchainWorkerApi for Runtime { + fn offchain_worker(header: &::Header) { + Executive::offchain_worker(header) + } + } + impl parachain::ParachainHost for Runtime { fn validators() -> Vec { Parachains::authorities() diff --git a/service/Cargo.toml b/service/Cargo.toml index 9c50b3c99a81..0088415b1ad8 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -18,6 +18,7 @@ polkadot-primitives = { path = "../primitives" } polkadot-runtime = { path = "../runtime/polkadot" } kusama-runtime = { path = "../runtime/kusama" } westend-runtime = { path = "../runtime/westend" } +polkadot-test-runtime = { path = "../runtime/test-runtime", optional = true } polkadot-network = { path = "../network", optional = true } polkadot-rpc = { path = "../rpc" } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -67,3 +68,4 @@ default = ["db", "full-node"] db = ["service/db"] runtime-benchmarks = ["polkadot-runtime/runtime-benchmarks", "kusama-runtime/runtime-benchmarks", "westend-runtime/runtime-benchmarks"] full-node = ["av_store", "consensus", "polkadot-network"] +test = ["polkadot-test-runtime"] diff --git a/service/src/lib.rs b/service/src/lib.rs index fe118455b176..a0ee17c8cb76 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -51,6 +51,8 @@ pub use codec::Codec; pub use polkadot_runtime; pub use kusama_runtime; pub use westend_runtime; +#[cfg(feature = "test")] +pub use polkadot_test_runtime; use prometheus_endpoint::Registry; pub use self::client::PolkadotClient; @@ -760,6 +762,42 @@ pub fn westend_new_full( Ok((service, client, handles)) } +/// Create a new Polkadot test service for a full node. +#[cfg(feature = "full-node")] +#[cfg(feature = "test")] +pub fn polkadot_test_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)>, + informant_prefix: Option, +) + -> Result<( + impl AbstractService, + Arc, + polkadot_test_runtime::RuntimeApi + >>, + FullNodeHandles, + ), ServiceError> +{ + let (service, client, handles) = new_full!( + config, + collating_for, + max_block_data_size, + authority_discovery_enabled, + slot_duration, + grandpa_pause, + polkadot_test_runtime::RuntimeApi, + PolkadotExecutor, + informant_prefix, + ); + + Ok((service, client, handles)) +} /// Handles to other sub-services that full nodes instantiate, which consumers /// of the node may use. #[cfg(feature = "full-node")] From 9dd911857eaf8cf0a9591b271215c50cc4f25a33 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 12 Jun 2020 17:35:47 +0200 Subject: [PATCH 02/92] WIP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 3754 +++++++++++++++++------- Cargo.toml | 1 + polkadot-test/Cargo.toml | 71 + polkadot-test/src/lib.rs | 92 + runtime/test-runtime/Cargo.toml | 5 + runtime/test-runtime/src/genesismap.rs | 1 + runtime/test-runtime/src/lib.rs | 12 + service/Cargo.toml | 2 - service/src/grandpa_support.rs | 4 +- service/src/lib.rs | 45 +- 10 files changed, 2912 insertions(+), 1075 deletions(-) create mode 100644 polkadot-test/Cargo.toml create mode 100644 polkadot-test/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 1dd4e893047a..8a9217fc89f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,6 +25,40 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" +[[package]] +name = "aes-ctr" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" +dependencies = [ + "aes-soft", + "aesni", + "ctr", + "stream-cipher", +] + +[[package]] +name = "aes-soft" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" +dependencies = [ + "block-cipher-trait", + "byteorder", + "opaque-debug", +] + +[[package]] +name = "aesni" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" +dependencies = [ + "block-cipher-trait", + "opaque-debug", + "stream-cipher", +] + [[package]] name = "ahash" version = "0.2.18" @@ -367,6 +401,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-cipher-trait" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" +dependencies = [ + "generic-array", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -787,6 +830,16 @@ dependencies = [ "sct", ] +[[package]] +name = "ctr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" +dependencies = [ + "block-cipher-trait", + "stream-cipher", +] + [[package]] name = "curve25519-dalek" version = "2.0.0" @@ -1168,6 +1221,14 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "fork-tree" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", +] + [[package]] name = "fork-tree" version = "2.0.0-rc3" @@ -1176,21 +1237,38 @@ dependencies = [ "parity-scale-codec", ] +[[package]] +name = "frame-benchmarking" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "frame-support 2.0.0-rc2", + "frame-system 2.0.0-rc2", + "linregress", + "parity-scale-codec", + "paste", + "sp-api 2.0.0-rc2", + "sp-io 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-runtime-interface 2.0.0-rc2", + "sp-std 2.0.0-rc2", +] + [[package]] name = "frame-benchmarking" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "linregress", "parity-scale-codec", "paste", - "sp-api", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", + "sp-api 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-runtime-interface 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -1198,16 +1276,16 @@ name = "frame-benchmarking-cli" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 2.0.0-rc3", "parity-scale-codec", "sc-cli", - "sc-client-db", - "sc-executor", - "sc-service", - "sp-core", - "sp-externalities", - "sp-runtime", - "sp-state-machine", + "sc-client-db 0.8.0-rc3", + "sc-executor 0.8.0-rc3", + "sc-service 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-externalities 0.8.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", "structopt", ] @@ -1216,14 +1294,25 @@ name = "frame-executive" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-tracing 2.0.0-rc3", +] + +[[package]] +name = "frame-metadata" +version = "11.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "serde", + "sp-core 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -1233,8 +1322,33 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "parity-scale-codec", "serde", - "sp-core", - "sp-std", + "sp-core 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "frame-support" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "bitmask", + "frame-metadata 11.0.0-rc2", + "frame-support-procedural 2.0.0-rc2", + "impl-trait-for-tuples", + "log 0.4.8", + "once_cell", + "parity-scale-codec", + "paste", + "serde", + "smallvec 1.4.0", + "sp-arithmetic 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-io 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-state-machine 0.8.0-rc2", + "sp-std 2.0.0-rc2", + "sp-tracing 2.0.0-rc2", ] [[package]] @@ -1243,8 +1357,8 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "bitmask", - "frame-metadata", - "frame-support-procedural", + "frame-metadata 11.0.0-rc3", + "frame-support-procedural 2.0.0-rc3", "impl-trait-for-tuples", "log 0.4.8", "once_cell", @@ -1252,14 +1366,25 @@ dependencies = [ "paste", "serde", "smallvec 1.4.0", - "sp-arithmetic", - "sp-core", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-tracing", + "sp-arithmetic 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", + "sp-std 2.0.0-rc3", + "sp-tracing 2.0.0-rc3", +] + +[[package]] +name = "frame-support-procedural" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "frame-support-procedural-tools 2.0.0-rc2", + "proc-macro2 1.0.17", + "quote 1.0.6", + "syn 1.0.27", ] [[package]] @@ -1267,7 +1392,19 @@ name = "frame-support-procedural" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support-procedural-tools", + "frame-support-procedural-tools 2.0.0-rc3", + "proc-macro2 1.0.17", + "quote 1.0.6", + "syn 1.0.27", +] + +[[package]] +name = "frame-support-procedural-tools" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "frame-support-procedural-tools-derive 2.0.0-rc2", + "proc-macro-crate", "proc-macro2 1.0.17", "quote 1.0.6", "syn 1.0.27", @@ -1278,13 +1415,23 @@ name = "frame-support-procedural-tools" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support-procedural-tools-derive", + "frame-support-procedural-tools-derive 2.0.0-rc3", "proc-macro-crate", "proc-macro2 1.0.17", "quote 1.0.6", "syn 1.0.27", ] +[[package]] +name = "frame-support-procedural-tools-derive" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "proc-macro2 1.0.17", + "quote 1.0.6", + "syn 1.0.27", +] + [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc3" @@ -1295,20 +1442,36 @@ dependencies = [ "syn 1.0.27", ] +[[package]] +name = "frame-system" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "frame-support 2.0.0-rc2", + "impl-trait-for-tuples", + "parity-scale-codec", + "serde", + "sp-core 2.0.0-rc2", + "sp-io 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", + "sp-version 2.0.0-rc2", +] + [[package]] name = "frame-system" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", + "frame-support 2.0.0-rc3", "impl-trait-for-tuples", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-version", + "sp-core 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-version 2.0.0-rc3", ] [[package]] @@ -1316,13 +1479,22 @@ name = "frame-system-benchmarking" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "parity-scale-codec", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "frame-system-rpc-runtime-api" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ "parity-scale-codec", - "sp-core", - "sp-runtime", - "sp-std", + "sp-api 2.0.0-rc2", ] [[package]] @@ -1331,7 +1503,7 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-api", + "sp-api 2.0.0-rc3", ] [[package]] @@ -2225,18 +2397,18 @@ name = "kusama-runtime" version = "0.8.7" dependencies = [ "bitvec", - "frame-benchmarking", + "frame-benchmarking 2.0.0-rc3", "frame-executive", - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "frame-system-benchmarking", - "frame-system-rpc-runtime-api", + "frame-system-rpc-runtime-api 2.0.0-rc3", "hex-literal", "libsecp256k1", "log 0.3.9", "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", + "pallet-authorship 2.0.0-rc3", + "pallet-babe 2.0.0-rc3", "pallet-balances", "pallet-collective", "pallet-democracy", @@ -2244,7 +2416,7 @@ dependencies = [ "pallet-finality-tracker", "pallet-grandpa", "pallet-identity", - "pallet-im-online", + "pallet-im-online 2.0.0-rc3", "pallet-indices", "pallet-membership", "pallet-multisig", @@ -2255,14 +2427,14 @@ dependencies = [ "pallet-randomness-collective-flip", "pallet-recovery", "pallet-scheduler", - "pallet-session", + "pallet-session 2.0.0-rc3", "pallet-session-benchmarking", "pallet-society", - "pallet-staking", + "pallet-staking 2.0.0-rc3", "pallet-staking-reward-curve", - "pallet-timestamp", + "pallet-timestamp 2.0.0-rc3", "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", "pallet-treasury", "pallet-utility", "pallet-vesting", @@ -2274,22 +2446,22 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.4.0", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-trie", - "sp-version", + "sp-api 2.0.0-rc3", + "sp-authority-discovery 2.0.0-rc3", + "sp-block-builder 2.0.0-rc3", + "sp-consensus-babe 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-offchain 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-trie 2.0.0-rc3", + "sp-version 2.0.0-rc3", "static_assertions", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", @@ -2437,6 +2609,7 @@ dependencies = [ "libp2p-mplex", "libp2p-noise", "libp2p-ping", + "libp2p-secio", "libp2p-swarm", "libp2p-tcp", "libp2p-wasm-ext", @@ -2622,6 +2795,36 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "libp2p-secio" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b73f0cc119c83a5b619d6d11074a319fdb4aa4daf8088ade00d511418566e28" +dependencies = [ + "aes-ctr", + "ctr", + "futures 0.3.5", + "hmac", + "js-sys", + "lazy_static", + "libp2p-core", + "log 0.4.8", + "parity-send-wrapper", + "pin-project", + "prost", + "prost-build", + "quicksink", + "rand 0.7.3", + "ring", + "rw-stream-sink", + "sha2", + "static_assertions", + "twofish", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "libp2p-swarm" version = "0.19.0" @@ -3232,15 +3435,30 @@ name = "pallet-authority-discovery" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", - "pallet-session", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "pallet-session 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-application-crypto", - "sp-authority-discovery", - "sp-runtime", - "sp-std", + "sp-application-crypto 2.0.0-rc3", + "sp-authority-discovery 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "pallet-authorship" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "frame-support 2.0.0-rc2", + "frame-system 2.0.0-rc2", + "impl-trait-for-tuples", + "parity-scale-codec", + "sp-authorship 2.0.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -3248,14 +3466,36 @@ name = "pallet-authorship" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "impl-trait-for-tuples", "parity-scale-codec", - "sp-authorship", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-authorship 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "pallet-babe" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "frame-support 2.0.0-rc2", + "frame-system 2.0.0-rc2", + "pallet-session 2.0.0-rc2", + "pallet-timestamp 2.0.0-rc2", + "parity-scale-codec", + "serde", + "sp-application-crypto 2.0.0-rc2", + "sp-consensus-babe 0.8.0-rc2", + "sp-consensus-vrf 0.8.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-io 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-staking 2.0.0-rc2", + "sp-std 2.0.0-rc2", + "sp-timestamp 2.0.0-rc2", ] [[package]] @@ -3263,21 +3503,21 @@ name = "pallet-babe" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", - "pallet-session", - "pallet-timestamp", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "pallet-session 2.0.0-rc3", + "pallet-timestamp 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-application-crypto", - "sp-consensus-babe", - "sp-consensus-vrf", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", - "sp-timestamp", + "sp-application-crypto 2.0.0-rc3", + "sp-consensus-babe 0.8.0-rc3", + "sp-consensus-vrf 0.8.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-timestamp 2.0.0-rc3", ] [[package]] @@ -3285,13 +3525,13 @@ name = "pallet-balances" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3299,15 +3539,15 @@ name = "pallet-collective" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3315,14 +3555,14 @@ name = "pallet-democracy" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3330,14 +3570,14 @@ name = "pallet-elections-phragmen" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3345,15 +3585,15 @@ name = "pallet-finality-tracker" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "impl-trait-for-tuples", "parity-scale-codec", "serde", - "sp-finality-tracker", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-finality-tracker 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3361,19 +3601,19 @@ name = "pallet-grandpa" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "pallet-finality-tracker", - "pallet-session", + "pallet-session 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-application-crypto", - "sp-core", - "sp-finality-grandpa", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", + "sp-application-crypto 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-finality-grandpa 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3382,14 +3622,33 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "enumflags2", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "parity-scale-codec", + "serde", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "pallet-im-online" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "frame-support 2.0.0-rc2", + "frame-system 2.0.0-rc2", + "pallet-authorship 2.0.0-rc2", + "pallet-session 2.0.0-rc2", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-application-crypto 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-io 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-staking 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -3397,19 +3656,19 @@ name = "pallet-im-online" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-authorship", - "pallet-session", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "pallet-authorship 2.0.0-rc3", + "pallet-session 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-application-crypto 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3417,15 +3676,15 @@ name = "pallet-indices" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-keyring", - "sp-runtime", - "sp-std", + "sp-core 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3433,13 +3692,13 @@ name = "pallet-membership" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3447,14 +3706,14 @@ name = "pallet-multisig" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3462,13 +3721,13 @@ name = "pallet-nicks" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3476,14 +3735,14 @@ name = "pallet-offences" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "pallet-balances", "parity-scale-codec", "serde", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3491,20 +3750,20 @@ name = "pallet-offences-benchmarking" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-babe", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "pallet-babe 2.0.0-rc3", "pallet-balances", "pallet-grandpa", - "pallet-im-online", + "pallet-im-online 2.0.0-rc3", "pallet-offences", - "pallet-session", - "pallet-staking", + "pallet-session 2.0.0-rc3", + "pallet-staking 2.0.0-rc3", "parity-scale-codec", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3512,14 +3771,14 @@ name = "pallet-proxy" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3527,12 +3786,12 @@ name = "pallet-randomness-collective-flip" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "safe-mix", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3541,13 +3800,13 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "enumflags2", - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3555,14 +3814,32 @@ name = "pallet-scheduler" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "parity-scale-codec", + "serde", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "pallet-session" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "frame-support 2.0.0-rc2", + "frame-system 2.0.0-rc2", + "impl-trait-for-tuples", + "pallet-timestamp 2.0.0-rc2", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0-rc2", + "sp-session 2.0.0-rc2", + "sp-staking 2.0.0-rc2", + "sp-std 2.0.0-rc2", + "sp-trie 2.0.0-rc2", ] [[package]] @@ -3570,17 +3847,17 @@ name = "pallet-session" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "impl-trait-for-tuples", - "pallet-timestamp", + "pallet-timestamp 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-trie", + "sp-runtime 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-trie 2.0.0-rc3", ] [[package]] @@ -3588,13 +3865,13 @@ name = "pallet-session-benchmarking" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-session", - "pallet-staking", - "sp-runtime", - "sp-std", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "pallet-session 2.0.0-rc3", + "pallet-staking 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3602,13 +3879,33 @@ name = "pallet-society" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "rand_chacha 0.2.2", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "pallet-staking" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "frame-support 2.0.0-rc2", + "frame-system 2.0.0-rc2", + "pallet-authorship 2.0.0-rc2", + "pallet-session 2.0.0-rc2", + "parity-scale-codec", + "serde", + "sp-application-crypto 2.0.0-rc2", + "sp-io 2.0.0-rc2", + "sp-phragmen", + "sp-runtime 2.0.0-rc2", + "sp-staking 2.0.0-rc2", + "sp-std 2.0.0-rc2", + "static_assertions", ] [[package]] @@ -3616,20 +3913,20 @@ name = "pallet-staking" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-authorship", - "pallet-session", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "pallet-authorship 2.0.0-rc3", + "pallet-session 2.0.0-rc3", "parity-scale-codec", "rand_chacha 0.2.2", "serde", - "sp-application-crypto", - "sp-io", + "sp-application-crypto 2.0.0-rc3", + "sp-io 2.0.0-rc3", "sp-npos-elections", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", "static_assertions", ] @@ -3649,13 +3946,30 @@ name = "pallet-sudo" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "parity-scale-codec", + "serde", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "pallet-timestamp" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "frame-benchmarking 2.0.0-rc2", + "frame-support 2.0.0-rc2", + "frame-system 2.0.0-rc2", + "impl-trait-for-tuples", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-inherents 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", + "sp-timestamp 2.0.0-rc2", ] [[package]] @@ -3663,17 +3977,17 @@ name = "pallet-timestamp" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "impl-trait-for-tuples", "parity-scale-codec", "serde", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-std", - "sp-timestamp", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-timestamp 2.0.0-rc3", ] [[package]] @@ -3681,13 +3995,13 @@ name = "pallet-transaction-payment" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", - "frame-system", - "pallet-transaction-payment-rpc-runtime-api", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", "parity-scale-codec", "smallvec 1.4.0", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3698,14 +4012,27 @@ dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", + "parity-scale-codec", + "serde", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-rpc 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", +] + +[[package]] +name = "pallet-transaction-payment-rpc-runtime-api" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "frame-support 2.0.0-rc2", "parity-scale-codec", "serde", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-rpc", - "sp-runtime", + "sp-api 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -3713,12 +4040,12 @@ name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support", + "frame-support 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-api", - "sp-runtime", - "sp-std", + "sp-api 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3726,14 +4053,14 @@ name = "pallet-treasury" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "pallet-balances", "parity-scale-codec", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3741,15 +4068,15 @@ name = "pallet-utility" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -3758,13 +4085,13 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "enumflags2", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "parity-scale-codec", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", ] [[package]] @@ -4090,14 +4417,14 @@ dependencies = [ "parking_lot 0.9.0", "polkadot-erasure-coding", "polkadot-primitives", - "sc-client-api", - "sc-keystore", - "sc-network", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-runtime", + "sc-client-api 2.0.0-rc3", + "sc-keystore 2.0.0-rc3", + "sc-network 0.8.0-rc3", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", "tokio 0.2.21", ] @@ -4110,13 +4437,13 @@ dependencies = [ "log 0.4.8", "polkadot-service", "sc-cli", - "sc-client-api", - "sc-client-db", - "sc-executor", - "sc-service", - "sp-api", - "sp-core", - "sp-runtime", + "sc-client-api 2.0.0-rc3", + "sc-client-db 0.8.0-rc3", + "sc-executor 0.8.0-rc3", + "sc-service 0.8.0-rc3", + "sp-api 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", "structopt", "substrate-browser-utils", "substrate-build-script-utils", @@ -4139,16 +4466,16 @@ dependencies = [ "polkadot-service", "polkadot-validation", "sc-cli", - "sc-client-api", - "sc-executor", - "sc-network", - "sc-service", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-keyring", - "sp-runtime", + "sc-client-api 2.0.0-rc3", + "sc-executor 0.8.0-rc3", + "sc-network 0.8.0-rc3", + "sc-service 0.8.0-rc3", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", "tokio 0.2.21", ] @@ -4160,8 +4487,8 @@ dependencies = [ "parity-scale-codec", "polkadot-primitives", "reed-solomon-erasure", - "sp-core", - "sp-trie", + "sp-core 2.0.0-rc3", + "sp-trie 2.0.0-rc3", ] [[package]] @@ -4181,14 +4508,14 @@ dependencies = [ "polkadot-erasure-coding", "polkadot-primitives", "polkadot-validation", - "sc-network", - "sc-network-gossip", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-keyring", - "sp-runtime", - "sp-state-machine", + "sc-network 0.8.0-rc3", + "sc-network-gossip 0.8.0-rc3", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", "wasm-timer", ] @@ -4201,16 +4528,16 @@ dependencies = [ "parking_lot 0.10.2", "polkadot-test-runtime-client", "rand 0.7.3", - "sc-block-builder", - "sc-client-api", - "sc-consensus", - "sc-network", + "sc-block-builder 0.8.0-rc3", + "sc-client-api 2.0.0-rc3", + "sc-consensus 0.8.0-rc3", + "sc-network 0.8.0-rc3", "sc-network-test", - "sc-service", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-runtime", + "sc-service 0.8.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", ] [[package]] @@ -4231,7 +4558,7 @@ dependencies = [ "log 0.4.8", "polkadot-node-messages", "polkadot-primitives", - "sc-client-api", + "sc-client-api 2.0.0-rc3", "streamunordered", ] @@ -4243,15 +4570,15 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", - "sc-executor", + "sc-executor 0.8.0-rc3", "serde", "shared_memory", - "sp-core", - "sp-externalities", - "sp-io", - "sp-runtime-interface", - "sp-std", - "sp-wasm-interface", + "sp-core 2.0.0-rc3", + "sp-externalities 0.8.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime-interface 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-wasm-interface 2.0.0-rc3", ] [[package]] @@ -4259,21 +4586,21 @@ name = "polkadot-primitives" version = "0.8.7" dependencies = [ "bitvec", - "frame-system", + "frame-system 2.0.0-rc3", "parity-scale-codec", "polkadot-parachain", "pretty_assertions", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-serializer", - "sp-staking", - "sp-std", - "sp-trie", - "sp-version", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-serializer 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-trie 2.0.0-rc3", + "sp-version 2.0.0-rc3", ] [[package]] @@ -4284,20 +4611,20 @@ dependencies = [ "pallet-transaction-payment-rpc", "parity-scale-codec", "polkadot-primitives", - "sc-client-api", - "sc-consensus-babe", + "sc-client-api 2.0.0-rc3", + "sc-consensus-babe 0.8.0-rc3", "sc-consensus-babe-rpc", - "sc-consensus-epochs", - "sc-finality-grandpa", + "sc-consensus-epochs 0.8.0-rc3", + "sc-finality-grandpa 0.8.0-rc3", "sc-finality-grandpa-rpc", - "sc-keystore", - "sc-rpc", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-runtime", - "sp-transaction-pool", + "sc-keystore 2.0.0-rc3", + "sc-rpc 2.0.0-rc3", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-consensus-babe 0.8.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", "substrate-frame-rpc-system", ] @@ -4306,18 +4633,18 @@ name = "polkadot-runtime" version = "0.8.7" dependencies = [ "bitvec", - "frame-benchmarking", + "frame-benchmarking 2.0.0-rc3", "frame-executive", - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "frame-system-benchmarking", - "frame-system-rpc-runtime-api", + "frame-system-rpc-runtime-api 2.0.0-rc3", "hex-literal", "libsecp256k1", "log 0.3.9", "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", + "pallet-authorship 2.0.0-rc3", + "pallet-babe 2.0.0-rc3", "pallet-balances", "pallet-collective", "pallet-democracy", @@ -4325,7 +4652,7 @@ dependencies = [ "pallet-finality-tracker", "pallet-grandpa", "pallet-identity", - "pallet-im-online", + "pallet-im-online 2.0.0-rc3", "pallet-indices", "pallet-membership", "pallet-multisig", @@ -4335,14 +4662,14 @@ dependencies = [ "pallet-proxy", "pallet-randomness-collective-flip", "pallet-scheduler", - "pallet-session", + "pallet-session 2.0.0-rc3", "pallet-session-benchmarking", - "pallet-staking", + "pallet-staking 2.0.0-rc3", "pallet-staking-reward-curve", "pallet-sudo", - "pallet-timestamp", + "pallet-timestamp 2.0.0-rc3", "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", "pallet-treasury", "pallet-utility", "pallet-vesting", @@ -4354,21 +4681,21 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.4.0", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-keyring", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-trie", - "sp-version", + "sp-api 2.0.0-rc3", + "sp-authority-discovery 2.0.0-rc3", + "sp-block-builder 2.0.0-rc3", + "sp-consensus-babe 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-offchain 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-trie 2.0.0-rc3", + "sp-version 2.0.0-rc3", "static_assertions", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", @@ -4380,21 +4707,21 @@ name = "polkadot-runtime-common" version = "0.8.7" dependencies = [ "bitvec", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "hex-literal", "libsecp256k1", "log 0.3.9", - "pallet-authorship", - "pallet-babe", + "pallet-authorship 2.0.0-rc3", + "pallet-babe 2.0.0-rc3", "pallet-balances", "pallet-offences", "pallet-randomness-collective-flip", - "pallet-session", - "pallet-staking", + "pallet-session 2.0.0-rc3", + "pallet-staking 2.0.0-rc3", "pallet-staking-reward-curve", - "pallet-timestamp", + "pallet-timestamp 2.0.0-rc3", "pallet-treasury", "pallet-vesting", "parity-scale-codec", @@ -4403,17 +4730,17 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-trie", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-trie 2.0.0-rc3", "static_assertions", "trie-db", ] @@ -4423,21 +4750,21 @@ name = "polkadot-runtime-parachains" version = "0.8.0" dependencies = [ "bitvec", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0-rc3", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "hex-literal", "libsecp256k1", "log 0.3.9", - "pallet-authorship", - "pallet-babe", + "pallet-authorship 2.0.0-rc3", + "pallet-babe 2.0.0-rc3", "pallet-balances", "pallet-offences", "pallet-randomness-collective-flip", - "pallet-session", - "pallet-staking", + "pallet-session 2.0.0-rc3", + "pallet-staking 2.0.0-rc3", "pallet-staking-reward-curve", - "pallet-timestamp", + "pallet-timestamp 2.0.0-rc3", "pallet-treasury", "pallet-vesting", "parity-scale-codec", @@ -4446,17 +4773,17 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-trie", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-trie 2.0.0-rc3", "trie-db", ] @@ -4465,17 +4792,17 @@ name = "polkadot-service" version = "0.8.7" dependencies = [ "env_logger", - "frame-benchmarking", - "frame-system-rpc-runtime-api", + "frame-benchmarking 2.0.0-rc3", + "frame-system-rpc-runtime-api 2.0.0-rc3", "futures 0.3.5", "hex-literal", "kusama-runtime", "lazy_static", "log 0.4.8", - "pallet-babe", - "pallet-im-online", - "pallet-staking", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-babe 2.0.0-rc3", + "pallet-im-online 2.0.0-rc3", + "pallet-staking 2.0.0-rc3", + "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", "parity-scale-codec", "parking_lot 0.9.0", "polkadot-availability-store", @@ -4483,40 +4810,39 @@ dependencies = [ "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", - "polkadot-test-runtime", "polkadot-test-runtime-client", "polkadot-validation", - "sc-authority-discovery", - "sc-block-builder", - "sc-chain-spec", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-consensus-babe", - "sc-executor", - "sc-finality-grandpa", - "sc-keystore", - "sc-network", - "sc-service", - "sc-telemetry", - "sc-transaction-pool", + "sc-authority-discovery 0.8.0-rc3", + "sc-block-builder 0.8.0-rc3", + "sc-chain-spec 2.0.0-rc3", + "sc-client-api 2.0.0-rc3", + "sc-client-db 0.8.0-rc3", + "sc-consensus 0.8.0-rc3", + "sc-consensus-babe 0.8.0-rc3", + "sc-executor 0.8.0-rc3", + "sc-finality-grandpa 0.8.0-rc3", + "sc-keystore 2.0.0-rc3", + "sc-network 0.8.0-rc3", + "sc-service 0.8.0-rc3", + "sc-telemetry 2.0.0-rc3", + "sc-transaction-pool 2.0.0-rc3", "serde", "slog", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core", - "sp-finality-grandpa", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-transaction-pool", - "substrate-prometheus-endpoint", + "sp-api 2.0.0-rc3", + "sp-authority-discovery 2.0.0-rc3", + "sp-block-builder 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-consensus-babe 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-finality-grandpa 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-offchain 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", "westend-runtime", ] @@ -4526,7 +4852,68 @@ version = "0.8.7" dependencies = [ "parity-scale-codec", "polkadot-primitives", - "sp-core", + "sp-core 2.0.0-rc3", +] + +[[package]] +name = "polkadot-test" +version = "0.8.2" +dependencies = [ + "env_logger", + "frame-benchmarking 2.0.0-rc2", + "frame-system-rpc-runtime-api 2.0.0-rc2", + "futures 0.3.5", + "hex-literal", + "kusama-runtime", + "lazy_static", + "log 0.4.8", + "pallet-babe 2.0.0-rc2", + "pallet-im-online 2.0.0-rc2", + "pallet-staking 2.0.0-rc2", + "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc2", + "parity-scale-codec", + "parking_lot 0.9.0", + "polkadot-availability-store", + "polkadot-network", + "polkadot-primitives", + "polkadot-rpc", + "polkadot-runtime", + "polkadot-service", + "polkadot-test-runtime", + "polkadot-test-runtime-client", + "polkadot-validation", + "sc-authority-discovery 0.8.0-rc2", + "sc-block-builder 0.8.0-rc2", + "sc-chain-spec 2.0.0-rc2", + "sc-client-api 2.0.0-rc2", + "sc-client-db 0.8.0-rc2", + "sc-consensus 0.8.0-rc2", + "sc-consensus-babe 0.8.0-rc2", + "sc-executor 0.8.0-rc2", + "sc-finality-grandpa 0.8.0-rc2", + "sc-keystore 2.0.0-rc2", + "sc-network 0.8.0-rc2", + "sc-service 0.8.0-rc2", + "sc-telemetry 2.0.0-rc2", + "sc-transaction-pool 2.0.0-rc2", + "serde", + "slog", + "sp-api 2.0.0-rc2", + "sp-authority-discovery 2.0.0-rc2", + "sp-block-builder 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-consensus-babe 0.8.0-rc2", + "sp-core 2.0.0-rc2", + "sp-finality-grandpa 2.0.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-io 2.0.0-rc2", + "sp-offchain 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-session 2.0.0-rc2", + "sp-transaction-pool 2.0.0-rc2", + "substrate-prometheus-endpoint 0.8.0-rc2", + "westend-runtime", ] [[package]] @@ -4535,14 +4922,15 @@ version = "0.8.7" dependencies = [ "bitvec", "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "frame-system-rpc-runtime-api 2.0.0-rc3", "hex-literal", "libsecp256k1", "log 0.3.9", - "pallet-authorship", - "pallet-babe", + "pallet-authority-discovery", + "pallet-authorship 2.0.0-rc3", + "pallet-babe 2.0.0-rc3", "pallet-balances", "pallet-finality-tracker", "pallet-grandpa", @@ -4550,12 +4938,12 @@ dependencies = [ "pallet-nicks", "pallet-offences", "pallet-randomness-collective-flip", - "pallet-session", - "pallet-staking", + "pallet-session 2.0.0-rc3", + "pallet-staking 2.0.0-rc3", "pallet-staking-reward-curve", - "pallet-timestamp", + "pallet-timestamp 2.0.0-rc3", "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", "pallet-vesting", "parity-scale-codec", "polkadot-parachain", @@ -4566,21 +4954,22 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.4.0", - "sp-api", - "sp-block-builder", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-trie", - "sp-version", + "sp-api 2.0.0-rc3", + "sp-authority-discovery 2.0.0-rc3", + "sp-block-builder 2.0.0-rc3", + "sp-consensus-babe 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-offchain 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-trie 2.0.0-rc3", + "sp-version 2.0.0-rc3", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", "trie-db", @@ -4591,20 +4980,20 @@ name = "polkadot-test-runtime-client" version = "2.0.0" dependencies = [ "futures 0.3.5", - "pallet-timestamp", + "pallet-timestamp 2.0.0-rc3", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-test-runtime", - "sc-block-builder", - "sc-client-api", - "sc-consensus", + "sc-block-builder 0.8.0-rc3", + "sc-client-api 2.0.0-rc3", + "sc-consensus 0.8.0-rc3", "sc-light", - "sc-service", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-runtime", + "sc-service 0.8.0-rc3", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", "substrate-test-client", ] @@ -4618,7 +5007,7 @@ dependencies = [ "futures 0.3.5", "futures-timer 2.0.2", "log 0.4.8", - "pallet-babe", + "pallet-babe 2.0.0-rc3", "parity-scale-codec", "parking_lot 0.9.0", "polkadot-availability-store", @@ -4627,22 +5016,22 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-basic-authorship", - "sc-block-builder", - "sc-client-api", - "sc-finality-grandpa", - "sc-keystore", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-keyring", - "sp-runtime", - "sp-timestamp", - "sp-transaction-pool", - "sp-trie", - "substrate-prometheus-endpoint", + "sc-block-builder 0.8.0-rc3", + "sc-client-api 2.0.0-rc3", + "sc-finality-grandpa 0.8.0-rc3", + "sc-keystore 2.0.0-rc3", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-consensus-babe 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-timestamp 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-trie 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", "tokio 0.2.21", ] @@ -5375,6 +5764,33 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "sc-authority-discovery" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "bytes 0.5.4", + "derive_more 0.99.7", + "futures 0.3.5", + "futures-timer 3.0.2", + "libp2p", + "log 0.4.8", + "parity-scale-codec", + "prost", + "prost-build", + "rand 0.7.3", + "sc-client-api 2.0.0-rc2", + "sc-keystore 2.0.0-rc2", + "sc-network 0.8.0-rc2", + "serde_json", + "sp-api 2.0.0-rc2", + "sp-authority-discovery 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "substrate-prometheus-endpoint 0.8.0-rc2", +] + [[package]] name = "sc-authority-discovery" version = "0.8.0-rc3" @@ -5390,16 +5806,16 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "sc-client-api", - "sc-keystore", - "sc-network", + "sc-client-api 2.0.0-rc3", + "sc-keystore 2.0.0-rc3", + "sc-network 0.8.0-rc3", "serde_json", - "sp-api", - "sp-authority-discovery", - "sp-blockchain", - "sp-core", - "sp-runtime", - "substrate-prometheus-endpoint", + "sp-api 2.0.0-rc3", + "sp-authority-discovery 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", ] [[package]] @@ -5411,35 +5827,67 @@ dependencies = [ "futures-timer 3.0.2", "log 0.4.8", "parity-scale-codec", - "sc-block-builder", - "sc-client-api", + "sc-block-builder 0.8.0-rc3", + "sc-client-api 2.0.0-rc3", "sc-proposer-metrics", - "sc-telemetry", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-transaction-pool", - "substrate-prometheus-endpoint", + "sc-telemetry 2.0.0-rc3", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", "tokio-executor 0.2.0-alpha.6", ] +[[package]] +name = "sc-block-builder" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "sc-client-api 2.0.0-rc2", + "sp-api 2.0.0-rc2", + "sp-block-builder 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-state-machine 0.8.0-rc2", +] + [[package]] name = "sc-block-builder" version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sc-client-api", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sc-client-api 2.0.0-rc3", + "sp-api 2.0.0-rc3", + "sp-block-builder 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", +] + +[[package]] +name = "sc-chain-spec" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "impl-trait-for-tuples", + "sc-chain-spec-derive 2.0.0-rc2", + "sc-network 0.8.0-rc2", + "sc-telemetry 2.0.0-rc2", + "serde", + "serde_json", + "sp-chain-spec 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", ] [[package]] @@ -5448,14 +5896,25 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "impl-trait-for-tuples", - "sc-chain-spec-derive", - "sc-network", - "sc-telemetry", + "sc-chain-spec-derive 2.0.0-rc3", + "sc-network 0.8.0-rc3", + "sc-telemetry 2.0.0-rc3", "serde", "serde_json", - "sp-chain-spec", - "sp-core", - "sp-runtime", + "sp-chain-spec 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", +] + +[[package]] +name = "sc-chain-spec-derive" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "proc-macro-crate", + "proc-macro2 1.0.17", + "quote 1.0.6", + "syn 1.0.27", ] [[package]] @@ -5488,31 +5947,31 @@ dependencies = [ "parity-util-mem", "regex", "rpassword", - "sc-client-api", - "sc-informant", - "sc-network", - "sc-service", - "sc-telemetry", - "sc-tracing", + "sc-client-api 2.0.0-rc3", + "sc-informant 0.8.0-rc3", + "sc-network 0.8.0-rc3", + "sc-service 0.8.0-rc3", + "sc-telemetry 2.0.0-rc3", + "sc-tracing 2.0.0-rc3", "serde_json", - "sp-blockchain", - "sp-core", - "sp-keyring", - "sp-panic-handler", - "sp-runtime", - "sp-state-machine", - "sp-utils", - "sp-version", + "sp-blockchain 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-panic-handler 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", + "sp-utils 2.0.0-rc3", + "sp-version 2.0.0-rc3", "structopt", - "substrate-prometheus-endpoint", + "substrate-prometheus-endpoint 0.8.0-rc3", "time", "tokio 0.2.21", ] [[package]] name = "sc-client-api" -version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" dependencies = [ "derive_more 0.99.7", "fnv", @@ -5524,31 +5983,67 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", - "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-storage", - "sp-transaction-pool", - "sp-trie", - "sp-utils", - "sp-version", - "substrate-prometheus-endpoint", + "sc-executor 0.8.0-rc2", + "sc-telemetry 2.0.0-rc2", + "sp-api 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-core 2.0.0-rc2", + "sp-database 2.0.0-rc2", + "sp-externalities 0.8.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-keyring 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-state-machine 0.8.0-rc2", + "sp-std 2.0.0-rc2", + "sp-storage 2.0.0-rc2", + "sp-transaction-pool 2.0.0-rc2", + "sp-trie 2.0.0-rc2", + "sp-utils 2.0.0-rc2", + "sp-version 2.0.0-rc2", + "substrate-prometheus-endpoint 0.8.0-rc2", ] [[package]] -name = "sc-client-db" -version = "0.8.0-rc3" +name = "sc-client-api" +version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" +dependencies = [ + "derive_more 0.99.7", + "fnv", + "futures 0.3.5", + "hash-db", + "hex-literal", + "kvdb", + "lazy_static", + "log 0.4.8", + "parity-scale-codec", + "parking_lot 0.10.2", + "sc-executor 0.8.0-rc3", + "sc-telemetry 2.0.0-rc3", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-database 2.0.0-rc3", + "sp-externalities 0.8.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", + "sp-std 2.0.0-rc3", + "sp-storage 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-trie 2.0.0-rc3", + "sp-utils 2.0.0-rc3", + "sp-version 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", +] + +[[package]] +name = "sc-client-db" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" dependencies = [ "blake2-rfc", "hash-db", @@ -5561,17 +6056,57 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", - "sc-client-api", - "sc-executor", - "sc-state-db", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-database", - "sp-runtime", - "sp-state-machine", - "sp-trie", - "substrate-prometheus-endpoint", + "sc-client-api 2.0.0-rc2", + "sc-executor 0.8.0-rc2", + "sc-state-db 0.8.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-core 2.0.0-rc2", + "sp-database 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-state-machine 0.8.0-rc2", + "sp-trie 2.0.0-rc2", + "substrate-prometheus-endpoint 0.8.0-rc2", +] + +[[package]] +name = "sc-client-db" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" +dependencies = [ + "blake2-rfc", + "hash-db", + "kvdb", + "kvdb-memorydb", + "kvdb-rocksdb", + "linked-hash-map", + "log 0.4.8", + "parity-db", + "parity-scale-codec", + "parity-util-mem", + "parking_lot 0.10.2", + "sc-client-api 2.0.0-rc3", + "sc-executor 0.8.0-rc3", + "sc-state-db 0.8.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-database 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", + "sp-trie 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", +] + +[[package]] +name = "sc-consensus" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "sc-client-api 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-runtime 2.0.0-rc2", ] [[package]] @@ -5579,10 +6114,52 @@ name = "sc-consensus" version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "sc-client-api", - "sp-blockchain", - "sp-consensus", - "sp-runtime", + "sc-client-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-runtime 2.0.0-rc3", +] + +[[package]] +name = "sc-consensus-babe" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "fork-tree 2.0.0-rc2", + "futures 0.3.5", + "futures-timer 3.0.2", + "log 0.4.8", + "merlin", + "num-bigint", + "num-rational", + "num-traits 0.2.11", + "parity-scale-codec", + "parking_lot 0.10.2", + "pdqselect", + "rand 0.7.3", + "sc-client-api 2.0.0-rc2", + "sc-consensus-epochs 0.8.0-rc2", + "sc-consensus-slots 0.8.0-rc2", + "sc-consensus-uncles 0.8.0-rc2", + "sc-keystore 2.0.0-rc2", + "sc-telemetry 2.0.0-rc2", + "schnorrkel", + "serde", + "sp-api 2.0.0-rc2", + "sp-application-crypto 2.0.0-rc2", + "sp-block-builder 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-consensus-babe 0.8.0-rc2", + "sp-consensus-vrf 0.8.0-rc2", + "sp-core 2.0.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-io 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-timestamp 2.0.0-rc2", + "sp-version 2.0.0-rc2", + "substrate-prometheus-endpoint 0.8.0-rc2", ] [[package]] @@ -5591,7 +6168,7 @@ version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "derive_more 0.99.7", - "fork-tree", + "fork-tree 2.0.0-rc3", "futures 0.3.5", "futures-timer 3.0.2", "log 0.4.8", @@ -5603,28 +6180,28 @@ dependencies = [ "parking_lot 0.10.2", "pdqselect", "rand 0.7.3", - "sc-client-api", - "sc-consensus-epochs", - "sc-consensus-slots", - "sc-consensus-uncles", - "sc-keystore", - "sc-telemetry", + "sc-client-api 2.0.0-rc3", + "sc-consensus-epochs 0.8.0-rc3", + "sc-consensus-slots 0.8.0-rc3", + "sc-consensus-uncles 0.8.0-rc3", + "sc-keystore 2.0.0-rc3", + "sc-telemetry 2.0.0-rc3", "schnorrkel", "serde", - "sp-api", - "sp-application-crypto", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-vrf", - "sp-core", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-timestamp", - "sp-version", - "substrate-prometheus-endpoint", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-block-builder 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-consensus-babe 0.8.0-rc3", + "sp-consensus-vrf 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-timestamp 2.0.0-rc3", + "sp-version 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", ] [[package]] @@ -5637,17 +6214,30 @@ dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "sc-consensus-babe", - "sc-consensus-epochs", - "sc-keystore", - "sc-rpc-api", + "sc-consensus-babe 0.8.0-rc3", + "sc-consensus-epochs 0.8.0-rc3", + "sc-keystore 2.0.0-rc3", + "sc-rpc-api 0.8.0-rc3", "serde", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core", - "sp-runtime", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-consensus-babe 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", +] + +[[package]] +name = "sc-consensus-epochs" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "fork-tree 2.0.0-rc2", + "parity-scale-codec", + "parking_lot 0.10.2", + "sc-client-api 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", ] [[package]] @@ -5655,12 +6245,34 @@ name = "sc-consensus-epochs" version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "fork-tree", + "fork-tree 2.0.0-rc3", + "parity-scale-codec", + "parking_lot 0.10.2", + "sc-client-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", +] + +[[package]] +name = "sc-consensus-slots" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "futures 0.3.5", + "futures-timer 3.0.2", + "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", - "sc-client-api", - "sp-blockchain", - "sp-runtime", + "sc-client-api 2.0.0-rc2", + "sc-telemetry 2.0.0-rc2", + "sp-api 2.0.0-rc2", + "sp-application-crypto 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-core 2.0.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-state-machine 0.8.0-rc2", ] [[package]] @@ -5673,16 +6285,30 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", - "sc-client-api", - "sc-telemetry", - "sp-api", - "sp-application-crypto", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sc-client-api 2.0.0-rc3", + "sc-telemetry 2.0.0-rc3", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", +] + +[[package]] +name = "sc-consensus-uncles" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "log 0.4.8", + "sc-client-api 2.0.0-rc2", + "sp-authorship 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-core 2.0.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", ] [[package]] @@ -5691,12 +6317,39 @@ version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "log 0.4.8", - "sc-client-api", - "sp-authorship", - "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", + "sc-client-api 2.0.0-rc3", + "sp-authorship 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", +] + +[[package]] +name = "sc-executor" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "lazy_static", + "libsecp256k1", + "log 0.4.8", + "parity-scale-codec", + "parity-wasm", + "parking_lot 0.10.2", + "sc-executor-common 0.8.0-rc2", + "sc-executor-wasmi 0.8.0-rc2", + "sp-api 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-externalities 0.8.0-rc2", + "sp-io 2.0.0-rc2", + "sp-panic-handler 2.0.0-rc2", + "sp-runtime-interface 2.0.0-rc2", + "sp-serializer 2.0.0-rc2", + "sp-trie 2.0.0-rc2", + "sp-version 2.0.0-rc2", + "sp-wasm-interface 2.0.0-rc2", + "wasmi", ] [[package]] @@ -5711,19 +6364,36 @@ dependencies = [ "parity-scale-codec", "parity-wasm", "parking_lot 0.10.2", - "sc-executor-common", - "sc-executor-wasmi", + "sc-executor-common 0.8.0-rc3", + "sc-executor-wasmi 0.8.0-rc3", "sc-executor-wasmtime", - "sp-api", - "sp-core", - "sp-externalities", - "sp-io", - "sp-panic-handler", - "sp-runtime-interface", - "sp-serializer", - "sp-trie", - "sp-version", - "sp-wasm-interface", + "sp-api 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-externalities 0.8.0-rc3", + "sp-io 2.0.0-rc3", + "sp-panic-handler 2.0.0-rc3", + "sp-runtime-interface 2.0.0-rc3", + "sp-serializer 2.0.0-rc3", + "sp-trie 2.0.0-rc3", + "sp-version 2.0.0-rc3", + "sp-wasm-interface 2.0.0-rc3", + "wasmi", +] + +[[package]] +name = "sc-executor-common" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "log 0.4.8", + "parity-scale-codec", + "parity-wasm", + "sp-allocator 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime-interface 2.0.0-rc2", + "sp-serializer 2.0.0-rc2", + "sp-wasm-interface 2.0.0-rc2", "wasmi", ] @@ -5736,11 +6406,26 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parity-wasm", - "sp-allocator", - "sp-core", - "sp-runtime-interface", - "sp-serializer", - "sp-wasm-interface", + "sp-allocator 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime-interface 2.0.0-rc3", + "sp-serializer 2.0.0-rc3", + "sp-wasm-interface 2.0.0-rc3", + "wasmi", +] + +[[package]] +name = "sc-executor-wasmi" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "log 0.4.8", + "parity-scale-codec", + "sc-executor-common 0.8.0-rc2", + "sp-allocator 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime-interface 2.0.0-rc2", + "sp-wasm-interface 2.0.0-rc2", "wasmi", ] @@ -5751,11 +6436,11 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "log 0.4.8", "parity-scale-codec", - "sc-executor-common", - "sp-allocator", - "sp-core", - "sp-runtime-interface", - "sp-wasm-interface", + "sc-executor-common 0.8.0-rc3", + "sp-allocator 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime-interface 2.0.0-rc3", + "sp-wasm-interface 2.0.0-rc3", "wasmi", ] @@ -5769,17 +6454,54 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parity-wasm", - "sc-executor-common", + "sc-executor-common 0.8.0-rc3", "scoped-tls", - "sp-allocator", - "sp-core", - "sp-runtime-interface", - "sp-wasm-interface", + "sp-allocator 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime-interface 2.0.0-rc3", + "sp-wasm-interface 2.0.0-rc3", "substrate-wasmtime", "substrate-wasmtime-runtime", "wasmtime-environ", ] +[[package]] +name = "sc-finality-grandpa" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "assert_matches", + "derive_more 0.99.7", + "finality-grandpa", + "fork-tree 2.0.0-rc2", + "futures 0.3.5", + "futures-timer 3.0.2", + "log 0.4.8", + "parity-scale-codec", + "parking_lot 0.10.2", + "pin-project", + "rand 0.7.3", + "sc-block-builder 0.8.0-rc2", + "sc-client-api 2.0.0-rc2", + "sc-consensus 0.8.0-rc2", + "sc-keystore 2.0.0-rc2", + "sc-network 0.8.0-rc2", + "sc-network-gossip 0.8.0-rc2", + "sc-telemetry 2.0.0-rc2", + "serde_json", + "sp-api 2.0.0-rc2", + "sp-arithmetic 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-core 2.0.0-rc2", + "sp-finality-grandpa 2.0.0-rc2", + "sp-finality-tracker 2.0.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-utils 2.0.0-rc2", + "substrate-prometheus-endpoint 0.8.0-rc2", +] + [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc3" @@ -5788,7 +6510,7 @@ dependencies = [ "assert_matches", "derive_more 0.99.7", "finality-grandpa", - "fork-tree", + "fork-tree 2.0.0-rc3", "futures 0.3.5", "futures-timer 3.0.2", "log 0.4.8", @@ -5796,26 +6518,26 @@ dependencies = [ "parking_lot 0.10.2", "pin-project", "rand 0.7.3", - "sc-block-builder", - "sc-client-api", - "sc-consensus", - "sc-keystore", - "sc-network", - "sc-network-gossip", - "sc-telemetry", + "sc-block-builder 0.8.0-rc3", + "sc-client-api 2.0.0-rc3", + "sc-consensus 0.8.0-rc3", + "sc-keystore 2.0.0-rc3", + "sc-network 0.8.0-rc3", + "sc-network-gossip 0.8.0-rc3", + "sc-telemetry 2.0.0-rc3", "serde_json", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-finality-grandpa", - "sp-finality-tracker", - "sp-inherents", - "sp-runtime", - "sp-utils", - "substrate-prometheus-endpoint", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-arithmetic 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-finality-grandpa 2.0.0-rc3", + "sp-finality-tracker 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-utils 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", ] [[package]] @@ -5830,11 +6552,29 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "log 0.4.8", - "sc-finality-grandpa", + "sc-finality-grandpa 0.8.0-rc3", "serde", "serde_json", ] +[[package]] +name = "sc-informant" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "ansi_term 0.12.1", + "futures 0.3.5", + "log 0.4.8", + "parity-util-mem", + "sc-client-api 2.0.0-rc2", + "sc-network 0.8.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-transaction-pool 2.0.0-rc2", + "sp-utils 2.0.0-rc2", + "wasm-timer", +] + [[package]] name = "sc-informant" version = "0.8.0-rc3" @@ -5844,15 +6584,30 @@ dependencies = [ "futures 0.3.5", "log 0.4.8", "parity-util-mem", - "sc-client-api", - "sc-network", - "sp-blockchain", - "sp-runtime", - "sp-transaction-pool", - "sp-utils", + "sc-client-api 2.0.0-rc3", + "sc-network 0.8.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-utils 2.0.0-rc3", "wasm-timer", ] +[[package]] +name = "sc-keystore" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "hex", + "parking_lot 0.10.2", + "rand 0.7.3", + "serde_json", + "sp-application-crypto 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "subtle 2.2.2", +] + [[package]] name = "sc-keystore" version = "2.0.0-rc3" @@ -5863,8 +6618,8 @@ dependencies = [ "parking_lot 0.10.2", "rand 0.7.3", "serde_json", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 2.0.0-rc3", + "sp-core 2.0.0-rc3", "subtle 2.2.2", ] @@ -5877,14 +6632,66 @@ dependencies = [ "lazy_static", "parity-scale-codec", "parking_lot 0.10.2", - "sc-client-api", - "sc-executor", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-externalities", - "sp-runtime", - "sp-state-machine", + "sc-client-api 2.0.0-rc3", + "sc-executor 0.8.0-rc3", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-externalities 0.8.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", +] + +[[package]] +name = "sc-network" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "bitflags", + "bs58", + "bytes 0.5.4", + "derive_more 0.99.7", + "either", + "erased-serde", + "fnv", + "fork-tree 2.0.0-rc2", + "futures 0.3.5", + "futures-timer 3.0.2", + "futures_codec", + "hex", + "ip_network", + "libp2p", + "linked-hash-map", + "linked_hash_set", + "log 0.4.8", + "lru", + "nohash-hasher", + "parity-scale-codec", + "parking_lot 0.10.2", + "pin-project", + "prost", + "prost-build", + "rand 0.7.3", + "sc-block-builder 0.8.0-rc2", + "sc-client-api 2.0.0-rc2", + "sc-peerset 2.0.0-rc2", + "serde", + "serde_json", + "slog", + "slog_derive", + "smallvec 0.6.13", + "sp-arithmetic 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-utils 2.0.0-rc2", + "substrate-prometheus-endpoint 0.8.0-rc2", + "thiserror", + "unsigned-varint", + "void", + "wasm-timer", + "zeroize", ] [[package]] @@ -5899,7 +6706,7 @@ dependencies = [ "either", "erased-serde", "fnv", - "fork-tree", + "fork-tree 2.0.0-rc3", "futures 0.3.5", "futures-timer 3.0.2", "futures_codec", @@ -5917,21 +6724,21 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "sc-block-builder", - "sc-client-api", - "sc-peerset", + "sc-block-builder 0.8.0-rc3", + "sc-client-api 2.0.0-rc3", + "sc-peerset 2.0.0-rc3", "serde", "serde_json", "slog", "slog_derive", "smallvec 0.6.13", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-runtime", - "sp-utils", - "substrate-prometheus-endpoint", + "sp-arithmetic 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-utils 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", "thiserror", "unsigned-varint", "void", @@ -5939,6 +6746,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "sc-network-gossip" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "futures 0.3.5", + "futures-timer 3.0.2", + "libp2p", + "log 0.4.8", + "lru", + "sc-network 0.8.0-rc2", + "sp-runtime 2.0.0-rc2", + "wasm-timer", +] + [[package]] name = "sc-network-gossip" version = "0.8.0-rc3" @@ -5949,8 +6771,8 @@ dependencies = [ "libp2p", "log 0.4.8", "lru", - "sc-network", - "sp-runtime", + "sc-network 0.8.0-rc3", + "sp-runtime 2.0.0-rc3", "wasm-timer", ] @@ -5966,21 +6788,48 @@ dependencies = [ "log 0.4.8", "parking_lot 0.10.2", "rand 0.7.3", - "sc-block-builder", - "sc-client-api", - "sc-consensus", - "sc-network", - "sc-service", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core", - "sp-runtime", + "sc-block-builder 0.8.0-rc3", + "sc-client-api 2.0.0-rc3", + "sc-consensus 0.8.0-rc3", + "sc-network 0.8.0-rc3", + "sc-service 0.8.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-consensus-babe 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", "substrate-test-runtime", "substrate-test-runtime-client", "tempfile", ] +[[package]] +name = "sc-offchain" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "bytes 0.5.4", + "fnv", + "futures 0.3.5", + "futures-timer 3.0.2", + "hyper 0.13.5", + "hyper-rustls", + "log 0.4.8", + "num_cpus", + "parity-scale-codec", + "parking_lot 0.10.2", + "rand 0.7.3", + "sc-client-api 2.0.0-rc2", + "sc-keystore 2.0.0-rc2", + "sc-network 0.8.0-rc2", + "sp-api 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-offchain 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-utils 2.0.0-rc2", + "threadpool", +] + [[package]] name = "sc-offchain" version = "2.0.0-rc3" @@ -5997,17 +6846,30 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "rand 0.7.3", - "sc-client-api", - "sc-keystore", - "sc-network", - "sp-api", - "sp-core", - "sp-offchain", - "sp-runtime", - "sp-utils", + "sc-client-api 2.0.0-rc3", + "sc-keystore 2.0.0-rc3", + "sc-network 0.8.0-rc3", + "sp-api 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-offchain 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-utils 2.0.0-rc3", "threadpool", ] +[[package]] +name = "sc-peerset" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "futures 0.3.5", + "libp2p", + "log 0.4.8", + "serde_json", + "sp-utils 2.0.0-rc2", + "wasm-timer", +] + [[package]] name = "sc-peerset" version = "2.0.0-rc3" @@ -6017,7 +6879,7 @@ dependencies = [ "libp2p", "log 0.4.8", "serde_json", - "sp-utils", + "sp-utils 2.0.0-rc3", "wasm-timer", ] @@ -6027,7 +6889,39 @@ version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "log 0.4.8", - "substrate-prometheus-endpoint", + "substrate-prometheus-endpoint 0.8.0-rc3", +] + +[[package]] +name = "sc-rpc" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "futures 0.3.5", + "hash-db", + "jsonrpc-core", + "jsonrpc-pubsub", + "log 0.4.8", + "parity-scale-codec", + "parking_lot 0.10.2", + "sc-block-builder 0.8.0-rc2", + "sc-client-api 2.0.0-rc2", + "sc-executor 0.8.0-rc2", + "sc-keystore 2.0.0-rc2", + "sc-rpc-api 0.8.0-rc2", + "serde_json", + "sp-api 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-chain-spec 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-offchain 2.0.0-rc2", + "sp-rpc 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-session 2.0.0-rc2", + "sp-state-machine 0.8.0-rc2", + "sp-transaction-pool 2.0.0-rc2", + "sp-utils 2.0.0-rc2", + "sp-version 2.0.0-rc2", ] [[package]] @@ -6042,24 +6936,48 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", - "sc-block-builder", - "sc-client-api", - "sc-executor", - "sc-keystore", - "sc-rpc-api", + "sc-block-builder 0.8.0-rc3", + "sc-client-api 2.0.0-rc3", + "sc-executor 0.8.0-rc3", + "sc-keystore 2.0.0-rc3", + "sc-rpc-api 0.8.0-rc3", + "serde_json", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-chain-spec 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-offchain 2.0.0-rc3", + "sp-rpc 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-utils 2.0.0-rc3", + "sp-version 2.0.0-rc3", +] + +[[package]] +name = "sc-rpc-api" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "futures 0.3.5", + "jsonrpc-core", + "jsonrpc-core-client", + "jsonrpc-derive", + "jsonrpc-pubsub", + "log 0.4.8", + "parity-scale-codec", + "parking_lot 0.10.2", + "serde", "serde_json", - "sp-api", - "sp-blockchain", - "sp-chain-spec", - "sp-core", - "sp-offchain", - "sp-rpc", - "sp-runtime", - "sp-session", - "sp-state-machine", - "sp-transaction-pool", - "sp-utils", - "sp-version", + "sp-chain-spec 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-rpc 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-transaction-pool 2.0.0-rc2", + "sp-version 2.0.0-rc2", ] [[package]] @@ -6078,12 +6996,27 @@ dependencies = [ "parking_lot 0.10.2", "serde", "serde_json", - "sp-chain-spec", - "sp-core", - "sp-rpc", - "sp-runtime", - "sp-transaction-pool", - "sp-version", + "sp-chain-spec 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-rpc 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-version 2.0.0-rc3", +] + +[[package]] +name = "sc-rpc-server" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "jsonrpc-core", + "jsonrpc-http-server", + "jsonrpc-pubsub", + "jsonrpc-ws-server", + "log 0.4.8", + "serde", + "serde_json", + "sp-runtime 2.0.0-rc2", ] [[package]] @@ -6098,7 +7031,66 @@ dependencies = [ "log 0.4.8", "serde", "serde_json", - "sp-runtime", + "sp-runtime 2.0.0-rc3", +] + +[[package]] +name = "sc-service" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "exit-future", + "futures 0.1.29", + "futures 0.3.5", + "futures-timer 3.0.2", + "hash-db", + "lazy_static", + "log 0.4.8", + "netstat2", + "parity-multiaddr 0.7.3", + "parity-scale-codec", + "parity-util-mem", + "parking_lot 0.10.2", + "pin-project", + "procfs", + "rand 0.7.3", + "sc-block-builder 0.8.0-rc2", + "sc-chain-spec 2.0.0-rc2", + "sc-client-api 2.0.0-rc2", + "sc-client-db 0.8.0-rc2", + "sc-executor 0.8.0-rc2", + "sc-informant 0.8.0-rc2", + "sc-keystore 2.0.0-rc2", + "sc-network 0.8.0-rc2", + "sc-offchain 2.0.0-rc2", + "sc-rpc 2.0.0-rc2", + "sc-rpc-server 2.0.0-rc2", + "sc-telemetry 2.0.0-rc2", + "sc-tracing 2.0.0-rc2", + "sc-transaction-pool 2.0.0-rc2", + "serde", + "serde_json", + "slog", + "sp-api 2.0.0-rc2", + "sp-application-crypto 2.0.0-rc2", + "sp-block-builder 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-core 2.0.0-rc2", + "sp-externalities 0.8.0-rc2", + "sp-io 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-session 2.0.0-rc2", + "sp-state-machine 0.8.0-rc2", + "sp-transaction-pool 2.0.0-rc2", + "sp-trie 2.0.0-rc2", + "sp-utils 2.0.0-rc2", + "sp-version 2.0.0-rc2", + "substrate-prometheus-endpoint 0.8.0-rc2", + "sysinfo", + "tracing", + "wasm-timer", ] [[package]] @@ -6124,46 +7116,60 @@ dependencies = [ "pin-project", "procfs", "rand 0.7.3", - "sc-block-builder", - "sc-chain-spec", - "sc-client-api", - "sc-client-db", - "sc-executor", - "sc-informant", - "sc-keystore", + "sc-block-builder 0.8.0-rc3", + "sc-chain-spec 2.0.0-rc3", + "sc-client-api 2.0.0-rc3", + "sc-client-db 0.8.0-rc3", + "sc-executor 0.8.0-rc3", + "sc-informant 0.8.0-rc3", + "sc-keystore 2.0.0-rc3", "sc-light", - "sc-network", - "sc-offchain", - "sc-rpc", - "sc-rpc-server", - "sc-telemetry", - "sc-tracing", - "sc-transaction-pool", + "sc-network 0.8.0-rc3", + "sc-offchain 2.0.0-rc3", + "sc-rpc 2.0.0-rc3", + "sc-rpc-server 2.0.0-rc3", + "sc-telemetry 2.0.0-rc3", + "sc-tracing 2.0.0-rc3", + "sc-transaction-pool 2.0.0-rc3", "serde", "serde_json", "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", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-block-builder 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-externalities 0.8.0-rc3", + "sp-io 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-trie 2.0.0-rc3", + "sp-utils 2.0.0-rc3", + "sp-version 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", "sysinfo", "tempfile", "tracing", "wasm-timer", ] +[[package]] +name = "sc-state-db" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "log 0.4.8", + "parity-scale-codec", + "parity-util-mem", + "parity-util-mem-derive", + "parking_lot 0.10.2", + "sc-client-api 2.0.0-rc2", + "sp-core 2.0.0-rc2", +] + [[package]] name = "sc-state-db" version = "0.8.0-rc3" @@ -6174,8 +7180,30 @@ dependencies = [ "parity-util-mem", "parity-util-mem-derive", "parking_lot 0.10.2", - "sc-client-api", - "sp-core", + "sc-client-api 2.0.0-rc3", + "sp-core 2.0.0-rc3", +] + +[[package]] +name = "sc-telemetry" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "bytes 0.5.4", + "futures 0.3.5", + "futures-timer 3.0.2", + "libp2p", + "log 0.4.8", + "parking_lot 0.10.2", + "pin-project", + "rand 0.7.3", + "serde", + "slog", + "slog-json", + "slog-scope", + "take_mut", + "void", + "wasm-timer", ] [[package]] @@ -6200,6 +7228,21 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "sc-tracing" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "erased-serde", + "log 0.4.8", + "parking_lot 0.10.2", + "sc-telemetry 2.0.0-rc2", + "serde", + "serde_json", + "slog", + "tracing-core", +] + [[package]] name = "sc-tracing" version = "2.0.0-rc3" @@ -6208,13 +7251,33 @@ dependencies = [ "erased-serde", "log 0.4.8", "parking_lot 0.10.2", - "sc-telemetry", + "sc-telemetry 2.0.0-rc3", "serde", "serde_json", "slog", "tracing-core", ] +[[package]] +name = "sc-transaction-graph" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "futures 0.3.5", + "linked-hash-map", + "log 0.4.8", + "parity-util-mem", + "parking_lot 0.10.2", + "serde", + "sp-blockchain 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-transaction-pool 2.0.0-rc2", + "sp-utils 2.0.0-rc2", + "wasm-timer", +] + [[package]] name = "sc-transaction-graph" version = "2.0.0-rc3" @@ -6227,11 +7290,37 @@ dependencies = [ "parity-util-mem", "parking_lot 0.10.2", "serde", - "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-transaction-pool", - "sp-utils", + "sp-blockchain 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-utils 2.0.0-rc3", + "wasm-timer", +] + +[[package]] +name = "sc-transaction-pool" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "futures 0.3.5", + "futures-diagnose", + "intervalier", + "log 0.4.8", + "parity-scale-codec", + "parity-util-mem", + "parking_lot 0.10.2", + "sc-client-api 2.0.0-rc2", + "sc-transaction-graph 2.0.0-rc2", + "sp-api 2.0.0-rc2", + "sp-blockchain 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-tracing 2.0.0-rc2", + "sp-transaction-pool 2.0.0-rc2", + "sp-utils 2.0.0-rc2", + "substrate-prometheus-endpoint 0.8.0-rc2", "wasm-timer", ] @@ -6248,16 +7337,16 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", - "sc-client-api", - "sc-transaction-graph", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-tracing", - "sp-transaction-pool", - "sp-utils", - "substrate-prometheus-endpoint", + "sc-client-api 2.0.0-rc3", + "sc-transaction-graph 2.0.0-rc3", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-tracing 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-utils 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", "wasm-timer", ] @@ -6622,6 +7711,18 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sp-allocator" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "log 0.4.8", + "sp-core 2.0.0-rc2", + "sp-std 2.0.0-rc2", + "sp-wasm-interface 2.0.0-rc2", +] + [[package]] name = "sp-allocator" version = "2.0.0-rc3" @@ -6629,9 +7730,24 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "derive_more 0.99.7", "log 0.4.8", - "sp-core", - "sp-std", - "sp-wasm-interface", + "sp-core 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-wasm-interface 2.0.0-rc3", +] + +[[package]] +name = "sp-api" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "hash-db", + "parity-scale-codec", + "sp-api-proc-macro 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-state-machine 0.8.0-rc2", + "sp-std 2.0.0-rc2", + "sp-version 2.0.0-rc2", ] [[package]] @@ -6641,12 +7757,24 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "hash-db", "parity-scale-codec", - "sp-api-proc-macro", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-version", + "sp-api-proc-macro 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", + "sp-std 2.0.0-rc3", + "sp-version 2.0.0-rc3", +] + +[[package]] +name = "sp-api-proc-macro" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "blake2-rfc", + "proc-macro-crate", + "proc-macro2 1.0.17", + "quote 1.0.6", + "syn 1.0.27", ] [[package]] @@ -6661,6 +7789,18 @@ dependencies = [ "syn 1.0.27", ] +[[package]] +name = "sp-application-crypto" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "serde", + "sp-core 2.0.0-rc2", + "sp-io 2.0.0-rc2", + "sp-std 2.0.0-rc2", +] + [[package]] name = "sp-application-crypto" version = "2.0.0-rc3" @@ -6668,9 +7808,22 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-std", + "sp-core 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-arithmetic" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "integer-sqrt", + "num-traits 0.2.11", + "parity-scale-codec", + "serde", + "sp-debug-derive 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -6682,8 +7835,20 @@ dependencies = [ "num-traits 0.2.11", "parity-scale-codec", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-authority-discovery" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "sp-api 2.0.0-rc2", + "sp-application-crypto 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -6692,10 +7857,21 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-application-crypto", - "sp-runtime", - "sp-std", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-authorship" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "sp-inherents 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -6704,9 +7880,21 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-block-builder" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "sp-api 2.0.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -6715,10 +7903,26 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-api 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-blockchain" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "log 0.4.8", + "lru", + "parity-scale-codec", + "parking_lot 0.10.2", + "sp-block-builder 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-state-machine 0.8.0-rc2", ] [[package]] @@ -6731,10 +7935,19 @@ dependencies = [ "lru", "parity-scale-codec", "parking_lot 0.10.2", - "sp-block-builder", - "sp-consensus", - "sp-runtime", - "sp-state-machine", + "sp-block-builder 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", +] + +[[package]] +name = "sp-chain-spec" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "serde", + "serde_json", ] [[package]] @@ -6746,6 +7959,29 @@ dependencies = [ "serde_json", ] +[[package]] +name = "sp-consensus" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "futures 0.3.5", + "futures-timer 3.0.2", + "libp2p", + "log 0.4.8", + "parity-scale-codec", + "parking_lot 0.10.2", + "serde", + "sp-core 2.0.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-state-machine 0.8.0-rc2", + "sp-std 2.0.0-rc2", + "sp-utils 2.0.0-rc2", + "sp-version 2.0.0-rc2", + "substrate-prometheus-endpoint 0.8.0-rc2", +] + [[package]] name = "sp-consensus" version = "0.8.0-rc3" @@ -6759,14 +7995,14 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "serde", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-utils", - "sp-version", - "substrate-prometheus-endpoint", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", + "sp-std 2.0.0-rc3", + "sp-utils 2.0.0-rc3", + "sp-version 2.0.0-rc3", + "substrate-prometheus-endpoint 0.8.0-rc3", ] [[package]] @@ -6775,12 +8011,29 @@ version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-application-crypto", - "sp-inherents", - "sp-runtime", - "sp-std", - "sp-timestamp", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-timestamp 2.0.0-rc3", +] + +[[package]] +name = "sp-consensus-babe" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "merlin", + "parity-scale-codec", + "sp-api 2.0.0-rc2", + "sp-application-crypto 2.0.0-rc2", + "sp-consensus 0.8.0-rc2", + "sp-consensus-vrf 0.8.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", + "sp-timestamp 2.0.0-rc2", ] [[package]] @@ -6790,14 +8043,26 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "merlin", "parity-scale-codec", - "sp-api", - "sp-application-crypto", - "sp-consensus", - "sp-consensus-vrf", - "sp-inherents", - "sp-runtime", - "sp-std", - "sp-timestamp", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-consensus-vrf 0.8.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-timestamp 2.0.0-rc3", +] + +[[package]] +name = "sp-consensus-vrf" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "schnorrkel", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -6807,9 +8072,51 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "parity-scale-codec", "schnorrkel", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-core" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "base58", + "blake2-rfc", + "byteorder", + "derive_more 0.99.7", + "ed25519-dalek", + "futures 0.3.5", + "hash-db", + "hash256-std-hasher", + "hex", + "impl-serde 0.3.1", + "lazy_static", + "libsecp256k1", + "log 0.4.8", + "merlin", + "num-traits 0.2.11", + "parity-scale-codec", + "parity-util-mem", + "parking_lot 0.10.2", + "primitive-types", + "rand 0.7.3", + "regex", + "schnorrkel", + "serde", + "sha2", + "sp-debug-derive 2.0.0-rc2", + "sp-externalities 0.8.0-rc2", + "sp-runtime-interface 2.0.0-rc2", + "sp-std 2.0.0-rc2", + "sp-storage 2.0.0-rc2", + "substrate-bip39", + "tiny-bip39", + "tiny-keccak 2.0.2", + "twox-hash", + "wasmi", + "zeroize", ] [[package]] @@ -6841,11 +8148,11 @@ dependencies = [ "schnorrkel", "serde", "sha2", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-debug-derive 2.0.0-rc3", + "sp-externalities 0.8.0-rc3", + "sp-runtime-interface 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-storage 2.0.0-rc3", "substrate-bip39", "tiny-bip39", "tiny-keccak 2.0.2", @@ -6854,6 +8161,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "sp-database" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "kvdb", + "parking_lot 0.10.2", +] + [[package]] name = "sp-database" version = "2.0.0-rc3" @@ -6863,6 +8179,16 @@ dependencies = [ "parking_lot 0.10.2", ] +[[package]] +name = "sp-debug-derive" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "proc-macro2 1.0.17", + "quote 1.0.6", + "syn 1.0.27", +] + [[package]] name = "sp-debug-derive" version = "2.0.0-rc3" @@ -6873,6 +8199,17 @@ dependencies = [ "syn 1.0.27", ] +[[package]] +name = "sp-externalities" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 2.0.0-rc2", + "sp-storage 2.0.0-rc2", +] + [[package]] name = "sp-externalities" version = "0.8.0-rc3" @@ -6880,8 +8217,24 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 2.0.0-rc3", + "sp-storage 2.0.0-rc3", +] + +[[package]] +name = "sp-finality-grandpa" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "finality-grandpa", + "log 0.4.8", + "parity-scale-codec", + "serde", + "sp-api 2.0.0-rc2", + "sp-application-crypto 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -6893,11 +8246,21 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-runtime", - "sp-std", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-finality-tracker" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "sp-inherents 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -6906,8 +8269,20 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-inherents", - "sp-std", + "sp-inherents 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-inherents" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "parity-scale-codec", + "parking_lot 0.10.2", + "sp-core 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -6918,8 +8293,28 @@ dependencies = [ "derive_more 0.99.7", "parity-scale-codec", "parking_lot 0.10.2", - "sp-core", - "sp-std", + "sp-core 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-io" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "futures 0.3.5", + "hash-db", + "libsecp256k1", + "log 0.4.8", + "parity-scale-codec", + "parking_lot 0.10.2", + "sp-core 2.0.0-rc2", + "sp-externalities 0.8.0-rc2", + "sp-runtime-interface 2.0.0-rc2", + "sp-state-machine 0.8.0-rc2", + "sp-std 2.0.0-rc2", + "sp-trie 2.0.0-rc2", + "sp-wasm-interface 2.0.0-rc2", ] [[package]] @@ -6933,13 +8328,24 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", - "sp-core", - "sp-externalities", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-wasm-interface", + "sp-core 2.0.0-rc3", + "sp-externalities 0.8.0-rc3", + "sp-runtime-interface 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", + "sp-std 2.0.0-rc3", + "sp-trie 2.0.0-rc3", + "sp-wasm-interface 2.0.0-rc3", +] + +[[package]] +name = "sp-keyring" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "lazy_static", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "strum", ] [[package]] @@ -6948,8 +8354,8 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "lazy_static", - "sp-core", - "sp-runtime", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", "strum", ] @@ -6960,9 +8366,9 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "parity-scale-codec", "serde", - "sp-arithmetic", + "sp-arithmetic 2.0.0-rc3", "sp-npos-elections-compact", - "sp-std", + "sp-std 2.0.0-rc3", ] [[package]] @@ -6976,14 +8382,33 @@ dependencies = [ "syn 1.0.27", ] +[[package]] +name = "sp-offchain" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "sp-api 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", +] + [[package]] name = "sp-offchain" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "sp-api", - "sp-core", - "sp-runtime", + "sp-api 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", +] + +[[package]] +name = "sp-panic-handler" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "backtrace", + "log 0.4.8", ] [[package]] @@ -6995,13 +8420,66 @@ dependencies = [ "log 0.4.8", ] +[[package]] +name = "sp-phragmen" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "serde", + "sp-arithmetic 2.0.0-rc2", + "sp-phragmen-compact", + "sp-std 2.0.0-rc2", +] + +[[package]] +name = "sp-phragmen-compact" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "proc-macro-crate", + "proc-macro2 1.0.17", + "quote 1.0.6", + "syn 1.0.27", +] + +[[package]] +name = "sp-rpc" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "serde", + "sp-core 2.0.0-rc2", +] + [[package]] name = "sp-rpc" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "serde", - "sp-core", + "sp-core 2.0.0-rc3", +] + +[[package]] +name = "sp-runtime" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "hash256-std-hasher", + "impl-trait-for-tuples", + "log 0.4.8", + "parity-scale-codec", + "parity-util-mem", + "paste", + "rand 0.7.3", + "serde", + "sp-application-crypto 2.0.0-rc2", + "sp-arithmetic 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-io 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -7018,12 +8496,27 @@ dependencies = [ "paste", "rand 0.7.3", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-inherents", - "sp-io", - "sp-std", + "sp-application-crypto 2.0.0-rc3", + "sp-arithmetic 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-runtime-interface" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.8.0-rc2", + "sp-runtime-interface-proc-macro 2.0.0-rc2", + "sp-std 2.0.0-rc2", + "sp-tracing 2.0.0-rc2", + "sp-wasm-interface 2.0.0-rc2", + "static_assertions", ] [[package]] @@ -7033,14 +8526,26 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.8.0-rc3", + "sp-runtime-interface-proc-macro 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-tracing 2.0.0-rc3", + "sp-wasm-interface 2.0.0-rc3", "static_assertions", ] +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "Inflector", + "proc-macro-crate", + "proc-macro2 1.0.17", + "quote 1.0.6", + "syn 1.0.27", +] + [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc3" @@ -7053,6 +8558,15 @@ dependencies = [ "syn 1.0.27", ] +[[package]] +name = "sp-serializer" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "sp-serializer" version = "2.0.0-rc3" @@ -7062,17 +8576,40 @@ dependencies = [ "serde_json", ] +[[package]] +name = "sp-session" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "sp-api 2.0.0-rc2", + "sp-core 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-staking 2.0.0-rc2", + "sp-std 2.0.0-rc2", +] + [[package]] name = "sp-session" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-core", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-api 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-staking" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "parity-scale-codec", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", ] [[package]] @@ -7081,8 +8618,27 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-state-machine" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "hash-db", + "log 0.4.8", + "num-traits 0.2.11", + "parity-scale-codec", + "parking_lot 0.10.2", + "rand 0.7.3", + "sp-core 2.0.0-rc2", + "sp-externalities 0.8.0-rc2", + "sp-panic-handler 2.0.0-rc2", + "sp-trie 2.0.0-rc2", + "trie-db", + "trie-root", ] [[package]] @@ -7096,19 +8652,36 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "rand 0.7.3", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-trie", + "sp-core 2.0.0-rc3", + "sp-externalities 0.8.0-rc3", + "sp-panic-handler 2.0.0-rc3", + "sp-trie 2.0.0-rc3", "trie-db", "trie-root", ] +[[package]] +name = "sp-std" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" + [[package]] name = "sp-std" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" +[[package]] +name = "sp-storage" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "impl-serde 0.2.3", + "ref-cast", + "serde", + "sp-debug-derive 2.0.0-rc2", + "sp-std 2.0.0-rc2", +] + [[package]] name = "sp-storage" version = "2.0.0-rc3" @@ -7117,8 +8690,22 @@ dependencies = [ "impl-serde 0.2.3", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-timestamp" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "sp-api 2.0.0-rc2", + "sp-inherents 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", + "wasm-timer", ] [[package]] @@ -7128,13 +8715,21 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", - "sp-api", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-api 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", "wasm-timer", ] +[[package]] +name = "sp-tracing" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "tracing", +] + [[package]] name = "sp-tracing" version = "2.0.0-rc3" @@ -7143,6 +8738,21 @@ dependencies = [ "tracing", ] +[[package]] +name = "sp-transaction-pool" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "derive_more 0.99.7", + "futures 0.3.5", + "log 0.4.8", + "parity-scale-codec", + "serde", + "sp-api 2.0.0-rc2", + "sp-runtime 2.0.0-rc2", + "sp-utils 2.0.0-rc2", +] + [[package]] name = "sp-transaction-pool" version = "2.0.0-rc3" @@ -7153,10 +8763,24 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "serde", - "sp-api", - "sp-blockchain", - "sp-runtime", - "sp-utils", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-utils 2.0.0-rc3", +] + +[[package]] +name = "sp-trie" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "hash-db", + "memory-db", + "parity-scale-codec", + "sp-core 2.0.0-rc2", + "sp-std 2.0.0-rc2", + "trie-db", + "trie-root", ] [[package]] @@ -7167,12 +8791,23 @@ dependencies = [ "hash-db", "memory-db", "parity-scale-codec", - "sp-core", - "sp-std", + "sp-core 2.0.0-rc3", + "sp-std 2.0.0-rc3", "trie-db", "trie-root", ] +[[package]] +name = "sp-utils" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "futures 0.3.5", + "futures-core", + "lazy_static", + "prometheus", +] + [[package]] name = "sp-utils" version = "2.0.0-rc3" @@ -7184,6 +8819,18 @@ dependencies = [ "prometheus", ] +[[package]] +name = "sp-version" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "impl-serde 0.2.3", + "parity-scale-codec", + "serde", + "sp-runtime 2.0.0-rc2", + "sp-std 2.0.0-rc2", +] + [[package]] name = "sp-version" version = "2.0.0-rc3" @@ -7192,8 +8839,19 @@ dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0-rc3", + "sp-std 2.0.0-rc3", +] + +[[package]] +name = "sp-wasm-interface" +version = "2.0.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "sp-std 2.0.0-rc2", + "wasmi", ] [[package]] @@ -7203,7 +8861,7 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", - "sp-std", + "sp-std 2.0.0-rc3", "wasmi", ] @@ -7234,6 +8892,15 @@ dependencies = [ "rand 0.5.6", ] +[[package]] +name = "stream-cipher" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" +dependencies = [ + "generic-array", +] + [[package]] name = "streamunordered" version = "0.5.1" @@ -7345,11 +9012,11 @@ dependencies = [ "log 0.4.8", "rand 0.6.5", "rand 0.7.3", - "sc-chain-spec", - "sc-informant", - "sc-network", - "sc-service", - "sp-database", + "sc-chain-spec 2.0.0-rc3", + "sc-informant 0.8.0-rc3", + "sc-network 0.8.0-rc3", + "sc-service 0.8.0-rc3", + "sp-database 2.0.0-rc3", "wasm-bindgen", "wasm-bindgen-futures", ] @@ -7367,20 +9034,34 @@ name = "substrate-frame-rpc-system" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-system-rpc-runtime-api", + "frame-system-rpc-runtime-api 2.0.0-rc3", "futures 0.3.5", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "log 0.4.8", "parity-scale-codec", - "sc-client-api", + "sc-client-api 2.0.0-rc3", "serde", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-transaction-pool", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", +] + +[[package]] +name = "substrate-prometheus-endpoint" +version = "0.8.0-rc2" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +dependencies = [ + "async-std", + "derive_more 0.99.7", + "futures-util", + "hyper 0.13.5", + "log 0.4.8", + "prometheus", + "tokio 0.2.21", ] [[package]] @@ -7405,18 +9086,18 @@ dependencies = [ "futures 0.3.5", "hash-db", "parity-scale-codec", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-executor", + "sc-client-api 2.0.0-rc3", + "sc-client-db 0.8.0-rc3", + "sc-consensus 0.8.0-rc3", + "sc-executor 0.8.0-rc3", "sc-light", - "sc-service", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-keyring", - "sp-runtime", - "sp-state-machine", + "sc-service 0.8.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-state-machine 0.8.0-rc3", ] [[package]] @@ -7426,35 +9107,35 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "cfg-if", "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", + "frame-system-rpc-runtime-api 2.0.0-rc3", "log 0.4.8", "memory-db", - "pallet-babe", - "pallet-timestamp", + "pallet-babe 2.0.0-rc3", + "pallet-timestamp 2.0.0-rc3", "parity-scale-codec", "parity-util-mem", - "sc-service", + "sc-service 0.8.0-rc3", "serde", - "sp-api", - "sp-application-crypto", - "sp-block-builder", + "sp-api 2.0.0-rc3", + "sp-application-crypto 2.0.0-rc3", + "sp-block-builder 2.0.0-rc3", "sp-consensus-aura", - "sp-consensus-babe", - "sp-core", - "sp-finality-grandpa", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-offchain", - "sp-runtime", - "sp-runtime-interface", - "sp-session", - "sp-std", - "sp-transaction-pool", - "sp-trie", - "sp-version", + "sp-consensus-babe 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-finality-grandpa 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-offchain 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-runtime-interface 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-trie 2.0.0-rc3", + "sp-version 2.0.0-rc3", "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate)", "trie-db", ] @@ -7466,16 +9147,16 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "futures 0.3.5", "parity-scale-codec", - "sc-block-builder", - "sc-client-api", - "sc-consensus", + "sc-block-builder 0.8.0-rc3", + "sc-client-api 2.0.0-rc3", + "sc-consensus 0.8.0-rc3", "sc-light", - "sc-service", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-runtime", + "sc-service 0.8.0-rc3", + "sp-api 2.0.0-rc3", + "sp-blockchain 2.0.0-rc3", + "sp-consensus 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", "substrate-test-client", "substrate-test-runtime", ] @@ -7714,7 +9395,7 @@ dependencies = [ "dlmalloc", "parity-scale-codec", "polkadot-parachain", - "sp-io", + "sp-io 2.0.0-rc3", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", ] @@ -7729,8 +9410,8 @@ dependencies = [ "polkadot-collator", "polkadot-parachain", "polkadot-primitives", - "sc-client-api", - "sp-core", + "sc-client-api 2.0.0-rc3", + "sp-core 2.0.0-rc3", "test-parachain-adder", ] @@ -7741,7 +9422,7 @@ dependencies = [ "dlmalloc", "parity-scale-codec", "polkadot-parachain", - "sp-io", + "sp-io 2.0.0-rc3", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", ] @@ -8210,6 +9891,17 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" +[[package]] +name = "twofish" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712d261e83e727c8e2dbb75dacac67c36e35db36a958ee504f2164fc052434e1" +dependencies = [ + "block-cipher-trait", + "byteorder", + "opaque-debug", +] + [[package]] name = "twox-hash" version = "1.5.0" @@ -8619,18 +10311,18 @@ name = "westend-runtime" version = "0.8.7" dependencies = [ "bitvec", - "frame-benchmarking", + "frame-benchmarking 2.0.0-rc3", "frame-executive", - "frame-support", - "frame-system", + "frame-support 2.0.0-rc3", + "frame-system 2.0.0-rc3", "frame-system-benchmarking", - "frame-system-rpc-runtime-api", + "frame-system-rpc-runtime-api 2.0.0-rc3", "hex-literal", "libsecp256k1", "log 0.3.9", "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", + "pallet-authorship 2.0.0-rc3", + "pallet-babe 2.0.0-rc3", "pallet-balances", "pallet-collective", "pallet-democracy", @@ -8638,7 +10330,7 @@ dependencies = [ "pallet-finality-tracker", "pallet-grandpa", "pallet-identity", - "pallet-im-online", + "pallet-im-online 2.0.0-rc3", "pallet-indices", "pallet-membership", "pallet-multisig", @@ -8649,15 +10341,15 @@ dependencies = [ "pallet-randomness-collective-flip", "pallet-recovery", "pallet-scheduler", - "pallet-session", + "pallet-session 2.0.0-rc3", "pallet-session-benchmarking", "pallet-society", - "pallet-staking", + "pallet-staking 2.0.0-rc3", "pallet-staking-reward-curve", "pallet-sudo", - "pallet-timestamp", + "pallet-timestamp 2.0.0-rc3", "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", "pallet-treasury", "pallet-utility", "pallet-vesting", @@ -8670,22 +10362,22 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.4.0", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-trie", - "sp-version", + "sp-api 2.0.0-rc3", + "sp-authority-discovery 2.0.0-rc3", + "sp-block-builder 2.0.0-rc3", + "sp-consensus-babe 0.8.0-rc3", + "sp-core 2.0.0-rc3", + "sp-inherents 2.0.0-rc3", + "sp-io 2.0.0-rc3", + "sp-keyring 2.0.0-rc3", + "sp-offchain 2.0.0-rc3", + "sp-runtime 2.0.0-rc3", + "sp-session 2.0.0-rc3", + "sp-staking 2.0.0-rc3", + "sp-std 2.0.0-rc3", + "sp-transaction-pool 2.0.0-rc3", + "sp-trie 2.0.0-rc3", + "sp-version 2.0.0-rc3", "static_assertions", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", diff --git a/Cargo.toml b/Cargo.toml index 7b6d6aed5502..ecdb2acada20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,6 +27,7 @@ members = [ "erasure-coding", "network", "network/test", + "polkadot-test", "primitives", "runtime/common", "runtime/parachains", diff --git a/polkadot-test/Cargo.toml b/polkadot-test/Cargo.toml new file mode 100644 index 000000000000..151b52f8f113 --- /dev/null +++ b/polkadot-test/Cargo.toml @@ -0,0 +1,71 @@ +[package] +name = "polkadot-test" +version = "0.8.2" +authors = ["Parity Technologies "] +edition = "2018" + +[dependencies] +parking_lot = "0.9.0" +serde = { version = "1.0.102", features = ["derive"] } +lazy_static = "1.4.0" +log = "0.4.8" +futures = "0.3.4" +slog = "2.5.2" +hex-literal = "0.2.1" +av_store = { package = "polkadot-availability-store", path = "../availability-store", optional = true } +consensus = { package = "polkadot-validation", path = "../validation", optional = true } +polkadot-primitives = { path = "../primitives" } +polkadot-runtime = { path = "../runtime/polkadot" } +kusama-runtime = { path = "../runtime/kusama" } +westend-runtime = { path = "../runtime/westend" } +polkadot-test-runtime = { path = "../runtime/test-runtime" } +polkadot-network = { path = "../network", optional = true } +polkadot-rpc = { path = "../rpc" } +polkadot-service = { path = "../service" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +codec = { package = "parity-scale-codec", version = "1.3.0" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } + +[dev-dependencies] +polkadot-test-runtime-client = { path = "../runtime/test-runtime/client" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +env_logger = "0.7.0" + +[features] +default = ["db", "full-node"] +db = ["service/db"] +runtime-benchmarks = ["polkadot-runtime/runtime-benchmarks", "kusama-runtime/runtime-benchmarks", "westend-runtime/runtime-benchmarks"] +full-node = ["av_store", "consensus", "polkadot-network"] diff --git a/polkadot-test/src/lib.rs b/polkadot-test/src/lib.rs new file mode 100644 index 000000000000..4d8c2c320318 --- /dev/null +++ b/polkadot-test/src/lib.rs @@ -0,0 +1,92 @@ +// Copyright 2017-2020 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. + +// Polkadot is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Polkadot is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . + +//! Polkadot service. Specialized wrapper over substrate service. + +//pub mod chain_spec; +//mod grandpa_support; +//mod client; + +use std::sync::Arc; +use std::time::Duration; +use polkadot_primitives::{parachain, Hash, BlockId, AccountId, Nonce, Balance}; +#[cfg(feature = "full-node")] +use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; +use service::{error::Error as ServiceError, ServiceBuilder}; +use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider}; +use sc_executor::native_executor_instance; +use log::info; +pub use service::{ + AbstractService, Role, PruningMode, TransactionPoolOptions, Error, RuntimeGenesis, + TFullClient, TLightClient, TFullBackend, TLightBackend, TFullCallExecutor, TLightCallExecutor, + Configuration, ChainSpec, ServiceBuilderCommand, +}; +pub use service::config::{DatabaseConfig, PrometheusConfig}; +pub use sc_executor::NativeExecutionDispatch; +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}; +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}; +pub use polkadot_service::{PolkadotChainSpec, KusamaChainSpec, WestendChainSpec}; +#[cfg(feature = "full-node")] +pub use consensus::run_validation_worker; +pub use codec::Codec; +pub use polkadot_runtime; +pub use kusama_runtime; +pub use westend_runtime; +pub use polkadot_test_runtime; +use prometheus_endpoint::Registry; +pub use polkadot_service::PolkadotClient; +pub use polkadot_service::{grandpa_support, new_full, new_full_start, FullNodeHandles, IdentifyVariant, PolkadotExecutor}; + +/// Create a new Polkadot test service for a full node. +pub fn polkadot_test_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)>, + informant_prefix: Option, +) + -> Result<( + impl AbstractService, + Arc, + polkadot_test_runtime::RuntimeApi + >>, + FullNodeHandles, + ), ServiceError> +{ + let (service, client, handles) = new_full!( + config, + collating_for, + max_block_data_size, + authority_discovery_enabled, + slot_duration, + grandpa_pause, + polkadot_test_runtime::RuntimeApi, + PolkadotExecutor, + informant_prefix, + ); + + Ok((service, client, handles)) +} diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index e857944bb657..6d21b10213eb 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -14,6 +14,7 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.0" +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 } @@ -28,6 +29,7 @@ version = { package = "sp-version", git = "https://github.com/paritytech/substra 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 = "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 } @@ -70,6 +72,8 @@ default = ["std"] no_std = [] only-staking = [] std = [ + "authority-discovery-primitives/std", + "authority-discovery/std", "bitvec/std", "primitives/std", "rustc-hex/std", @@ -80,6 +84,7 @@ std = [ "sp-api/std", "tx-pool-api/std", "block-builder-api/std", + "offchain-primitives/std", "rstd/std", "sp-io/std", "frame-support/std", diff --git a/runtime/test-runtime/src/genesismap.rs b/runtime/test-runtime/src/genesismap.rs index f3ae9693d149..bd0a8cbc75f0 100644 --- a/runtime/test-runtime/src/genesismap.rs +++ b/runtime/test-runtime/src/genesismap.rs @@ -67,6 +67,7 @@ impl GenesisConfig { parachains: None, registrar: None, vesting: None, + authority_discovery: None, }; config.assimilate_storage(&mut storage).expect("Adding `system::GensisConfig` to the genesis"); diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 93fc3ba092cd..5712290ae3f7 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -54,6 +54,7 @@ use frame_support::{ traits::{KeyOwnerProofSystem, Randomness}, weights::Weight, }; +use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo; use session::historical as session_historical; @@ -435,6 +436,8 @@ impl offences::Trait for Runtime { type WeightSoftLimit = OffencesWeightSoftLimit; } +impl authority_discovery::Trait for Runtime {} + parameter_types! { pub const ParathreadDeposit: Balance = 5 * DOLLARS; pub const QueueSize: usize = 2; @@ -512,6 +515,7 @@ construct_runtime! { Historical: session_historical::{Module}, Session: session::{Module, Call, Storage, Event, Config}, Grandpa: grandpa::{Module, Call, Storage, Config, Event}, + AuthorityDiscovery: authority_discovery::{Module, Call, Config}, // Claims. Usable initially. Claims: claims::{Module, Call, Storage, Event, Config, ValidateUnsigned}, @@ -624,6 +628,14 @@ sp_api::impl_runtime_apis! { } } + impl authority_discovery_primitives::AuthorityDiscoveryApi for Runtime { + fn authorities() -> Vec { + // TODO and to fix + //AuthorityDiscovery::authorities() + Vec::new() + } + } + impl parachain::ParachainHost for Runtime { fn validators() -> Vec { Parachains::authorities() diff --git a/service/Cargo.toml b/service/Cargo.toml index 0088415b1ad8..9c50b3c99a81 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -18,7 +18,6 @@ polkadot-primitives = { path = "../primitives" } polkadot-runtime = { path = "../runtime/polkadot" } kusama-runtime = { path = "../runtime/kusama" } westend-runtime = { path = "../runtime/westend" } -polkadot-test-runtime = { path = "../runtime/test-runtime", optional = true } polkadot-network = { path = "../network", optional = true } polkadot-rpc = { path = "../rpc" } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -68,4 +67,3 @@ default = ["db", "full-node"] db = ["service/db"] runtime-benchmarks = ["polkadot-runtime/runtime-benchmarks", "kusama-runtime/runtime-benchmarks", "westend-runtime/runtime-benchmarks"] full-node = ["av_store", "consensus", "polkadot-network"] -test = ["polkadot-test-runtime"] diff --git a/service/src/grandpa_support.rs b/service/src/grandpa_support.rs index a875c4b45a37..735f0fc44a99 100644 --- a/service/src/grandpa_support.rs +++ b/service/src/grandpa_support.rs @@ -23,7 +23,7 @@ use sp_runtime::traits::{Block as BlockT, NumberFor}; /// same last finalized block) after a given block at height `N` has been /// finalized and for a delay of `M` blocks, i.e. until the best block reaches /// `N` + `M`, the voter will keep voting for block `N`. -pub(crate) struct PauseAfterBlockFor(pub(crate) N, pub(crate) N); +pub struct PauseAfterBlockFor(pub N, pub N); impl grandpa::VotingRule for PauseAfterBlockFor> where Block: BlockT, @@ -96,7 +96,7 @@ impl grandpa::VotingRule for PauseAfterBlockFor Vec<( +pub fn kusama_hard_forks() -> Vec<( grandpa_primitives::SetId, (Hash, polkadot_primitives::BlockNumber), grandpa_primitives::AuthorityList, diff --git a/service/src/lib.rs b/service/src/lib.rs index a0ee17c8cb76..e7f2210f4939 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -17,7 +17,7 @@ //! Polkadot service. Specialized wrapper over substrate service. pub mod chain_spec; -mod grandpa_support; +pub mod grandpa_support; mod client; use std::sync::Arc; @@ -138,7 +138,7 @@ impl IdentifyVariant for Box { } // If we're using prometheus, use a registry with a prefix of `polkadot`. -fn set_prometheus_registry(config: &mut Configuration) -> Result<(), ServiceError> { +pub fn set_prometheus_registry(config: &mut Configuration) -> Result<(), ServiceError> { if let Some(PrometheusConfig { registry, .. }) = config.prometheus_config.as_mut() { *registry = Registry::new_custom(Some("polkadot".into()), None)?; } @@ -150,9 +150,10 @@ fn set_prometheus_registry(config: &mut Configuration) -> Result<(), ServiceErro /// /// Use this macro if you don't actually need the full service, but just the builder in order to /// be able to perform chain operations. +#[macro_export] macro_rules! new_full_start { ($config:expr, $runtime:ty, $executor:ty, $informant_prefix:expr $(,)?) => {{ - set_prometheus_registry(&mut $config)?; + $crate::set_prometheus_registry(&mut $config)?; let mut import_setup = None; let mut rpc_setup = None; @@ -554,7 +555,7 @@ macro_rules! new_full { #[macro_export] macro_rules! new_light { ($config:expr, $runtime:ty, $dispatch:ty) => {{ - crate::set_prometheus_registry(&mut $config)?; + $crate::set_prometheus_registry(&mut $config)?; let inherent_data_providers = inherents::InherentDataProviders::new(); ServiceBuilder::new_light::($config)? @@ -762,42 +763,6 @@ pub fn westend_new_full( Ok((service, client, handles)) } -/// Create a new Polkadot test service for a full node. -#[cfg(feature = "full-node")] -#[cfg(feature = "test")] -pub fn polkadot_test_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)>, - informant_prefix: Option, -) - -> Result<( - impl AbstractService, - Arc, - polkadot_test_runtime::RuntimeApi - >>, - FullNodeHandles, - ), ServiceError> -{ - let (service, client, handles) = new_full!( - config, - collating_for, - max_block_data_size, - authority_discovery_enabled, - slot_duration, - grandpa_pause, - polkadot_test_runtime::RuntimeApi, - PolkadotExecutor, - informant_prefix, - ); - - Ok((service, client, handles)) -} /// Handles to other sub-services that full nodes instantiate, which consumers /// of the node may use. #[cfg(feature = "full-node")] From ffa95f1cda51490c344327f5f023a088466b18b3 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 10:47:55 +0200 Subject: [PATCH 03/92] WIP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 3760 +++++++++++--------------------------- polkadot-test/Cargo.toml | 72 +- polkadot-test/src/lib.rs | 1 - 3 files changed, 1101 insertions(+), 2732 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a9217fc89f2..836749ef5d19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,40 +25,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -[[package]] -name = "aes-ctr" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" -dependencies = [ - "aes-soft", - "aesni", - "ctr", - "stream-cipher", -] - -[[package]] -name = "aes-soft" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" -dependencies = [ - "block-cipher-trait", - "byteorder", - "opaque-debug", -] - -[[package]] -name = "aesni" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" -dependencies = [ - "block-cipher-trait", - "opaque-debug", - "stream-cipher", -] - [[package]] name = "ahash" version = "0.2.18" @@ -401,15 +367,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-cipher-trait" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" -dependencies = [ - "generic-array", -] - [[package]] name = "block-padding" version = "0.1.5" @@ -830,16 +787,6 @@ dependencies = [ "sct", ] -[[package]] -name = "ctr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" -dependencies = [ - "block-cipher-trait", - "stream-cipher", -] - [[package]] name = "curve25519-dalek" version = "2.0.0" @@ -1221,14 +1168,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "fork-tree" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", -] - [[package]] name = "fork-tree" version = "2.0.0-rc3" @@ -1237,38 +1176,21 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "frame-benchmarking" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "frame-support 2.0.0-rc2", - "frame-system 2.0.0-rc2", - "linregress", - "parity-scale-codec", - "paste", - "sp-api 2.0.0-rc2", - "sp-io 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-runtime-interface 2.0.0-rc2", - "sp-std 2.0.0-rc2", -] - [[package]] name = "frame-benchmarking" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "linregress", "parity-scale-codec", "paste", - "sp-api 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-runtime-interface 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-api", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", ] [[package]] @@ -1276,16 +1198,16 @@ name = "frame-benchmarking-cli" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", + "frame-benchmarking", "parity-scale-codec", "sc-cli", - "sc-client-db 0.8.0-rc3", - "sc-executor 0.8.0-rc3", - "sc-service 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-externalities 0.8.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", + "sc-client-db", + "sc-executor", + "sc-service", + "sp-core", + "sp-externalities", + "sp-runtime", + "sp-state-machine", "structopt", ] @@ -1294,25 +1216,14 @@ name = "frame-executive" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-tracing 2.0.0-rc3", -] - -[[package]] -name = "frame-metadata" -version = "11.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "serde", - "sp-core 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -1322,33 +1233,8 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "parity-scale-codec", "serde", - "sp-core 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "frame-support" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "bitmask", - "frame-metadata 11.0.0-rc2", - "frame-support-procedural 2.0.0-rc2", - "impl-trait-for-tuples", - "log 0.4.8", - "once_cell", - "parity-scale-codec", - "paste", - "serde", - "smallvec 1.4.0", - "sp-arithmetic 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-io 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-state-machine 0.8.0-rc2", - "sp-std 2.0.0-rc2", - "sp-tracing 2.0.0-rc2", + "sp-core", + "sp-std", ] [[package]] @@ -1357,8 +1243,8 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "bitmask", - "frame-metadata 11.0.0-rc3", - "frame-support-procedural 2.0.0-rc3", + "frame-metadata", + "frame-support-procedural", "impl-trait-for-tuples", "log 0.4.8", "once_cell", @@ -1366,25 +1252,14 @@ dependencies = [ "paste", "serde", "smallvec 1.4.0", - "sp-arithmetic 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", - "sp-std 2.0.0-rc3", - "sp-tracing 2.0.0-rc3", -] - -[[package]] -name = "frame-support-procedural" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "frame-support-procedural-tools 2.0.0-rc2", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "sp-arithmetic", + "sp-core", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-tracing", ] [[package]] @@ -1392,19 +1267,7 @@ name = "frame-support-procedural" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support-procedural-tools 2.0.0-rc3", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", -] - -[[package]] -name = "frame-support-procedural-tools" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "frame-support-procedural-tools-derive 2.0.0-rc2", - "proc-macro-crate", + "frame-support-procedural-tools", "proc-macro2 1.0.17", "quote 1.0.6", "syn 1.0.27", @@ -1415,23 +1278,13 @@ name = "frame-support-procedural-tools" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support-procedural-tools-derive 2.0.0-rc3", + "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2 1.0.17", "quote 1.0.6", "syn 1.0.27", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", -] - [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc3" @@ -1442,36 +1295,20 @@ dependencies = [ "syn 1.0.27", ] -[[package]] -name = "frame-system" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "frame-support 2.0.0-rc2", - "impl-trait-for-tuples", - "parity-scale-codec", - "serde", - "sp-core 2.0.0-rc2", - "sp-io 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", - "sp-version 2.0.0-rc2", -] - [[package]] name = "frame-system" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", + "frame-support", "impl-trait-for-tuples", "parity-scale-codec", "serde", - "sp-core 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-version 2.0.0-rc3", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-version", ] [[package]] @@ -1479,22 +1316,13 @@ name = "frame-system-benchmarking" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "parity-scale-codec", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "frame-system-rpc-runtime-api" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", - "sp-api 2.0.0-rc2", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -1503,7 +1331,7 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-api 2.0.0-rc3", + "sp-api", ] [[package]] @@ -2397,18 +2225,18 @@ name = "kusama-runtime" version = "0.8.7" dependencies = [ "bitvec", - "frame-benchmarking 2.0.0-rc3", + "frame-benchmarking", "frame-executive", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "frame-system-benchmarking", - "frame-system-rpc-runtime-api 2.0.0-rc3", + "frame-system-rpc-runtime-api", "hex-literal", "libsecp256k1", "log 0.3.9", "pallet-authority-discovery", - "pallet-authorship 2.0.0-rc3", - "pallet-babe 2.0.0-rc3", + "pallet-authorship", + "pallet-babe", "pallet-balances", "pallet-collective", "pallet-democracy", @@ -2416,7 +2244,7 @@ dependencies = [ "pallet-finality-tracker", "pallet-grandpa", "pallet-identity", - "pallet-im-online 2.0.0-rc3", + "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-multisig", @@ -2427,14 +2255,14 @@ dependencies = [ "pallet-randomness-collective-flip", "pallet-recovery", "pallet-scheduler", - "pallet-session 2.0.0-rc3", + "pallet-session", "pallet-session-benchmarking", "pallet-society", - "pallet-staking 2.0.0-rc3", + "pallet-staking", "pallet-staking-reward-curve", - "pallet-timestamp 2.0.0-rc3", + "pallet-timestamp", "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", + "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting", @@ -2446,22 +2274,22 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.4.0", - "sp-api 2.0.0-rc3", - "sp-authority-discovery 2.0.0-rc3", - "sp-block-builder 2.0.0-rc3", - "sp-consensus-babe 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-offchain 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-trie 2.0.0-rc3", - "sp-version 2.0.0-rc3", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-transaction-pool", + "sp-trie", + "sp-version", "static_assertions", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", @@ -2609,7 +2437,6 @@ dependencies = [ "libp2p-mplex", "libp2p-noise", "libp2p-ping", - "libp2p-secio", "libp2p-swarm", "libp2p-tcp", "libp2p-wasm-ext", @@ -2795,36 +2622,6 @@ dependencies = [ "wasm-timer", ] -[[package]] -name = "libp2p-secio" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b73f0cc119c83a5b619d6d11074a319fdb4aa4daf8088ade00d511418566e28" -dependencies = [ - "aes-ctr", - "ctr", - "futures 0.3.5", - "hmac", - "js-sys", - "lazy_static", - "libp2p-core", - "log 0.4.8", - "parity-send-wrapper", - "pin-project", - "prost", - "prost-build", - "quicksink", - "rand 0.7.3", - "ring", - "rw-stream-sink", - "sha2", - "static_assertions", - "twofish", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "libp2p-swarm" version = "0.19.0" @@ -3435,30 +3232,15 @@ name = "pallet-authority-discovery" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "pallet-session 2.0.0-rc3", + "frame-support", + "frame-system", + "pallet-session", "parity-scale-codec", "serde", - "sp-application-crypto 2.0.0-rc3", - "sp-authority-discovery 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "pallet-authorship" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "frame-support 2.0.0-rc2", - "frame-system 2.0.0-rc2", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-authorship 2.0.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-application-crypto", + "sp-authority-discovery", + "sp-runtime", + "sp-std", ] [[package]] @@ -3466,36 +3248,14 @@ name = "pallet-authorship" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "impl-trait-for-tuples", "parity-scale-codec", - "sp-authorship 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "pallet-babe" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "frame-support 2.0.0-rc2", - "frame-system 2.0.0-rc2", - "pallet-session 2.0.0-rc2", - "pallet-timestamp 2.0.0-rc2", - "parity-scale-codec", - "serde", - "sp-application-crypto 2.0.0-rc2", - "sp-consensus-babe 0.8.0-rc2", - "sp-consensus-vrf 0.8.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-io 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-staking 2.0.0-rc2", - "sp-std 2.0.0-rc2", - "sp-timestamp 2.0.0-rc2", + "sp-authorship", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -3503,21 +3263,21 @@ name = "pallet-babe" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "pallet-session 2.0.0-rc3", - "pallet-timestamp 2.0.0-rc3", + "frame-support", + "frame-system", + "pallet-session", + "pallet-timestamp", "parity-scale-codec", "serde", - "sp-application-crypto 2.0.0-rc3", - "sp-consensus-babe 0.8.0-rc3", - "sp-consensus-vrf 0.8.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-timestamp 2.0.0-rc3", + "sp-application-crypto", + "sp-consensus-babe", + "sp-consensus-vrf", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-timestamp", ] [[package]] @@ -3525,13 +3285,13 @@ name = "pallet-balances" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-runtime", + "sp-std", ] [[package]] @@ -3539,15 +3299,15 @@ name = "pallet-collective" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-core 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3555,14 +3315,14 @@ name = "pallet-democracy" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3570,14 +3330,14 @@ name = "pallet-elections-phragmen" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "serde", "sp-npos-elections", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-runtime", + "sp-std", ] [[package]] @@ -3585,15 +3345,15 @@ name = "pallet-finality-tracker" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "serde", - "sp-finality-tracker 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-finality-tracker", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -3601,19 +3361,19 @@ name = "pallet-grandpa" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "pallet-finality-tracker", - "pallet-session 2.0.0-rc3", + "pallet-session", "parity-scale-codec", "serde", - "sp-application-crypto 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-finality-grandpa 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-application-crypto", + "sp-core", + "sp-finality-grandpa", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", ] [[package]] @@ -3622,33 +3382,14 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "enumflags2", - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "parity-scale-codec", - "serde", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "pallet-im-online" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "frame-support 2.0.0-rc2", - "frame-system 2.0.0-rc2", - "pallet-authorship 2.0.0-rc2", - "pallet-session 2.0.0-rc2", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-application-crypto 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-io 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-staking 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3656,19 +3397,19 @@ name = "pallet-im-online" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "pallet-authorship 2.0.0-rc3", - "pallet-session 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-authorship", + "pallet-session", "parity-scale-codec", "serde", - "sp-application-crypto 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -3676,15 +3417,15 @@ name = "pallet-indices" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-core 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-core", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-std", ] [[package]] @@ -3692,13 +3433,13 @@ name = "pallet-membership" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3706,14 +3447,14 @@ name = "pallet-multisig" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-core 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3721,13 +3462,13 @@ name = "pallet-nicks" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3735,14 +3476,14 @@ name = "pallet-offences" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "pallet-balances", "parity-scale-codec", "serde", - "sp-runtime 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -3750,20 +3491,20 @@ name = "pallet-offences-benchmarking" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "pallet-babe 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-babe", "pallet-balances", "pallet-grandpa", - "pallet-im-online 2.0.0-rc3", + "pallet-im-online", "pallet-offences", - "pallet-session 2.0.0-rc3", - "pallet-staking 2.0.0-rc3", + "pallet-session", + "pallet-staking", "parity-scale-codec", - "sp-runtime 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -3771,14 +3512,14 @@ name = "pallet-proxy" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-core 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3786,12 +3527,12 @@ name = "pallet-randomness-collective-flip" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "parity-scale-codec", "safe-mix", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-runtime", + "sp-std", ] [[package]] @@ -3800,13 +3541,13 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "enumflags2", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3814,32 +3555,14 @@ name = "pallet-scheduler" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "parity-scale-codec", - "serde", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "pallet-session" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "frame-support 2.0.0-rc2", - "frame-system 2.0.0-rc2", - "impl-trait-for-tuples", - "pallet-timestamp 2.0.0-rc2", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-runtime 2.0.0-rc2", - "sp-session 2.0.0-rc2", - "sp-staking 2.0.0-rc2", - "sp-std 2.0.0-rc2", - "sp-trie 2.0.0-rc2", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3847,17 +3570,17 @@ name = "pallet-session" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "impl-trait-for-tuples", - "pallet-timestamp 2.0.0-rc3", + "pallet-timestamp", "parity-scale-codec", "serde", - "sp-runtime 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-trie 2.0.0-rc3", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-trie", ] [[package]] @@ -3865,13 +3588,13 @@ name = "pallet-session-benchmarking" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "pallet-session 2.0.0-rc3", - "pallet-staking 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-session", + "pallet-staking", + "sp-runtime", + "sp-std", ] [[package]] @@ -3879,33 +3602,13 @@ name = "pallet-society" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "parity-scale-codec", "rand_chacha 0.2.2", "serde", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "pallet-staking" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "frame-support 2.0.0-rc2", - "frame-system 2.0.0-rc2", - "pallet-authorship 2.0.0-rc2", - "pallet-session 2.0.0-rc2", - "parity-scale-codec", - "serde", - "sp-application-crypto 2.0.0-rc2", - "sp-io 2.0.0-rc2", - "sp-phragmen", - "sp-runtime 2.0.0-rc2", - "sp-staking 2.0.0-rc2", - "sp-std 2.0.0-rc2", - "static_assertions", + "sp-runtime", + "sp-std", ] [[package]] @@ -3913,20 +3616,20 @@ name = "pallet-staking" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "pallet-authorship 2.0.0-rc3", - "pallet-session 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-authorship", + "pallet-session", "parity-scale-codec", "rand_chacha 0.2.2", "serde", - "sp-application-crypto 2.0.0-rc3", - "sp-io 2.0.0-rc3", + "sp-application-crypto", + "sp-io", "sp-npos-elections", - "sp-runtime 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-runtime", + "sp-staking", + "sp-std", "static_assertions", ] @@ -3946,30 +3649,13 @@ name = "pallet-sudo" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "parity-scale-codec", - "serde", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "pallet-timestamp" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "frame-benchmarking 2.0.0-rc2", - "frame-support 2.0.0-rc2", - "frame-system 2.0.0-rc2", - "impl-trait-for-tuples", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-inherents 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", - "sp-timestamp 2.0.0-rc2", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -3977,17 +3663,17 @@ name = "pallet-timestamp" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "serde", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-timestamp 2.0.0-rc3", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] @@ -3995,13 +3681,13 @@ name = "pallet-transaction-payment" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", + "frame-support", + "frame-system", + "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "smallvec 1.4.0", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-runtime", + "sp-std", ] [[package]] @@ -4012,27 +3698,14 @@ dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", - "parity-scale-codec", - "serde", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-rpc 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", -] - -[[package]] -name = "pallet-transaction-payment-rpc-runtime-api" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "frame-support 2.0.0-rc2", + "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "serde", - "sp-api 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-rpc", + "sp-runtime", ] [[package]] @@ -4040,12 +3713,12 @@ name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-support 2.0.0-rc3", + "frame-support", "parity-scale-codec", "serde", - "sp-api 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-api", + "sp-runtime", + "sp-std", ] [[package]] @@ -4053,14 +3726,14 @@ name = "pallet-treasury" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-balances", "parity-scale-codec", "serde", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-runtime", + "sp-std", ] [[package]] @@ -4068,15 +3741,15 @@ name = "pallet-utility" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-core 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -4085,13 +3758,13 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "enumflags2", - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "serde", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-runtime", + "sp-std", ] [[package]] @@ -4417,14 +4090,14 @@ dependencies = [ "parking_lot 0.9.0", "polkadot-erasure-coding", "polkadot-primitives", - "sc-client-api 2.0.0-rc3", - "sc-keystore 2.0.0-rc3", - "sc-network 0.8.0-rc3", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", + "sc-client-api", + "sc-keystore", + "sc-network", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", "tokio 0.2.21", ] @@ -4437,13 +4110,13 @@ dependencies = [ "log 0.4.8", "polkadot-service", "sc-cli", - "sc-client-api 2.0.0-rc3", - "sc-client-db 0.8.0-rc3", - "sc-executor 0.8.0-rc3", - "sc-service 0.8.0-rc3", - "sp-api 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", + "sc-client-api", + "sc-client-db", + "sc-executor", + "sc-service", + "sp-api", + "sp-core", + "sp-runtime", "structopt", "substrate-browser-utils", "substrate-build-script-utils", @@ -4466,16 +4139,16 @@ dependencies = [ "polkadot-service", "polkadot-validation", "sc-cli", - "sc-client-api 2.0.0-rc3", - "sc-executor 0.8.0-rc3", - "sc-network 0.8.0-rc3", - "sc-service 0.8.0-rc3", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", + "sc-client-api", + "sc-executor", + "sc-network", + "sc-service", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-keyring", + "sp-runtime", "tokio 0.2.21", ] @@ -4487,8 +4160,8 @@ dependencies = [ "parity-scale-codec", "polkadot-primitives", "reed-solomon-erasure", - "sp-core 2.0.0-rc3", - "sp-trie 2.0.0-rc3", + "sp-core", + "sp-trie", ] [[package]] @@ -4508,14 +4181,14 @@ dependencies = [ "polkadot-erasure-coding", "polkadot-primitives", "polkadot-validation", - "sc-network 0.8.0-rc3", - "sc-network-gossip 0.8.0-rc3", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", + "sc-network", + "sc-network-gossip", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-keyring", + "sp-runtime", + "sp-state-machine", "wasm-timer", ] @@ -4528,16 +4201,16 @@ dependencies = [ "parking_lot 0.10.2", "polkadot-test-runtime-client", "rand 0.7.3", - "sc-block-builder 0.8.0-rc3", - "sc-client-api 2.0.0-rc3", - "sc-consensus 0.8.0-rc3", - "sc-network 0.8.0-rc3", + "sc-block-builder", + "sc-client-api", + "sc-consensus", + "sc-network", "sc-network-test", - "sc-service 0.8.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", + "sc-service", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", ] [[package]] @@ -4558,7 +4231,7 @@ dependencies = [ "log 0.4.8", "polkadot-node-messages", "polkadot-primitives", - "sc-client-api 2.0.0-rc3", + "sc-client-api", "streamunordered", ] @@ -4570,15 +4243,15 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", - "sc-executor 0.8.0-rc3", + "sc-executor", "serde", "shared_memory", - "sp-core 2.0.0-rc3", - "sp-externalities 0.8.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime-interface 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-wasm-interface 2.0.0-rc3", + "sp-core", + "sp-externalities", + "sp-io", + "sp-runtime-interface", + "sp-std", + "sp-wasm-interface", ] [[package]] @@ -4586,21 +4259,21 @@ name = "polkadot-primitives" version = "0.8.7" dependencies = [ "bitvec", - "frame-system 2.0.0-rc3", + "frame-system", "parity-scale-codec", "polkadot-parachain", "pretty_assertions", "serde", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-serializer 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-trie 2.0.0-rc3", - "sp-version 2.0.0-rc3", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-serializer", + "sp-staking", + "sp-std", + "sp-trie", + "sp-version", ] [[package]] @@ -4611,20 +4284,20 @@ dependencies = [ "pallet-transaction-payment-rpc", "parity-scale-codec", "polkadot-primitives", - "sc-client-api 2.0.0-rc3", - "sc-consensus-babe 0.8.0-rc3", + "sc-client-api", + "sc-consensus-babe", "sc-consensus-babe-rpc", - "sc-consensus-epochs 0.8.0-rc3", - "sc-finality-grandpa 0.8.0-rc3", + "sc-consensus-epochs", + "sc-finality-grandpa", "sc-finality-grandpa-rpc", - "sc-keystore 2.0.0-rc3", - "sc-rpc 2.0.0-rc3", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-consensus-babe 0.8.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", + "sc-keystore", + "sc-rpc", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-runtime", + "sp-transaction-pool", "substrate-frame-rpc-system", ] @@ -4633,18 +4306,18 @@ name = "polkadot-runtime" version = "0.8.7" dependencies = [ "bitvec", - "frame-benchmarking 2.0.0-rc3", + "frame-benchmarking", "frame-executive", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "frame-system-benchmarking", - "frame-system-rpc-runtime-api 2.0.0-rc3", + "frame-system-rpc-runtime-api", "hex-literal", "libsecp256k1", "log 0.3.9", "pallet-authority-discovery", - "pallet-authorship 2.0.0-rc3", - "pallet-babe 2.0.0-rc3", + "pallet-authorship", + "pallet-babe", "pallet-balances", "pallet-collective", "pallet-democracy", @@ -4652,7 +4325,7 @@ dependencies = [ "pallet-finality-tracker", "pallet-grandpa", "pallet-identity", - "pallet-im-online 2.0.0-rc3", + "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-multisig", @@ -4662,14 +4335,14 @@ dependencies = [ "pallet-proxy", "pallet-randomness-collective-flip", "pallet-scheduler", - "pallet-session 2.0.0-rc3", + "pallet-session", "pallet-session-benchmarking", - "pallet-staking 2.0.0-rc3", + "pallet-staking", "pallet-staking-reward-curve", "pallet-sudo", - "pallet-timestamp 2.0.0-rc3", + "pallet-timestamp", "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", + "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting", @@ -4681,21 +4354,21 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.4.0", - "sp-api 2.0.0-rc3", - "sp-authority-discovery 2.0.0-rc3", - "sp-block-builder 2.0.0-rc3", - "sp-consensus-babe 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-offchain 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-trie 2.0.0-rc3", - "sp-version 2.0.0-rc3", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-core", + "sp-inherents", + "sp-keyring", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-transaction-pool", + "sp-trie", + "sp-version", "static_assertions", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", @@ -4707,21 +4380,21 @@ name = "polkadot-runtime-common" version = "0.8.7" dependencies = [ "bitvec", - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", "hex-literal", "libsecp256k1", "log 0.3.9", - "pallet-authorship 2.0.0-rc3", - "pallet-babe 2.0.0-rc3", + "pallet-authorship", + "pallet-babe", "pallet-balances", "pallet-offences", "pallet-randomness-collective-flip", - "pallet-session 2.0.0-rc3", - "pallet-staking 2.0.0-rc3", + "pallet-session", + "pallet-staking", "pallet-staking-reward-curve", - "pallet-timestamp 2.0.0-rc3", + "pallet-timestamp", "pallet-treasury", "pallet-vesting", "parity-scale-codec", @@ -4730,17 +4403,17 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-trie 2.0.0-rc3", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-trie", "static_assertions", "trie-db", ] @@ -4750,21 +4423,21 @@ name = "polkadot-runtime-parachains" version = "0.8.0" dependencies = [ "bitvec", - "frame-benchmarking 2.0.0-rc3", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-benchmarking", + "frame-support", + "frame-system", "hex-literal", "libsecp256k1", "log 0.3.9", - "pallet-authorship 2.0.0-rc3", - "pallet-babe 2.0.0-rc3", + "pallet-authorship", + "pallet-babe", "pallet-balances", "pallet-offences", "pallet-randomness-collective-flip", - "pallet-session 2.0.0-rc3", - "pallet-staking 2.0.0-rc3", + "pallet-session", + "pallet-staking", "pallet-staking-reward-curve", - "pallet-timestamp 2.0.0-rc3", + "pallet-timestamp", "pallet-treasury", "pallet-vesting", "parity-scale-codec", @@ -4773,17 +4446,17 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-trie 2.0.0-rc3", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-trie", "trie-db", ] @@ -4792,17 +4465,17 @@ name = "polkadot-service" version = "0.8.7" dependencies = [ "env_logger", - "frame-benchmarking 2.0.0-rc3", - "frame-system-rpc-runtime-api 2.0.0-rc3", + "frame-benchmarking", + "frame-system-rpc-runtime-api", "futures 0.3.5", "hex-literal", "kusama-runtime", "lazy_static", "log 0.4.8", - "pallet-babe 2.0.0-rc3", - "pallet-im-online 2.0.0-rc3", - "pallet-staking 2.0.0-rc3", - "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", + "pallet-babe", + "pallet-im-online", + "pallet-staking", + "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "parking_lot 0.9.0", "polkadot-availability-store", @@ -4812,37 +4485,37 @@ dependencies = [ "polkadot-runtime", "polkadot-test-runtime-client", "polkadot-validation", - "sc-authority-discovery 0.8.0-rc3", - "sc-block-builder 0.8.0-rc3", - "sc-chain-spec 2.0.0-rc3", - "sc-client-api 2.0.0-rc3", - "sc-client-db 0.8.0-rc3", - "sc-consensus 0.8.0-rc3", - "sc-consensus-babe 0.8.0-rc3", - "sc-executor 0.8.0-rc3", - "sc-finality-grandpa 0.8.0-rc3", - "sc-keystore 2.0.0-rc3", - "sc-network 0.8.0-rc3", - "sc-service 0.8.0-rc3", - "sc-telemetry 2.0.0-rc3", - "sc-transaction-pool 2.0.0-rc3", + "sc-authority-discovery", + "sc-block-builder", + "sc-chain-spec", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-consensus-babe", + "sc-executor", + "sc-finality-grandpa", + "sc-keystore", + "sc-network", + "sc-service", + "sc-telemetry", + "sc-transaction-pool", "serde", "slog", - "sp-api 2.0.0-rc3", - "sp-authority-discovery 2.0.0-rc3", - "sp-block-builder 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-consensus-babe 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-finality-grandpa 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-offchain 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-core", + "sp-finality-grandpa", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-transaction-pool", + "substrate-prometheus-endpoint", "westend-runtime", ] @@ -4852,7 +4525,7 @@ version = "0.8.7" dependencies = [ "parity-scale-codec", "polkadot-primitives", - "sp-core 2.0.0-rc3", + "sp-core", ] [[package]] @@ -4860,17 +4533,17 @@ name = "polkadot-test" version = "0.8.2" dependencies = [ "env_logger", - "frame-benchmarking 2.0.0-rc2", - "frame-system-rpc-runtime-api 2.0.0-rc2", + "frame-benchmarking", + "frame-system-rpc-runtime-api", "futures 0.3.5", "hex-literal", "kusama-runtime", "lazy_static", "log 0.4.8", - "pallet-babe 2.0.0-rc2", - "pallet-im-online 2.0.0-rc2", - "pallet-staking 2.0.0-rc2", - "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc2", + "pallet-babe", + "pallet-im-online", + "pallet-staking", + "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "parking_lot 0.9.0", "polkadot-availability-store", @@ -4882,37 +4555,37 @@ dependencies = [ "polkadot-test-runtime", "polkadot-test-runtime-client", "polkadot-validation", - "sc-authority-discovery 0.8.0-rc2", - "sc-block-builder 0.8.0-rc2", - "sc-chain-spec 2.0.0-rc2", - "sc-client-api 2.0.0-rc2", - "sc-client-db 0.8.0-rc2", - "sc-consensus 0.8.0-rc2", - "sc-consensus-babe 0.8.0-rc2", - "sc-executor 0.8.0-rc2", - "sc-finality-grandpa 0.8.0-rc2", - "sc-keystore 2.0.0-rc2", - "sc-network 0.8.0-rc2", - "sc-service 0.8.0-rc2", - "sc-telemetry 2.0.0-rc2", - "sc-transaction-pool 2.0.0-rc2", + "sc-authority-discovery", + "sc-block-builder", + "sc-chain-spec", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-consensus-babe", + "sc-executor", + "sc-finality-grandpa", + "sc-keystore", + "sc-network", + "sc-service", + "sc-telemetry", + "sc-transaction-pool", "serde", "slog", - "sp-api 2.0.0-rc2", - "sp-authority-discovery 2.0.0-rc2", - "sp-block-builder 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-consensus-babe 0.8.0-rc2", - "sp-core 2.0.0-rc2", - "sp-finality-grandpa 2.0.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-io 2.0.0-rc2", - "sp-offchain 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-session 2.0.0-rc2", - "sp-transaction-pool 2.0.0-rc2", - "substrate-prometheus-endpoint 0.8.0-rc2", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-core", + "sp-finality-grandpa", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-transaction-pool", + "substrate-prometheus-endpoint", "westend-runtime", ] @@ -4922,15 +4595,15 @@ version = "0.8.7" dependencies = [ "bitvec", "frame-executive", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "frame-system-rpc-runtime-api 2.0.0-rc3", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", "hex-literal", "libsecp256k1", "log 0.3.9", "pallet-authority-discovery", - "pallet-authorship 2.0.0-rc3", - "pallet-babe 2.0.0-rc3", + "pallet-authorship", + "pallet-babe", "pallet-balances", "pallet-finality-tracker", "pallet-grandpa", @@ -4938,12 +4611,12 @@ dependencies = [ "pallet-nicks", "pallet-offences", "pallet-randomness-collective-flip", - "pallet-session 2.0.0-rc3", - "pallet-staking 2.0.0-rc3", + "pallet-session", + "pallet-staking", "pallet-staking-reward-curve", - "pallet-timestamp 2.0.0-rc3", + "pallet-timestamp", "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", + "pallet-transaction-payment-rpc-runtime-api", "pallet-vesting", "parity-scale-codec", "polkadot-parachain", @@ -4954,22 +4627,22 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.4.0", - "sp-api 2.0.0-rc3", - "sp-authority-discovery 2.0.0-rc3", - "sp-block-builder 2.0.0-rc3", - "sp-consensus-babe 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-offchain 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-trie 2.0.0-rc3", - "sp-version 2.0.0-rc3", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-transaction-pool", + "sp-trie", + "sp-version", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", "trie-db", @@ -4980,20 +4653,20 @@ name = "polkadot-test-runtime-client" version = "2.0.0" dependencies = [ "futures 0.3.5", - "pallet-timestamp 2.0.0-rc3", + "pallet-timestamp", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-test-runtime", - "sc-block-builder 0.8.0-rc3", - "sc-client-api 2.0.0-rc3", - "sc-consensus 0.8.0-rc3", + "sc-block-builder", + "sc-client-api", + "sc-consensus", "sc-light", - "sc-service 0.8.0-rc3", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", + "sc-service", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", "substrate-test-client", ] @@ -5007,7 +4680,7 @@ dependencies = [ "futures 0.3.5", "futures-timer 2.0.2", "log 0.4.8", - "pallet-babe 2.0.0-rc3", + "pallet-babe", "parity-scale-codec", "parking_lot 0.9.0", "polkadot-availability-store", @@ -5016,22 +4689,22 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-basic-authorship", - "sc-block-builder 0.8.0-rc3", - "sc-client-api 2.0.0-rc3", - "sc-finality-grandpa 0.8.0-rc3", - "sc-keystore 2.0.0-rc3", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-consensus-babe 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-timestamp 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-trie 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", + "sc-block-builder", + "sc-client-api", + "sc-finality-grandpa", + "sc-keystore", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-core", + "sp-inherents", + "sp-keyring", + "sp-runtime", + "sp-timestamp", + "sp-transaction-pool", + "sp-trie", + "substrate-prometheus-endpoint", "tokio 0.2.21", ] @@ -5764,33 +5437,6 @@ dependencies = [ "rustc_version", ] -[[package]] -name = "sc-authority-discovery" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "bytes 0.5.4", - "derive_more 0.99.7", - "futures 0.3.5", - "futures-timer 3.0.2", - "libp2p", - "log 0.4.8", - "parity-scale-codec", - "prost", - "prost-build", - "rand 0.7.3", - "sc-client-api 2.0.0-rc2", - "sc-keystore 2.0.0-rc2", - "sc-network 0.8.0-rc2", - "serde_json", - "sp-api 2.0.0-rc2", - "sp-authority-discovery 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "substrate-prometheus-endpoint 0.8.0-rc2", -] - [[package]] name = "sc-authority-discovery" version = "0.8.0-rc3" @@ -5806,16 +5452,16 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "sc-client-api 2.0.0-rc3", - "sc-keystore 2.0.0-rc3", - "sc-network 0.8.0-rc3", + "sc-client-api", + "sc-keystore", + "sc-network", "serde_json", - "sp-api 2.0.0-rc3", - "sp-authority-discovery 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", + "sp-api", + "sp-authority-discovery", + "sp-blockchain", + "sp-core", + "sp-runtime", + "substrate-prometheus-endpoint", ] [[package]] @@ -5827,67 +5473,35 @@ dependencies = [ "futures-timer 3.0.2", "log 0.4.8", "parity-scale-codec", - "sc-block-builder 0.8.0-rc3", - "sc-client-api 2.0.0-rc3", + "sc-block-builder", + "sc-client-api", "sc-proposer-metrics", - "sc-telemetry 2.0.0-rc3", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", + "sc-telemetry", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-transaction-pool", + "substrate-prometheus-endpoint", "tokio-executor 0.2.0-alpha.6", ] -[[package]] -name = "sc-block-builder" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "sc-client-api 2.0.0-rc2", - "sp-api 2.0.0-rc2", - "sp-block-builder 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-state-machine 0.8.0-rc2", -] - [[package]] name = "sc-block-builder" version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sc-client-api 2.0.0-rc3", - "sp-api 2.0.0-rc3", - "sp-block-builder 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", -] - -[[package]] -name = "sc-chain-spec" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "impl-trait-for-tuples", - "sc-chain-spec-derive 2.0.0-rc2", - "sc-network 0.8.0-rc2", - "sc-telemetry 2.0.0-rc2", - "serde", - "serde_json", - "sp-chain-spec 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", + "sc-client-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -5896,25 +5510,14 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "impl-trait-for-tuples", - "sc-chain-spec-derive 2.0.0-rc3", - "sc-network 0.8.0-rc3", - "sc-telemetry 2.0.0-rc3", + "sc-chain-spec-derive", + "sc-network", + "sc-telemetry", "serde", "serde_json", - "sp-chain-spec 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", -] - -[[package]] -name = "sc-chain-spec-derive" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "sp-chain-spec", + "sp-core", + "sp-runtime", ] [[package]] @@ -5947,63 +5550,27 @@ dependencies = [ "parity-util-mem", "regex", "rpassword", - "sc-client-api 2.0.0-rc3", - "sc-informant 0.8.0-rc3", - "sc-network 0.8.0-rc3", - "sc-service 0.8.0-rc3", - "sc-telemetry 2.0.0-rc3", - "sc-tracing 2.0.0-rc3", + "sc-client-api", + "sc-informant", + "sc-network", + "sc-service", + "sc-telemetry", + "sc-tracing", "serde_json", - "sp-blockchain 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-panic-handler 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", - "sp-utils 2.0.0-rc3", - "sp-version 2.0.0-rc3", + "sp-blockchain", + "sp-core", + "sp-keyring", + "sp-panic-handler", + "sp-runtime", + "sp-state-machine", + "sp-utils", + "sp-version", "structopt", - "substrate-prometheus-endpoint 0.8.0-rc3", + "substrate-prometheus-endpoint", "time", "tokio 0.2.21", ] -[[package]] -name = "sc-client-api" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "fnv", - "futures 0.3.5", - "hash-db", - "hex-literal", - "kvdb", - "lazy_static", - "log 0.4.8", - "parity-scale-codec", - "parking_lot 0.10.2", - "sc-executor 0.8.0-rc2", - "sc-telemetry 2.0.0-rc2", - "sp-api 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-core 2.0.0-rc2", - "sp-database 2.0.0-rc2", - "sp-externalities 0.8.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-keyring 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-state-machine 0.8.0-rc2", - "sp-std 2.0.0-rc2", - "sp-storage 2.0.0-rc2", - "sp-transaction-pool 2.0.0-rc2", - "sp-trie 2.0.0-rc2", - "sp-utils 2.0.0-rc2", - "sp-version 2.0.0-rc2", - "substrate-prometheus-endpoint 0.8.0-rc2", -] - [[package]] name = "sc-client-api" version = "2.0.0-rc3" @@ -6019,54 +5586,25 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", - "sc-executor 0.8.0-rc3", - "sc-telemetry 2.0.0-rc3", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-database 2.0.0-rc3", - "sp-externalities 0.8.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", - "sp-std 2.0.0-rc3", - "sp-storage 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-trie 2.0.0-rc3", - "sp-utils 2.0.0-rc3", - "sp-version 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", -] - -[[package]] -name = "sc-client-db" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "blake2-rfc", - "hash-db", - "kvdb", - "kvdb-memorydb", - "kvdb-rocksdb", - "linked-hash-map", - "log 0.4.8", - "parity-db", - "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.10.2", - "sc-client-api 2.0.0-rc2", - "sc-executor 0.8.0-rc2", - "sc-state-db 0.8.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-core 2.0.0-rc2", - "sp-database 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-state-machine 0.8.0-rc2", - "sp-trie 2.0.0-rc2", - "substrate-prometheus-endpoint 0.8.0-rc2", + "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-storage", + "sp-transaction-pool", + "sp-trie", + "sp-utils", + "sp-version", + "substrate-prometheus-endpoint", ] [[package]] @@ -6085,81 +5623,28 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", - "sc-client-api 2.0.0-rc3", - "sc-executor 0.8.0-rc3", - "sc-state-db 0.8.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-database 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", - "sp-trie 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", + "sc-client-api", + "sc-executor", + "sc-state-db", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-database", + "sp-runtime", + "sp-state-machine", + "sp-trie", + "substrate-prometheus-endpoint", ] [[package]] name = "sc-consensus" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "sc-client-api 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-runtime 2.0.0-rc2", -] - -[[package]] -name = "sc-consensus" -version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" -dependencies = [ - "sc-client-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-runtime 2.0.0-rc3", -] - -[[package]] -name = "sc-consensus-babe" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "fork-tree 2.0.0-rc2", - "futures 0.3.5", - "futures-timer 3.0.2", - "log 0.4.8", - "merlin", - "num-bigint", - "num-rational", - "num-traits 0.2.11", - "parity-scale-codec", - "parking_lot 0.10.2", - "pdqselect", - "rand 0.7.3", - "sc-client-api 2.0.0-rc2", - "sc-consensus-epochs 0.8.0-rc2", - "sc-consensus-slots 0.8.0-rc2", - "sc-consensus-uncles 0.8.0-rc2", - "sc-keystore 2.0.0-rc2", - "sc-telemetry 2.0.0-rc2", - "schnorrkel", - "serde", - "sp-api 2.0.0-rc2", - "sp-application-crypto 2.0.0-rc2", - "sp-block-builder 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-consensus-babe 0.8.0-rc2", - "sp-consensus-vrf 0.8.0-rc2", - "sp-core 2.0.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-io 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-timestamp 2.0.0-rc2", - "sp-version 2.0.0-rc2", - "substrate-prometheus-endpoint 0.8.0-rc2", + "sc-client-api", + "sp-blockchain", + "sp-consensus", + "sp-runtime", ] [[package]] @@ -6168,7 +5653,7 @@ version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "derive_more 0.99.7", - "fork-tree 2.0.0-rc3", + "fork-tree", "futures 0.3.5", "futures-timer 3.0.2", "log 0.4.8", @@ -6180,28 +5665,28 @@ dependencies = [ "parking_lot 0.10.2", "pdqselect", "rand 0.7.3", - "sc-client-api 2.0.0-rc3", - "sc-consensus-epochs 0.8.0-rc3", - "sc-consensus-slots 0.8.0-rc3", - "sc-consensus-uncles 0.8.0-rc3", - "sc-keystore 2.0.0-rc3", - "sc-telemetry 2.0.0-rc3", + "sc-client-api", + "sc-consensus-epochs", + "sc-consensus-slots", + "sc-consensus-uncles", + "sc-keystore", + "sc-telemetry", "schnorrkel", "serde", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-block-builder 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-consensus-babe 0.8.0-rc3", - "sp-consensus-vrf 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-timestamp 2.0.0-rc3", - "sp-version 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", + "sp-api", + "sp-application-crypto", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-consensus-vrf", + "sp-core", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-timestamp", + "sp-version", + "substrate-prometheus-endpoint", ] [[package]] @@ -6214,30 +5699,17 @@ dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "sc-consensus-babe 0.8.0-rc3", - "sc-consensus-epochs 0.8.0-rc3", - "sc-keystore 2.0.0-rc3", - "sc-rpc-api 0.8.0-rc3", + "sc-consensus-babe", + "sc-consensus-epochs", + "sc-keystore", + "sc-rpc-api", "serde", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-consensus-babe 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", -] - -[[package]] -name = "sc-consensus-epochs" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "fork-tree 2.0.0-rc2", - "parity-scale-codec", - "parking_lot 0.10.2", - "sc-client-api 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-core", + "sp-runtime", ] [[package]] @@ -6245,34 +5717,12 @@ name = "sc-consensus-epochs" version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "fork-tree 2.0.0-rc3", + "fork-tree", "parity-scale-codec", "parking_lot 0.10.2", - "sc-client-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", -] - -[[package]] -name = "sc-consensus-slots" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "futures 0.3.5", - "futures-timer 3.0.2", - "log 0.4.8", - "parity-scale-codec", - "parking_lot 0.10.2", - "sc-client-api 2.0.0-rc2", - "sc-telemetry 2.0.0-rc2", - "sp-api 2.0.0-rc2", - "sp-application-crypto 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-core 2.0.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-state-machine 0.8.0-rc2", + "sc-client-api", + "sp-blockchain", + "sp-runtime", ] [[package]] @@ -6285,30 +5735,16 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", - "sc-client-api 2.0.0-rc3", - "sc-telemetry 2.0.0-rc3", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", -] - -[[package]] -name = "sc-consensus-uncles" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "log 0.4.8", - "sc-client-api 2.0.0-rc2", - "sp-authorship 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-core 2.0.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", + "sc-client-api", + "sc-telemetry", + "sp-api", + "sp-application-crypto", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -6317,39 +5753,12 @@ version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "log 0.4.8", - "sc-client-api 2.0.0-rc3", - "sp-authorship 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", -] - -[[package]] -name = "sc-executor" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "lazy_static", - "libsecp256k1", - "log 0.4.8", - "parity-scale-codec", - "parity-wasm", - "parking_lot 0.10.2", - "sc-executor-common 0.8.0-rc2", - "sc-executor-wasmi 0.8.0-rc2", - "sp-api 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-externalities 0.8.0-rc2", - "sp-io 2.0.0-rc2", - "sp-panic-handler 2.0.0-rc2", - "sp-runtime-interface 2.0.0-rc2", - "sp-serializer 2.0.0-rc2", - "sp-trie 2.0.0-rc2", - "sp-version 2.0.0-rc2", - "sp-wasm-interface 2.0.0-rc2", - "wasmi", + "sc-client-api", + "sp-authorship", + "sp-consensus", + "sp-core", + "sp-inherents", + "sp-runtime", ] [[package]] @@ -6364,36 +5773,19 @@ dependencies = [ "parity-scale-codec", "parity-wasm", "parking_lot 0.10.2", - "sc-executor-common 0.8.0-rc3", - "sc-executor-wasmi 0.8.0-rc3", + "sc-executor-common", + "sc-executor-wasmi", "sc-executor-wasmtime", - "sp-api 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-externalities 0.8.0-rc3", - "sp-io 2.0.0-rc3", - "sp-panic-handler 2.0.0-rc3", - "sp-runtime-interface 2.0.0-rc3", - "sp-serializer 2.0.0-rc3", - "sp-trie 2.0.0-rc3", - "sp-version 2.0.0-rc3", - "sp-wasm-interface 2.0.0-rc3", - "wasmi", -] - -[[package]] -name = "sc-executor-common" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "log 0.4.8", - "parity-scale-codec", - "parity-wasm", - "sp-allocator 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime-interface 2.0.0-rc2", - "sp-serializer 2.0.0-rc2", - "sp-wasm-interface 2.0.0-rc2", + "sp-api", + "sp-core", + "sp-externalities", + "sp-io", + "sp-panic-handler", + "sp-runtime-interface", + "sp-serializer", + "sp-trie", + "sp-version", + "sp-wasm-interface", "wasmi", ] @@ -6406,26 +5798,11 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parity-wasm", - "sp-allocator 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime-interface 2.0.0-rc3", - "sp-serializer 2.0.0-rc3", - "sp-wasm-interface 2.0.0-rc3", - "wasmi", -] - -[[package]] -name = "sc-executor-wasmi" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "log 0.4.8", - "parity-scale-codec", - "sc-executor-common 0.8.0-rc2", - "sp-allocator 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime-interface 2.0.0-rc2", - "sp-wasm-interface 2.0.0-rc2", + "sp-allocator", + "sp-core", + "sp-runtime-interface", + "sp-serializer", + "sp-wasm-interface", "wasmi", ] @@ -6436,11 +5813,11 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "log 0.4.8", "parity-scale-codec", - "sc-executor-common 0.8.0-rc3", - "sp-allocator 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime-interface 2.0.0-rc3", - "sp-wasm-interface 2.0.0-rc3", + "sc-executor-common", + "sp-allocator", + "sp-core", + "sp-runtime-interface", + "sp-wasm-interface", "wasmi", ] @@ -6454,54 +5831,17 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parity-wasm", - "sc-executor-common 0.8.0-rc3", + "sc-executor-common", "scoped-tls", - "sp-allocator 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime-interface 2.0.0-rc3", - "sp-wasm-interface 2.0.0-rc3", + "sp-allocator", + "sp-core", + "sp-runtime-interface", + "sp-wasm-interface", "substrate-wasmtime", "substrate-wasmtime-runtime", "wasmtime-environ", ] -[[package]] -name = "sc-finality-grandpa" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "assert_matches", - "derive_more 0.99.7", - "finality-grandpa", - "fork-tree 2.0.0-rc2", - "futures 0.3.5", - "futures-timer 3.0.2", - "log 0.4.8", - "parity-scale-codec", - "parking_lot 0.10.2", - "pin-project", - "rand 0.7.3", - "sc-block-builder 0.8.0-rc2", - "sc-client-api 2.0.0-rc2", - "sc-consensus 0.8.0-rc2", - "sc-keystore 2.0.0-rc2", - "sc-network 0.8.0-rc2", - "sc-network-gossip 0.8.0-rc2", - "sc-telemetry 2.0.0-rc2", - "serde_json", - "sp-api 2.0.0-rc2", - "sp-arithmetic 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-core 2.0.0-rc2", - "sp-finality-grandpa 2.0.0-rc2", - "sp-finality-tracker 2.0.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-utils 2.0.0-rc2", - "substrate-prometheus-endpoint 0.8.0-rc2", -] - [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc3" @@ -6510,7 +5850,7 @@ dependencies = [ "assert_matches", "derive_more 0.99.7", "finality-grandpa", - "fork-tree 2.0.0-rc3", + "fork-tree", "futures 0.3.5", "futures-timer 3.0.2", "log 0.4.8", @@ -6518,26 +5858,26 @@ dependencies = [ "parking_lot 0.10.2", "pin-project", "rand 0.7.3", - "sc-block-builder 0.8.0-rc3", - "sc-client-api 2.0.0-rc3", - "sc-consensus 0.8.0-rc3", - "sc-keystore 2.0.0-rc3", - "sc-network 0.8.0-rc3", - "sc-network-gossip 0.8.0-rc3", - "sc-telemetry 2.0.0-rc3", + "sc-block-builder", + "sc-client-api", + "sc-consensus", + "sc-keystore", + "sc-network", + "sc-network-gossip", + "sc-telemetry", "serde_json", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-arithmetic 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-finality-grandpa 2.0.0-rc3", - "sp-finality-tracker 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-utils 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-finality-grandpa", + "sp-finality-tracker", + "sp-inherents", + "sp-runtime", + "sp-utils", + "substrate-prometheus-endpoint", ] [[package]] @@ -6552,29 +5892,11 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "log 0.4.8", - "sc-finality-grandpa 0.8.0-rc3", + "sc-finality-grandpa", "serde", "serde_json", ] -[[package]] -name = "sc-informant" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "ansi_term 0.12.1", - "futures 0.3.5", - "log 0.4.8", - "parity-util-mem", - "sc-client-api 2.0.0-rc2", - "sc-network 0.8.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-transaction-pool 2.0.0-rc2", - "sp-utils 2.0.0-rc2", - "wasm-timer", -] - [[package]] name = "sc-informant" version = "0.8.0-rc3" @@ -6584,30 +5906,15 @@ dependencies = [ "futures 0.3.5", "log 0.4.8", "parity-util-mem", - "sc-client-api 2.0.0-rc3", - "sc-network 0.8.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-utils 2.0.0-rc3", + "sc-client-api", + "sc-network", + "sp-blockchain", + "sp-runtime", + "sp-transaction-pool", + "sp-utils", "wasm-timer", ] -[[package]] -name = "sc-keystore" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "hex", - "parking_lot 0.10.2", - "rand 0.7.3", - "serde_json", - "sp-application-crypto 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "subtle 2.2.2", -] - [[package]] name = "sc-keystore" version = "2.0.0-rc3" @@ -6618,8 +5925,8 @@ dependencies = [ "parking_lot 0.10.2", "rand 0.7.3", "serde_json", - "sp-application-crypto 2.0.0-rc3", - "sp-core 2.0.0-rc3", + "sp-application-crypto", + "sp-core", "subtle 2.2.2", ] @@ -6632,66 +5939,14 @@ dependencies = [ "lazy_static", "parity-scale-codec", "parking_lot 0.10.2", - "sc-client-api 2.0.0-rc3", - "sc-executor 0.8.0-rc3", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-externalities 0.8.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", -] - -[[package]] -name = "sc-network" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "bitflags", - "bs58", - "bytes 0.5.4", - "derive_more 0.99.7", - "either", - "erased-serde", - "fnv", - "fork-tree 2.0.0-rc2", - "futures 0.3.5", - "futures-timer 3.0.2", - "futures_codec", - "hex", - "ip_network", - "libp2p", - "linked-hash-map", - "linked_hash_set", - "log 0.4.8", - "lru", - "nohash-hasher", - "parity-scale-codec", - "parking_lot 0.10.2", - "pin-project", - "prost", - "prost-build", - "rand 0.7.3", - "sc-block-builder 0.8.0-rc2", - "sc-client-api 2.0.0-rc2", - "sc-peerset 2.0.0-rc2", - "serde", - "serde_json", - "slog", - "slog_derive", - "smallvec 0.6.13", - "sp-arithmetic 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-utils 2.0.0-rc2", - "substrate-prometheus-endpoint 0.8.0-rc2", - "thiserror", - "unsigned-varint", - "void", - "wasm-timer", - "zeroize", + "sc-client-api", + "sc-executor", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-externalities", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -6706,7 +5961,7 @@ dependencies = [ "either", "erased-serde", "fnv", - "fork-tree 2.0.0-rc3", + "fork-tree", "futures 0.3.5", "futures-timer 3.0.2", "futures_codec", @@ -6724,21 +5979,21 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "sc-block-builder 0.8.0-rc3", - "sc-client-api 2.0.0-rc3", - "sc-peerset 2.0.0-rc3", + "sc-block-builder", + "sc-client-api", + "sc-peerset", "serde", "serde_json", "slog", "slog_derive", "smallvec 0.6.13", - "sp-arithmetic 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-utils 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-utils", + "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", "void", @@ -6746,21 +6001,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sc-network-gossip" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "futures 0.3.5", - "futures-timer 3.0.2", - "libp2p", - "log 0.4.8", - "lru", - "sc-network 0.8.0-rc2", - "sp-runtime 2.0.0-rc2", - "wasm-timer", -] - [[package]] name = "sc-network-gossip" version = "0.8.0-rc3" @@ -6771,8 +6011,8 @@ dependencies = [ "libp2p", "log 0.4.8", "lru", - "sc-network 0.8.0-rc3", - "sp-runtime 2.0.0-rc3", + "sc-network", + "sp-runtime", "wasm-timer", ] @@ -6788,48 +6028,21 @@ dependencies = [ "log 0.4.8", "parking_lot 0.10.2", "rand 0.7.3", - "sc-block-builder 0.8.0-rc3", - "sc-client-api 2.0.0-rc3", - "sc-consensus 0.8.0-rc3", - "sc-network 0.8.0-rc3", - "sc-service 0.8.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-consensus-babe 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", + "sc-block-builder", + "sc-client-api", + "sc-consensus", + "sc-network", + "sc-service", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-core", + "sp-runtime", "substrate-test-runtime", "substrate-test-runtime-client", "tempfile", ] -[[package]] -name = "sc-offchain" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "bytes 0.5.4", - "fnv", - "futures 0.3.5", - "futures-timer 3.0.2", - "hyper 0.13.5", - "hyper-rustls", - "log 0.4.8", - "num_cpus", - "parity-scale-codec", - "parking_lot 0.10.2", - "rand 0.7.3", - "sc-client-api 2.0.0-rc2", - "sc-keystore 2.0.0-rc2", - "sc-network 0.8.0-rc2", - "sp-api 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-offchain 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-utils 2.0.0-rc2", - "threadpool", -] - [[package]] name = "sc-offchain" version = "2.0.0-rc3" @@ -6846,30 +6059,17 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "rand 0.7.3", - "sc-client-api 2.0.0-rc3", - "sc-keystore 2.0.0-rc3", - "sc-network 0.8.0-rc3", - "sp-api 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-offchain 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-utils 2.0.0-rc3", + "sc-client-api", + "sc-keystore", + "sc-network", + "sp-api", + "sp-core", + "sp-offchain", + "sp-runtime", + "sp-utils", "threadpool", ] -[[package]] -name = "sc-peerset" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "futures 0.3.5", - "libp2p", - "log 0.4.8", - "serde_json", - "sp-utils 2.0.0-rc2", - "wasm-timer", -] - [[package]] name = "sc-peerset" version = "2.0.0-rc3" @@ -6879,7 +6079,7 @@ dependencies = [ "libp2p", "log 0.4.8", "serde_json", - "sp-utils 2.0.0-rc3", + "sp-utils", "wasm-timer", ] @@ -6889,39 +6089,7 @@ version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "log 0.4.8", - "substrate-prometheus-endpoint 0.8.0-rc3", -] - -[[package]] -name = "sc-rpc" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "futures 0.3.5", - "hash-db", - "jsonrpc-core", - "jsonrpc-pubsub", - "log 0.4.8", - "parity-scale-codec", - "parking_lot 0.10.2", - "sc-block-builder 0.8.0-rc2", - "sc-client-api 2.0.0-rc2", - "sc-executor 0.8.0-rc2", - "sc-keystore 2.0.0-rc2", - "sc-rpc-api 0.8.0-rc2", - "serde_json", - "sp-api 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-chain-spec 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-offchain 2.0.0-rc2", - "sp-rpc 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-session 2.0.0-rc2", - "sp-state-machine 0.8.0-rc2", - "sp-transaction-pool 2.0.0-rc2", - "sp-utils 2.0.0-rc2", - "sp-version 2.0.0-rc2", + "substrate-prometheus-endpoint", ] [[package]] @@ -6936,48 +6104,24 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", - "sc-block-builder 0.8.0-rc3", - "sc-client-api 2.0.0-rc3", - "sc-executor 0.8.0-rc3", - "sc-keystore 2.0.0-rc3", - "sc-rpc-api 0.8.0-rc3", + "sc-block-builder", + "sc-client-api", + "sc-executor", + "sc-keystore", + "sc-rpc-api", "serde_json", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-chain-spec 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-offchain 2.0.0-rc3", - "sp-rpc 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-utils 2.0.0-rc3", - "sp-version 2.0.0-rc3", -] - -[[package]] -name = "sc-rpc-api" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "futures 0.3.5", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", - "log 0.4.8", - "parity-scale-codec", - "parking_lot 0.10.2", - "serde", - "serde_json", - "sp-chain-spec 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-rpc 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-transaction-pool 2.0.0-rc2", - "sp-version 2.0.0-rc2", + "sp-api", + "sp-blockchain", + "sp-chain-spec", + "sp-core", + "sp-offchain", + "sp-rpc", + "sp-runtime", + "sp-session", + "sp-state-machine", + "sp-transaction-pool", + "sp-utils", + "sp-version", ] [[package]] @@ -6996,27 +6140,12 @@ dependencies = [ "parking_lot 0.10.2", "serde", "serde_json", - "sp-chain-spec 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-rpc 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-version 2.0.0-rc3", -] - -[[package]] -name = "sc-rpc-server" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "jsonrpc-core", - "jsonrpc-http-server", - "jsonrpc-pubsub", - "jsonrpc-ws-server", - "log 0.4.8", - "serde", - "serde_json", - "sp-runtime 2.0.0-rc2", + "sp-chain-spec", + "sp-core", + "sp-rpc", + "sp-runtime", + "sp-transaction-pool", + "sp-version", ] [[package]] @@ -7031,66 +6160,7 @@ dependencies = [ "log 0.4.8", "serde", "serde_json", - "sp-runtime 2.0.0-rc3", -] - -[[package]] -name = "sc-service" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "exit-future", - "futures 0.1.29", - "futures 0.3.5", - "futures-timer 3.0.2", - "hash-db", - "lazy_static", - "log 0.4.8", - "netstat2", - "parity-multiaddr 0.7.3", - "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.10.2", - "pin-project", - "procfs", - "rand 0.7.3", - "sc-block-builder 0.8.0-rc2", - "sc-chain-spec 2.0.0-rc2", - "sc-client-api 2.0.0-rc2", - "sc-client-db 0.8.0-rc2", - "sc-executor 0.8.0-rc2", - "sc-informant 0.8.0-rc2", - "sc-keystore 2.0.0-rc2", - "sc-network 0.8.0-rc2", - "sc-offchain 2.0.0-rc2", - "sc-rpc 2.0.0-rc2", - "sc-rpc-server 2.0.0-rc2", - "sc-telemetry 2.0.0-rc2", - "sc-tracing 2.0.0-rc2", - "sc-transaction-pool 2.0.0-rc2", - "serde", - "serde_json", - "slog", - "sp-api 2.0.0-rc2", - "sp-application-crypto 2.0.0-rc2", - "sp-block-builder 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-core 2.0.0-rc2", - "sp-externalities 0.8.0-rc2", - "sp-io 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-session 2.0.0-rc2", - "sp-state-machine 0.8.0-rc2", - "sp-transaction-pool 2.0.0-rc2", - "sp-trie 2.0.0-rc2", - "sp-utils 2.0.0-rc2", - "sp-version 2.0.0-rc2", - "substrate-prometheus-endpoint 0.8.0-rc2", - "sysinfo", - "tracing", - "wasm-timer", + "sp-runtime", ] [[package]] @@ -7116,60 +6186,46 @@ dependencies = [ "pin-project", "procfs", "rand 0.7.3", - "sc-block-builder 0.8.0-rc3", - "sc-chain-spec 2.0.0-rc3", - "sc-client-api 2.0.0-rc3", - "sc-client-db 0.8.0-rc3", - "sc-executor 0.8.0-rc3", - "sc-informant 0.8.0-rc3", - "sc-keystore 2.0.0-rc3", + "sc-block-builder", + "sc-chain-spec", + "sc-client-api", + "sc-client-db", + "sc-executor", + "sc-informant", + "sc-keystore", "sc-light", - "sc-network 0.8.0-rc3", - "sc-offchain 2.0.0-rc3", - "sc-rpc 2.0.0-rc3", - "sc-rpc-server 2.0.0-rc3", - "sc-telemetry 2.0.0-rc3", - "sc-tracing 2.0.0-rc3", - "sc-transaction-pool 2.0.0-rc3", + "sc-network", + "sc-offchain", + "sc-rpc", + "sc-rpc-server", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", "serde", "serde_json", "slog", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-block-builder 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-externalities 0.8.0-rc3", - "sp-io 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-trie 2.0.0-rc3", - "sp-utils 2.0.0-rc3", - "sp-version 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", + "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", "tempfile", "tracing", "wasm-timer", ] -[[package]] -name = "sc-state-db" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "log 0.4.8", - "parity-scale-codec", - "parity-util-mem", - "parity-util-mem-derive", - "parking_lot 0.10.2", - "sc-client-api 2.0.0-rc2", - "sp-core 2.0.0-rc2", -] - [[package]] name = "sc-state-db" version = "0.8.0-rc3" @@ -7180,30 +6236,8 @@ dependencies = [ "parity-util-mem", "parity-util-mem-derive", "parking_lot 0.10.2", - "sc-client-api 2.0.0-rc3", - "sp-core 2.0.0-rc3", -] - -[[package]] -name = "sc-telemetry" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "bytes 0.5.4", - "futures 0.3.5", - "futures-timer 3.0.2", - "libp2p", - "log 0.4.8", - "parking_lot 0.10.2", - "pin-project", - "rand 0.7.3", - "serde", - "slog", - "slog-json", - "slog-scope", - "take_mut", - "void", - "wasm-timer", + "sc-client-api", + "sp-core", ] [[package]] @@ -7228,21 +6262,6 @@ dependencies = [ "wasm-timer", ] -[[package]] -name = "sc-tracing" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "erased-serde", - "log 0.4.8", - "parking_lot 0.10.2", - "sc-telemetry 2.0.0-rc2", - "serde", - "serde_json", - "slog", - "tracing-core", -] - [[package]] name = "sc-tracing" version = "2.0.0-rc3" @@ -7251,33 +6270,13 @@ dependencies = [ "erased-serde", "log 0.4.8", "parking_lot 0.10.2", - "sc-telemetry 2.0.0-rc3", + "sc-telemetry", "serde", "serde_json", "slog", "tracing-core", ] -[[package]] -name = "sc-transaction-graph" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "futures 0.3.5", - "linked-hash-map", - "log 0.4.8", - "parity-util-mem", - "parking_lot 0.10.2", - "serde", - "sp-blockchain 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-transaction-pool 2.0.0-rc2", - "sp-utils 2.0.0-rc2", - "wasm-timer", -] - [[package]] name = "sc-transaction-graph" version = "2.0.0-rc3" @@ -7290,37 +6289,11 @@ dependencies = [ "parity-util-mem", "parking_lot 0.10.2", "serde", - "sp-blockchain 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-utils 2.0.0-rc3", - "wasm-timer", -] - -[[package]] -name = "sc-transaction-pool" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "futures 0.3.5", - "futures-diagnose", - "intervalier", - "log 0.4.8", - "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.10.2", - "sc-client-api 2.0.0-rc2", - "sc-transaction-graph 2.0.0-rc2", - "sp-api 2.0.0-rc2", - "sp-blockchain 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-tracing 2.0.0-rc2", - "sp-transaction-pool 2.0.0-rc2", - "sp-utils 2.0.0-rc2", - "substrate-prometheus-endpoint 0.8.0-rc2", + "sp-blockchain", + "sp-core", + "sp-runtime", + "sp-transaction-pool", + "sp-utils", "wasm-timer", ] @@ -7337,16 +6310,16 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.10.2", - "sc-client-api 2.0.0-rc3", - "sc-transaction-graph 2.0.0-rc3", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-tracing 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-utils 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", + "sc-client-api", + "sc-transaction-graph", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "sp-tracing", + "sp-transaction-pool", + "sp-utils", + "substrate-prometheus-endpoint", "wasm-timer", ] @@ -7711,18 +6684,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sp-allocator" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "log 0.4.8", - "sp-core 2.0.0-rc2", - "sp-std 2.0.0-rc2", - "sp-wasm-interface 2.0.0-rc2", -] - [[package]] name = "sp-allocator" version = "2.0.0-rc3" @@ -7730,24 +6691,9 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "derive_more 0.99.7", "log 0.4.8", - "sp-core 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-wasm-interface 2.0.0-rc3", -] - -[[package]] -name = "sp-api" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "hash-db", - "parity-scale-codec", - "sp-api-proc-macro 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-state-machine 0.8.0-rc2", - "sp-std 2.0.0-rc2", - "sp-version 2.0.0-rc2", + "sp-core", + "sp-std", + "sp-wasm-interface", ] [[package]] @@ -7757,24 +6703,12 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "hash-db", "parity-scale-codec", - "sp-api-proc-macro 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", - "sp-std 2.0.0-rc3", - "sp-version 2.0.0-rc3", -] - -[[package]] -name = "sp-api-proc-macro" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "blake2-rfc", - "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "sp-api-proc-macro", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-version", ] [[package]] @@ -7789,18 +6723,6 @@ dependencies = [ "syn 1.0.27", ] -[[package]] -name = "sp-application-crypto" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "serde", - "sp-core 2.0.0-rc2", - "sp-io 2.0.0-rc2", - "sp-std 2.0.0-rc2", -] - [[package]] name = "sp-application-crypto" version = "2.0.0-rc3" @@ -7808,22 +6730,9 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "parity-scale-codec", "serde", - "sp-core 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-arithmetic" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "integer-sqrt", - "num-traits 0.2.11", - "parity-scale-codec", - "serde", - "sp-debug-derive 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -7835,20 +6744,8 @@ dependencies = [ "num-traits 0.2.11", "parity-scale-codec", "serde", - "sp-debug-derive 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-authority-discovery" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "sp-api 2.0.0-rc2", - "sp-application-crypto 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -7857,21 +6754,10 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-authorship" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "sp-inherents 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-api", + "sp-application-crypto", + "sp-runtime", + "sp-std", ] [[package]] @@ -7880,21 +6766,9 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-block-builder" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "sp-api 2.0.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -7903,26 +6777,10 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-api 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-blockchain" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "log 0.4.8", - "lru", - "parity-scale-codec", - "parking_lot 0.10.2", - "sp-block-builder 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-state-machine 0.8.0-rc2", + "sp-api", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -7935,19 +6793,10 @@ dependencies = [ "lru", "parity-scale-codec", "parking_lot 0.10.2", - "sp-block-builder 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", -] - -[[package]] -name = "sp-chain-spec" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "serde", - "serde_json", + "sp-block-builder", + "sp-consensus", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -7959,29 +6808,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "sp-consensus" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "futures 0.3.5", - "futures-timer 3.0.2", - "libp2p", - "log 0.4.8", - "parity-scale-codec", - "parking_lot 0.10.2", - "serde", - "sp-core 2.0.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-state-machine 0.8.0-rc2", - "sp-std 2.0.0-rc2", - "sp-utils 2.0.0-rc2", - "sp-version 2.0.0-rc2", - "substrate-prometheus-endpoint 0.8.0-rc2", -] - [[package]] name = "sp-consensus" version = "0.8.0-rc3" @@ -7995,14 +6821,14 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "serde", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", - "sp-std 2.0.0-rc3", - "sp-utils 2.0.0-rc3", - "sp-version 2.0.0-rc3", - "substrate-prometheus-endpoint 0.8.0-rc3", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-utils", + "sp-version", + "substrate-prometheus-endpoint", ] [[package]] @@ -8011,29 +6837,12 @@ version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-timestamp 2.0.0-rc3", -] - -[[package]] -name = "sp-consensus-babe" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "merlin", - "parity-scale-codec", - "sp-api 2.0.0-rc2", - "sp-application-crypto 2.0.0-rc2", - "sp-consensus 0.8.0-rc2", - "sp-consensus-vrf 0.8.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", - "sp-timestamp 2.0.0-rc2", + "sp-api", + "sp-application-crypto", + "sp-inherents", + "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] @@ -8043,26 +6852,14 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "merlin", "parity-scale-codec", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-consensus-vrf 0.8.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-timestamp 2.0.0-rc3", -] - -[[package]] -name = "sp-consensus-vrf" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "schnorrkel", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-api", + "sp-application-crypto", + "sp-consensus", + "sp-consensus-vrf", + "sp-inherents", + "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] @@ -8071,52 +6868,10 @@ version = "0.8.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "schnorrkel", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-core" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "base58", - "blake2-rfc", - "byteorder", - "derive_more 0.99.7", - "ed25519-dalek", - "futures 0.3.5", - "hash-db", - "hash256-std-hasher", - "hex", - "impl-serde 0.3.1", - "lazy_static", - "libsecp256k1", - "log 0.4.8", - "merlin", - "num-traits 0.2.11", - "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.10.2", - "primitive-types", - "rand 0.7.3", - "regex", - "schnorrkel", - "serde", - "sha2", - "sp-debug-derive 2.0.0-rc2", - "sp-externalities 0.8.0-rc2", - "sp-runtime-interface 2.0.0-rc2", - "sp-std 2.0.0-rc2", - "sp-storage 2.0.0-rc2", - "substrate-bip39", - "tiny-bip39", - "tiny-keccak 2.0.2", - "twox-hash", - "wasmi", - "zeroize", + "schnorrkel", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -8148,11 +6903,11 @@ dependencies = [ "schnorrkel", "serde", "sha2", - "sp-debug-derive 2.0.0-rc3", - "sp-externalities 0.8.0-rc3", - "sp-runtime-interface 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-storage 2.0.0-rc3", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "substrate-bip39", "tiny-bip39", "tiny-keccak 2.0.2", @@ -8161,15 +6916,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-database" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "kvdb", - "parking_lot 0.10.2", -] - [[package]] name = "sp-database" version = "2.0.0-rc3" @@ -8179,16 +6925,6 @@ dependencies = [ "parking_lot 0.10.2", ] -[[package]] -name = "sp-debug-derive" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", -] - [[package]] name = "sp-debug-derive" version = "2.0.0-rc3" @@ -8199,17 +6935,6 @@ dependencies = [ "syn 1.0.27", ] -[[package]] -name = "sp-externalities" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 2.0.0-rc2", - "sp-storage 2.0.0-rc2", -] - [[package]] name = "sp-externalities" version = "0.8.0-rc3" @@ -8217,24 +6942,8 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "environmental", "parity-scale-codec", - "sp-std 2.0.0-rc3", - "sp-storage 2.0.0-rc3", -] - -[[package]] -name = "sp-finality-grandpa" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "finality-grandpa", - "log 0.4.8", - "parity-scale-codec", - "serde", - "sp-api 2.0.0-rc2", - "sp-application-crypto 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-std", + "sp-storage", ] [[package]] @@ -8246,21 +6955,11 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "serde", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-finality-tracker" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "sp-inherents 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -8269,20 +6968,8 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-inherents 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-inherents" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "parity-scale-codec", - "parking_lot 0.10.2", - "sp-core 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-inherents", + "sp-std", ] [[package]] @@ -8293,28 +6980,8 @@ dependencies = [ "derive_more 0.99.7", "parity-scale-codec", "parking_lot 0.10.2", - "sp-core 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-io" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "futures 0.3.5", - "hash-db", - "libsecp256k1", - "log 0.4.8", - "parity-scale-codec", - "parking_lot 0.10.2", - "sp-core 2.0.0-rc2", - "sp-externalities 0.8.0-rc2", - "sp-runtime-interface 2.0.0-rc2", - "sp-state-machine 0.8.0-rc2", - "sp-std 2.0.0-rc2", - "sp-trie 2.0.0-rc2", - "sp-wasm-interface 2.0.0-rc2", + "sp-core", + "sp-std", ] [[package]] @@ -8328,24 +6995,13 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "parking_lot 0.10.2", - "sp-core 2.0.0-rc3", - "sp-externalities 0.8.0-rc3", - "sp-runtime-interface 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", - "sp-std 2.0.0-rc3", - "sp-trie 2.0.0-rc3", - "sp-wasm-interface 2.0.0-rc3", -] - -[[package]] -name = "sp-keyring" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "lazy_static", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "strum", + "sp-core", + "sp-externalities", + "sp-runtime-interface", + "sp-state-machine", + "sp-std", + "sp-trie", + "sp-wasm-interface", ] [[package]] @@ -8354,8 +7010,8 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "lazy_static", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", + "sp-core", + "sp-runtime", "strum", ] @@ -8366,9 +7022,9 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "parity-scale-codec", "serde", - "sp-arithmetic 2.0.0-rc3", + "sp-arithmetic", "sp-npos-elections-compact", - "sp-std 2.0.0-rc3", + "sp-std", ] [[package]] @@ -8382,33 +7038,14 @@ dependencies = [ "syn 1.0.27", ] -[[package]] -name = "sp-offchain" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "sp-api 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", -] - [[package]] name = "sp-offchain" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "sp-api 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", -] - -[[package]] -name = "sp-panic-handler" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "backtrace", - "log 0.4.8", + "sp-api", + "sp-core", + "sp-runtime", ] [[package]] @@ -8420,66 +7057,13 @@ dependencies = [ "log 0.4.8", ] -[[package]] -name = "sp-phragmen" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "serde", - "sp-arithmetic 2.0.0-rc2", - "sp-phragmen-compact", - "sp-std 2.0.0-rc2", -] - -[[package]] -name = "sp-phragmen-compact" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", -] - -[[package]] -name = "sp-rpc" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "serde", - "sp-core 2.0.0-rc2", -] - [[package]] name = "sp-rpc" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "serde", - "sp-core 2.0.0-rc3", -] - -[[package]] -name = "sp-runtime" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "hash256-std-hasher", - "impl-trait-for-tuples", - "log 0.4.8", - "parity-scale-codec", - "parity-util-mem", - "paste", - "rand 0.7.3", - "serde", - "sp-application-crypto 2.0.0-rc2", - "sp-arithmetic 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-io 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-core", ] [[package]] @@ -8496,27 +7080,12 @@ dependencies = [ "paste", "rand 0.7.3", "serde", - "sp-application-crypto 2.0.0-rc3", - "sp-arithmetic 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-runtime-interface" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.8.0-rc2", - "sp-runtime-interface-proc-macro 2.0.0-rc2", - "sp-std 2.0.0-rc2", - "sp-tracing 2.0.0-rc2", - "sp-wasm-interface 2.0.0-rc2", - "static_assertions", + "sp-application-crypto", + "sp-arithmetic", + "sp-core", + "sp-inherents", + "sp-io", + "sp-std", ] [[package]] @@ -8526,26 +7095,14 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "parity-scale-codec", "primitive-types", - "sp-externalities 0.8.0-rc3", - "sp-runtime-interface-proc-macro 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-tracing 2.0.0-rc3", - "sp-wasm-interface 2.0.0-rc3", + "sp-externalities", + "sp-runtime-interface-proc-macro", + "sp-std", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "Inflector", - "proc-macro-crate", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", -] - [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc3" @@ -8558,15 +7115,6 @@ dependencies = [ "syn 1.0.27", ] -[[package]] -name = "sp-serializer" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "serde", - "serde_json", -] - [[package]] name = "sp-serializer" version = "2.0.0-rc3" @@ -8576,40 +7124,17 @@ dependencies = [ "serde_json", ] -[[package]] -name = "sp-session" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "sp-api 2.0.0-rc2", - "sp-core 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-staking 2.0.0-rc2", - "sp-std 2.0.0-rc2", -] - [[package]] name = "sp-session" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-api 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-staking" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "parity-scale-codec", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", + "sp-api", + "sp-core", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -8618,27 +7143,8 @@ version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ "parity-scale-codec", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-state-machine" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "hash-db", - "log 0.4.8", - "num-traits 0.2.11", - "parity-scale-codec", - "parking_lot 0.10.2", - "rand 0.7.3", - "sp-core 2.0.0-rc2", - "sp-externalities 0.8.0-rc2", - "sp-panic-handler 2.0.0-rc2", - "sp-trie 2.0.0-rc2", - "trie-db", - "trie-root", + "sp-runtime", + "sp-std", ] [[package]] @@ -8652,36 +7158,19 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "rand 0.7.3", - "sp-core 2.0.0-rc3", - "sp-externalities 0.8.0-rc3", - "sp-panic-handler 2.0.0-rc3", - "sp-trie 2.0.0-rc3", + "sp-core", + "sp-externalities", + "sp-panic-handler", + "sp-trie", "trie-db", "trie-root", ] -[[package]] -name = "sp-std" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" - [[package]] name = "sp-std" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" -[[package]] -name = "sp-storage" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "impl-serde 0.2.3", - "ref-cast", - "serde", - "sp-debug-derive 2.0.0-rc2", - "sp-std 2.0.0-rc2", -] - [[package]] name = "sp-storage" version = "2.0.0-rc3" @@ -8690,22 +7179,8 @@ dependencies = [ "impl-serde 0.2.3", "ref-cast", "serde", - "sp-debug-derive 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-timestamp" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-api 2.0.0-rc2", - "sp-inherents 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", - "wasm-timer", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -8715,21 +7190,13 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", - "sp-api 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-api", + "sp-inherents", + "sp-runtime", + "sp-std", "wasm-timer", ] -[[package]] -name = "sp-tracing" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "tracing", -] - [[package]] name = "sp-tracing" version = "2.0.0-rc3" @@ -8738,21 +7205,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "sp-transaction-pool" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "derive_more 0.99.7", - "futures 0.3.5", - "log 0.4.8", - "parity-scale-codec", - "serde", - "sp-api 2.0.0-rc2", - "sp-runtime 2.0.0-rc2", - "sp-utils 2.0.0-rc2", -] - [[package]] name = "sp-transaction-pool" version = "2.0.0-rc3" @@ -8763,24 +7215,10 @@ dependencies = [ "log 0.4.8", "parity-scale-codec", "serde", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-utils 2.0.0-rc3", -] - -[[package]] -name = "sp-trie" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "hash-db", - "memory-db", - "parity-scale-codec", - "sp-core 2.0.0-rc2", - "sp-std 2.0.0-rc2", - "trie-db", - "trie-root", + "sp-api", + "sp-blockchain", + "sp-runtime", + "sp-utils", ] [[package]] @@ -8791,23 +7229,12 @@ dependencies = [ "hash-db", "memory-db", "parity-scale-codec", - "sp-core 2.0.0-rc3", - "sp-std 2.0.0-rc3", + "sp-core", + "sp-std", "trie-db", "trie-root", ] -[[package]] -name = "sp-utils" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "futures 0.3.5", - "futures-core", - "lazy_static", - "prometheus", -] - [[package]] name = "sp-utils" version = "2.0.0-rc3" @@ -8819,18 +7246,6 @@ dependencies = [ "prometheus", ] -[[package]] -name = "sp-version" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "impl-serde 0.2.3", - "parity-scale-codec", - "serde", - "sp-runtime 2.0.0-rc2", - "sp-std 2.0.0-rc2", -] - [[package]] name = "sp-version" version = "2.0.0-rc3" @@ -8839,19 +7254,8 @@ dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", "serde", - "sp-runtime 2.0.0-rc3", - "sp-std 2.0.0-rc3", -] - -[[package]] -name = "sp-wasm-interface" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-std 2.0.0-rc2", - "wasmi", + "sp-runtime", + "sp-std", ] [[package]] @@ -8861,7 +7265,7 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", - "sp-std 2.0.0-rc3", + "sp-std", "wasmi", ] @@ -8892,15 +7296,6 @@ dependencies = [ "rand 0.5.6", ] -[[package]] -name = "stream-cipher" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" -dependencies = [ - "generic-array", -] - [[package]] name = "streamunordered" version = "0.5.1" @@ -9012,11 +7407,11 @@ dependencies = [ "log 0.4.8", "rand 0.6.5", "rand 0.7.3", - "sc-chain-spec 2.0.0-rc3", - "sc-informant 0.8.0-rc3", - "sc-network 0.8.0-rc3", - "sc-service 0.8.0-rc3", - "sp-database 2.0.0-rc3", + "sc-chain-spec", + "sc-informant", + "sc-network", + "sc-service", + "sp-database", "wasm-bindgen", "wasm-bindgen-futures", ] @@ -9034,34 +7429,20 @@ name = "substrate-frame-rpc-system" version = "2.0.0-rc3" source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3fcc9c6affcf146b" dependencies = [ - "frame-system-rpc-runtime-api 2.0.0-rc3", + "frame-system-rpc-runtime-api", "futures 0.3.5", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "log 0.4.8", "parity-scale-codec", - "sc-client-api 2.0.0-rc3", + "sc-client-api", "serde", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", -] - -[[package]] -name = "substrate-prometheus-endpoint" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#15700a118c8200ef3a873a84b37c10a4c555ec86" -dependencies = [ - "async-std", - "derive_more 0.99.7", - "futures-util", - "hyper 0.13.5", - "log 0.4.8", - "prometheus", - "tokio 0.2.21", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "sp-transaction-pool", ] [[package]] @@ -9086,18 +7467,18 @@ dependencies = [ "futures 0.3.5", "hash-db", "parity-scale-codec", - "sc-client-api 2.0.0-rc3", - "sc-client-db 0.8.0-rc3", - "sc-consensus 0.8.0-rc3", - "sc-executor 0.8.0-rc3", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-executor", "sc-light", - "sc-service 0.8.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-state-machine 0.8.0-rc3", + "sc-service", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-keyring", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -9107,35 +7488,35 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "cfg-if", "frame-executive", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", - "frame-system-rpc-runtime-api 2.0.0-rc3", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", "log 0.4.8", "memory-db", - "pallet-babe 2.0.0-rc3", - "pallet-timestamp 2.0.0-rc3", + "pallet-babe", + "pallet-timestamp", "parity-scale-codec", "parity-util-mem", - "sc-service 0.8.0-rc3", + "sc-service", "serde", - "sp-api 2.0.0-rc3", - "sp-application-crypto 2.0.0-rc3", - "sp-block-builder 2.0.0-rc3", + "sp-api", + "sp-application-crypto", + "sp-block-builder", "sp-consensus-aura", - "sp-consensus-babe 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-finality-grandpa 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-offchain 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-runtime-interface 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-trie 2.0.0-rc3", - "sp-version 2.0.0-rc3", + "sp-consensus-babe", + "sp-core", + "sp-finality-grandpa", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-offchain", + "sp-runtime", + "sp-runtime-interface", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-trie", + "sp-version", "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate)", "trie-db", ] @@ -9147,16 +7528,16 @@ source = "git+https://github.com/paritytech/substrate#a684e831b2a12e696240168a3f dependencies = [ "futures 0.3.5", "parity-scale-codec", - "sc-block-builder 0.8.0-rc3", - "sc-client-api 2.0.0-rc3", - "sc-consensus 0.8.0-rc3", + "sc-block-builder", + "sc-client-api", + "sc-consensus", "sc-light", - "sc-service 0.8.0-rc3", - "sp-api 2.0.0-rc3", - "sp-blockchain 2.0.0-rc3", - "sp-consensus 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", + "sc-service", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", "substrate-test-client", "substrate-test-runtime", ] @@ -9395,7 +7776,7 @@ dependencies = [ "dlmalloc", "parity-scale-codec", "polkadot-parachain", - "sp-io 2.0.0-rc3", + "sp-io", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", ] @@ -9410,8 +7791,8 @@ dependencies = [ "polkadot-collator", "polkadot-parachain", "polkadot-primitives", - "sc-client-api 2.0.0-rc3", - "sp-core 2.0.0-rc3", + "sc-client-api", + "sp-core", "test-parachain-adder", ] @@ -9422,7 +7803,7 @@ dependencies = [ "dlmalloc", "parity-scale-codec", "polkadot-parachain", - "sp-io 2.0.0-rc3", + "sp-io", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", ] @@ -9891,17 +8272,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" -[[package]] -name = "twofish" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712d261e83e727c8e2dbb75dacac67c36e35db36a958ee504f2164fc052434e1" -dependencies = [ - "block-cipher-trait", - "byteorder", - "opaque-debug", -] - [[package]] name = "twox-hash" version = "1.5.0" @@ -10311,18 +8681,18 @@ name = "westend-runtime" version = "0.8.7" dependencies = [ "bitvec", - "frame-benchmarking 2.0.0-rc3", + "frame-benchmarking", "frame-executive", - "frame-support 2.0.0-rc3", - "frame-system 2.0.0-rc3", + "frame-support", + "frame-system", "frame-system-benchmarking", - "frame-system-rpc-runtime-api 2.0.0-rc3", + "frame-system-rpc-runtime-api", "hex-literal", "libsecp256k1", "log 0.3.9", "pallet-authority-discovery", - "pallet-authorship 2.0.0-rc3", - "pallet-babe 2.0.0-rc3", + "pallet-authorship", + "pallet-babe", "pallet-balances", "pallet-collective", "pallet-democracy", @@ -10330,7 +8700,7 @@ dependencies = [ "pallet-finality-tracker", "pallet-grandpa", "pallet-identity", - "pallet-im-online 2.0.0-rc3", + "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-multisig", @@ -10341,15 +8711,15 @@ dependencies = [ "pallet-randomness-collective-flip", "pallet-recovery", "pallet-scheduler", - "pallet-session 2.0.0-rc3", + "pallet-session", "pallet-session-benchmarking", "pallet-society", - "pallet-staking 2.0.0-rc3", + "pallet-staking", "pallet-staking-reward-curve", "pallet-sudo", - "pallet-timestamp 2.0.0-rc3", + "pallet-timestamp", "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api 2.0.0-rc3", + "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting", @@ -10362,22 +8732,22 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.4.0", - "sp-api 2.0.0-rc3", - "sp-authority-discovery 2.0.0-rc3", - "sp-block-builder 2.0.0-rc3", - "sp-consensus-babe 0.8.0-rc3", - "sp-core 2.0.0-rc3", - "sp-inherents 2.0.0-rc3", - "sp-io 2.0.0-rc3", - "sp-keyring 2.0.0-rc3", - "sp-offchain 2.0.0-rc3", - "sp-runtime 2.0.0-rc3", - "sp-session 2.0.0-rc3", - "sp-staking 2.0.0-rc3", - "sp-std 2.0.0-rc3", - "sp-transaction-pool 2.0.0-rc3", - "sp-trie 2.0.0-rc3", - "sp-version 2.0.0-rc3", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-transaction-pool", + "sp-trie", + "sp-version", "static_assertions", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", diff --git a/polkadot-test/Cargo.toml b/polkadot-test/Cargo.toml index 151b52f8f113..ec0f2c2f2173 100644 --- a/polkadot-test/Cargo.toml +++ b/polkadot-test/Cargo.toml @@ -22,46 +22,46 @@ polkadot-test-runtime = { path = "../runtime/test-runtime" } polkadot-network = { path = "../network", optional = true } polkadot-rpc = { path = "../rpc" } polkadot-service = { path = "../service" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +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 = "cumulus-branch" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +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 = "cumulus-branch" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } env_logger = "0.7.0" [features] diff --git a/polkadot-test/src/lib.rs b/polkadot-test/src/lib.rs index 4d8c2c320318..7626aec00a46 100644 --- a/polkadot-test/src/lib.rs +++ b/polkadot-test/src/lib.rs @@ -45,7 +45,6 @@ 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}; pub use polkadot_service::{PolkadotChainSpec, KusamaChainSpec, WestendChainSpec}; -#[cfg(feature = "full-node")] pub use consensus::run_validation_worker; pub use codec::Codec; pub use polkadot_runtime; From b5ee29ebc46f0c811f4aa98c8fce0466cd9a59d4 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 11:12:32 +0200 Subject: [PATCH 04/92] CLEANUP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 5 ----- polkadot-test/Cargo.toml | 15 +++----------- polkadot-test/src/lib.rs | 43 +++++++++------------------------------- 3 files changed, 12 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 836749ef5d19..d63b24da691a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4537,20 +4537,17 @@ dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", "hex-literal", - "kusama-runtime", "lazy_static", "log 0.4.8", "pallet-babe", "pallet-im-online", "pallet-staking", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", "parking_lot 0.9.0", "polkadot-availability-store", "polkadot-network", "polkadot-primitives", "polkadot-rpc", - "polkadot-runtime", "polkadot-service", "polkadot-test-runtime", "polkadot-test-runtime-client", @@ -4585,8 +4582,6 @@ dependencies = [ "sp-runtime", "sp-session", "sp-transaction-pool", - "substrate-prometheus-endpoint", - "westend-runtime", ] [[package]] diff --git a/polkadot-test/Cargo.toml b/polkadot-test/Cargo.toml index ec0f2c2f2173..b4095cea5a40 100644 --- a/polkadot-test/Cargo.toml +++ b/polkadot-test/Cargo.toml @@ -12,14 +12,11 @@ log = "0.4.8" futures = "0.3.4" slog = "2.5.2" hex-literal = "0.2.1" -av_store = { package = "polkadot-availability-store", path = "../availability-store", optional = true } -consensus = { package = "polkadot-validation", path = "../validation", optional = true } +av_store = { package = "polkadot-availability-store", path = "../availability-store" } +consensus = { package = "polkadot-validation", path = "../validation" } polkadot-primitives = { path = "../primitives" } -polkadot-runtime = { path = "../runtime/polkadot" } -kusama-runtime = { path = "../runtime/kusama" } -westend-runtime = { path = "../runtime/westend" } polkadot-test-runtime = { path = "../runtime/test-runtime" } -polkadot-network = { path = "../network", optional = true } +polkadot-network = { path = "../network" } polkadot-rpc = { path = "../rpc" } polkadot-service = { path = "../service" } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -53,10 +50,8 @@ babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/par 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 = "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] @@ -65,7 +60,3 @@ sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = " env_logger = "0.7.0" [features] -default = ["db", "full-node"] -db = ["service/db"] -runtime-benchmarks = ["polkadot-runtime/runtime-benchmarks", "kusama-runtime/runtime-benchmarks", "westend-runtime/runtime-benchmarks"] -full-node = ["av_store", "consensus", "polkadot-network"] diff --git a/polkadot-test/src/lib.rs b/polkadot-test/src/lib.rs index 7626aec00a46..c01da0f2d274 100644 --- a/polkadot-test/src/lib.rs +++ b/polkadot-test/src/lib.rs @@ -16,44 +16,19 @@ //! Polkadot service. Specialized wrapper over substrate service. -//pub mod chain_spec; -//mod grandpa_support; -//mod client; - use std::sync::Arc; use std::time::Duration; -use polkadot_primitives::{parachain, Hash, BlockId, AccountId, Nonce, Balance}; -#[cfg(feature = "full-node")] +use polkadot_primitives::{parachain, Hash, BlockId}; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; -use service::{error::Error as ServiceError, ServiceBuilder}; -use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider}; -use sc_executor::native_executor_instance; +use service::{error::Error as ServiceError}; +use grandpa::{FinalityProofProvider as GrandpaFinalityProofProvider}; use log::info; -pub use service::{ - AbstractService, Role, PruningMode, TransactionPoolOptions, Error, RuntimeGenesis, - TFullClient, TLightClient, TFullBackend, TLightBackend, TFullCallExecutor, TLightCallExecutor, - Configuration, ChainSpec, ServiceBuilderCommand, -}; -pub use service::config::{DatabaseConfig, PrometheusConfig}; -pub use sc_executor::NativeExecutionDispatch; -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}; -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}; -pub use polkadot_service::{PolkadotChainSpec, KusamaChainSpec, WestendChainSpec}; -pub use consensus::run_validation_worker; -pub use codec::Codec; -pub use polkadot_runtime; -pub use kusama_runtime; -pub use westend_runtime; -pub use polkadot_test_runtime; -use prometheus_endpoint::Registry; -pub use polkadot_service::PolkadotClient; -pub use polkadot_service::{grandpa_support, new_full, new_full_start, FullNodeHandles, IdentifyVariant, PolkadotExecutor}; +use service::{AbstractService, Role, TFullBackend, Configuration}; +use consensus_common::{SelectChain, block_validation::Chain}; +use polkadot_primitives::parachain::{CollatorId}; +use polkadot_primitives::Block; +use polkadot_service::PolkadotClient; +use polkadot_service::{grandpa_support, new_full, new_full_start, FullNodeHandles, IdentifyVariant, PolkadotExecutor}; /// Create a new Polkadot test service for a full node. pub fn polkadot_test_new_full( From d2428b4b668d3d233bf7f9668a6db3b694e5683a Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 11:32:37 +0200 Subject: [PATCH 05/92] CLEANUP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 29 ----------------------------- polkadot-test/Cargo.toml | 32 -------------------------------- 2 files changed, 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d63b24da691a..f9b3f156c80f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4532,56 +4532,27 @@ dependencies = [ name = "polkadot-test" version = "0.8.2" dependencies = [ - "env_logger", - "frame-benchmarking", - "frame-system-rpc-runtime-api", "futures 0.3.5", - "hex-literal", - "lazy_static", "log 0.4.8", - "pallet-babe", - "pallet-im-online", - "pallet-staking", - "pallet-transaction-payment-rpc-runtime-api", - "parking_lot 0.9.0", "polkadot-availability-store", "polkadot-network", "polkadot-primitives", "polkadot-rpc", "polkadot-service", "polkadot-test-runtime", - "polkadot-test-runtime-client", "polkadot-validation", "sc-authority-discovery", - "sc-block-builder", - "sc-chain-spec", "sc-client-api", - "sc-client-db", "sc-consensus", "sc-consensus-babe", - "sc-executor", "sc-finality-grandpa", - "sc-keystore", "sc-network", "sc-service", - "sc-telemetry", "sc-transaction-pool", - "serde", - "slog", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", "sp-consensus", - "sp-consensus-babe", "sp-core", "sp-finality-grandpa", "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-transaction-pool", ] [[package]] diff --git a/polkadot-test/Cargo.toml b/polkadot-test/Cargo.toml index b4095cea5a40..02237799bb6d 100644 --- a/polkadot-test/Cargo.toml +++ b/polkadot-test/Cargo.toml @@ -5,13 +5,8 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -parking_lot = "0.9.0" -serde = { version = "1.0.102", features = ["derive"] } -lazy_static = "1.4.0" log = "0.4.8" futures = "0.3.4" -slog = "2.5.2" -hex-literal = "0.2.1" av_store = { package = "polkadot-availability-store", path = "../availability-store" } consensus = { package = "polkadot-validation", path = "../validation" } polkadot-primitives = { path = "../primitives" } @@ -19,15 +14,8 @@ polkadot-test-runtime = { path = "../runtime/test-runtime" } polkadot-network = { path = "../network" } polkadot-rpc = { path = "../rpc" } polkadot-service = { path = "../service" } -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" } @@ -35,28 +23,8 @@ grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytec 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" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-offchain = { package = "sp-offchain", 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 = "master" } -env_logger = "0.7.0" [features] From 587870d7330884aa69d9080d0949a5d7175117fe Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 11:34:29 +0200 Subject: [PATCH 06/92] CLEANUP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- polkadot-test/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-test/src/lib.rs b/polkadot-test/src/lib.rs index c01da0f2d274..b667f04fe48d 100644 --- a/polkadot-test/src/lib.rs +++ b/polkadot-test/src/lib.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . -//! Polkadot service. Specialized wrapper over substrate service. +//! Polkadot test service only. use std::sync::Arc; use std::time::Duration; From 886d76f8250f4c7b058d5dc1c8cbe12478df8d29 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 11:36:21 +0200 Subject: [PATCH 07/92] Rename to polkadot-test-service and rename dir --- Cargo.lock | 54 +++++++++---------- Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../src/lib.rs | 0 4 files changed, 29 insertions(+), 29 deletions(-) rename {polkadot-test => polkadot-test-service}/Cargo.toml (98%) rename {polkadot-test => polkadot-test-service}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index f9b3f156c80f..68052ebecf72 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4528,33 +4528,6 @@ dependencies = [ "sp-core", ] -[[package]] -name = "polkadot-test" -version = "0.8.2" -dependencies = [ - "futures 0.3.5", - "log 0.4.8", - "polkadot-availability-store", - "polkadot-network", - "polkadot-primitives", - "polkadot-rpc", - "polkadot-service", - "polkadot-test-runtime", - "polkadot-validation", - "sc-authority-discovery", - "sc-client-api", - "sc-consensus", - "sc-consensus-babe", - "sc-finality-grandpa", - "sc-network", - "sc-service", - "sc-transaction-pool", - "sp-consensus", - "sp-core", - "sp-finality-grandpa", - "sp-inherents", -] - [[package]] name = "polkadot-test-runtime" version = "0.8.7" @@ -4636,6 +4609,33 @@ dependencies = [ "substrate-test-client", ] +[[package]] +name = "polkadot-test-service" +version = "0.8.2" +dependencies = [ + "futures 0.3.5", + "log 0.4.8", + "polkadot-availability-store", + "polkadot-network", + "polkadot-primitives", + "polkadot-rpc", + "polkadot-service", + "polkadot-test-runtime", + "polkadot-validation", + "sc-authority-discovery", + "sc-client-api", + "sc-consensus", + "sc-consensus-babe", + "sc-finality-grandpa", + "sc-network", + "sc-service", + "sc-transaction-pool", + "sp-consensus", + "sp-core", + "sp-finality-grandpa", + "sp-inherents", +] + [[package]] name = "polkadot-validation" version = "0.8.7" diff --git a/Cargo.toml b/Cargo.toml index ecdb2acada20..f9864a838fd5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ members = [ "erasure-coding", "network", "network/test", - "polkadot-test", + "polkadot-test-service", "primitives", "runtime/common", "runtime/parachains", diff --git a/polkadot-test/Cargo.toml b/polkadot-test-service/Cargo.toml similarity index 98% rename from polkadot-test/Cargo.toml rename to polkadot-test-service/Cargo.toml index 02237799bb6d..754ce51bc013 100644 --- a/polkadot-test/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "polkadot-test" +name = "polkadot-test-service" version = "0.8.2" authors = ["Parity Technologies "] edition = "2018" diff --git a/polkadot-test/src/lib.rs b/polkadot-test-service/src/lib.rs similarity index 100% rename from polkadot-test/src/lib.rs rename to polkadot-test-service/src/lib.rs From 6c9531050959c1dc0d902482729d0994e80f63d4 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 14:20:09 +0200 Subject: [PATCH 08/92] Bump spec_version --- runtime/kusama/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 39aeb3e318d2..2389ff5d0b71 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -85,7 +85,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("kusama"), impl_name: create_runtime_str!("parity-kusama"), authoring_version: 2, - spec_version: 2008, + spec_version: 2009, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, From 555715a8711f844e216771185138a8423f6fc4af Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 14:32:20 +0200 Subject: [PATCH 09/92] Move code to macro to avoid adding pub fn to API --- service/src/grandpa_support.rs | 142 ------------------------------ service/src/lib.rs | 155 ++++++++++++++++++++++++++++++--- 2 files changed, 143 insertions(+), 154 deletions(-) diff --git a/service/src/grandpa_support.rs b/service/src/grandpa_support.rs index 735f0fc44a99..cb78719b64d1 100644 --- a/service/src/grandpa_support.rs +++ b/service/src/grandpa_support.rs @@ -16,7 +16,6 @@ //! Polkadot-specific GRANDPA integration utilities. -use polkadot_primitives::Hash; use sp_runtime::traits::{Block as BlockT, NumberFor}; /// A custom GRANDPA voting rule that "pauses" voting (i.e. keeps voting for the @@ -90,147 +89,6 @@ impl grandpa::VotingRule for PauseAfterBlockFor Vec<( - grandpa_primitives::SetId, - (Hash, polkadot_primitives::BlockNumber), - grandpa_primitives::AuthorityList, -)> { - use sp_core::crypto::Ss58Codec; - use std::str::FromStr; - - let forks = vec![ - ( - 623, - "01e94e1e7e9cf07b3b0bf4e1717fce7448e5563901c2ef2e3b8e9ecaeba088b1", - 1492283, - ), - ( - 624, - "ddc4323c5e8966844dfaa87e0c2f74ef6b43115f17bf8e4ff38845a62d02b9a9", - 1492436, - ), - ( - 625, - "38ba115b296663e424e32d7b1655cd795719cef4fd7d579271a6d01086cf1628", - 1492586, - ), - ( - 626, - "f3172b6b8497c10fc772f5dada4eeb1f4c4919c97de9de2e1a439444d5a057ff", - 1492955, - ), - ( - 627, - "b26526aea299e9d24af29fdacd5cf4751a663d24894e3d0a37833aa14c58424a", - 1493338, - ), - ( - 628, - "3980d024327d53b8d01ef0d198a052cd058dd579508d8ed6283fe3614e0a3694", - 1493913, - ), - ( - 629, - "31f22997a786c25ee677786373368cae6fd501fd1bc4b212b8e267235c88179d", - 1495083, - ), - ( - 630, - "1c65eb250cf54b466c64f1a4003d1415a7ee275e49615450c0e0525179857eef", - 1497404, - ), - ( - 631, - "9e44116467cc9d7e224e36487bf2cf571698cae16b25f54a7430f1278331fdd8", - 1498598, - ), - ]; - - let authorities = vec![ - "CwjLJ1zPWK5Ao9WChAFp7rWGEgN3AyXXjTRPrqgm5WwBpoS", - "Dp8FHpZTzvoKXztkfrUAkF6xNf6sjVU5ZLZ29NEGUazouou", - "DtK7YfkhNWU6wEPF1dShsFdhtosVAuJPLkoGhKhG1r5LjKq", - "FLnHYBuoyThzqJ45tdb8P6yMLdocM7ir27Pg1AnpYoygm1K", - "FWEfJ5UMghr52UopgYjawAg6hQg3ztbQek75pfeRtLVi8pB", - "ECoLHAu7HKWGTB9od82HAtequYj6hvNHigkGSB9g3ApxAwB", - "GL1Tg3Uppo8GYL9NjKj4dWKcS6tW98REop9G5hpu7HgFwTa", - "ExnjU5LZMktrgtQBE3An6FsQfvaKG1ukxPqwhJydgdgarmY", - "CagLpgCBu5qJqYF2tpFX6BnU4yHvMGSjc7r3Ed1jY3tMbQt", - "DsrtmMsD4ijh3n4uodxPoiW9NZ7v7no5wVvPVj8fL1dfrWB", - "HQB4EctrVR68ozZDyBiRJzLRAEGh1YKgCkAsFjJcegL9RQA", - "H2YTYbXTFkDY1cGnv164ecnDT3hsD2bQXtyiDbcQuXcQZUV", - "H5WL8jXmbkCoEcLfvqJkbLUeGrDFsJiMXkhhRWn3joct1tE", - "DpB37GDrJDYcmg2df2eqsrPKMay1u8hyZ6sQi2FuUiUeNLu", - "FR8yjKRA9MTjvFGK8kfzrdC23Fr6xd7rfBvZXSjAsmuxURE", - "DxHPty3B9fpj3duu6Gc6gCSCAvsydJHJEY5G3oVYT8S5BYJ", - "DbVKC8ZJjevrhqSnZyJMMvmPL7oPPL4ed1roxawYnHVgyin", - "DVJV81kab2J6oTyRJ9T3NCwW2DSrysbWCssvMcE6cwZHnAd", - "Fg4rDAyzoVzf39Zo8JFPo4W314ntNWNwm3shr4xKe8M1fJg", - "GUaNcnAruMVxHGTs7gGpSUpigRJboQYQBBQyPohkFcP6NMH", - "J4BMGF4W9yWiJz4pkhQW73X6QMGpKUzmPppVnqzBCqw5dQq", - "E1cR61L1tdDEop4WdWVqcq1H1x6VqsDpSHvFyUeC41uruVJ", - "GoWLzBsj1f23YtdDpyntnvN1LwXKhF5TEeZvBeTVxofgWGR", - "CwHwmbogSwtRbrkajVBNubPvWmHBGU4bhMido54M9CjuKZD", - "FLT63y9oVXJnyiWMAL4RvWxsQx21Vymw9961Z7NRFmSG7rw", - "FoQ2y6JuHuHTG4rHFL3f2hCxfJMvtrq8wwPWdv8tsdkcyA8", - "D7QQKqqs8ocGorRA12h4QoBSHDia1DkHeXT4eMfjWQ483QH", - "J6z7FP35F9DiiU985bhkDTS3WxyeTBeoo9MtLdLoD3GiWPj", - "EjapydCK25AagodRbDECavHAy8yQY1tmeRhwUXhVWx4cFPv", - "H8admATcRkGCrF1dTDDBCjQDsYjMkuPaN9YwR2mSCj4DWMQ", - "FtHMRU1fxsoswJjBvyCGvECepC7gP2X77QbNpyikYSqqR6k", - "DzY5gwr45GVRUFzRMmeg8iffpqYF47nm3XbJhmjG97FijaE", - "D3HKWAihSUmg8HrfeFrftSwNK7no261yA9RNr3LUUdsuzuJ", - "D82DwwGJGTcSvtB3SmNrZejnSertbPzpkYvDUp3ibScL3ne", - "FTPxLXLQvMDQYFA6VqNLGwWPKhemMYP791XVj8TmDpFuV3b", - "FzGfKmS7N8Z1tvCBU5JH1eBXZQ9pCtRNoMUnNVv38wZNq72", - "GDfm1MyLAQ7Rh8YPtF6FtMweV4hz91zzeDy2sSABNNqAbmg", - "DiVQbq7sozeKp7PXPM1HLFc2m7ih8oepKLRK99oBY3QZak1", - "HErWh7D2RzrjWWB2fTJfcAejD9MJpadeWWZM2Wnk7LiNWfG", - "Es4DbDauYZYyRJbr6VxrhdcM1iufP9GtdBYf3YtSEvdwNyb", - "EBgXT6FaVo4WsN2LmfnB2jnpDFf4zay3E492RGSn6v1tY99", - "Dr9Zg4fxZurexParztL9SezFeHsPwdP8uGgULeRMbk8DDHJ", - "JEnSTZJpLh91cSryptj57RtFxq9xXqf4U5wBH3qoP91ZZhN", - "DqtRkrmtPANa8wrYR7Ce2LxJxk2iNFtiCxv1cXbx54uqdTN", - "GaxmF53xbuTFKopVEseWiaCTa8fC6f99n4YfW8MGPSPYX3s", - "EiCesgkAaighBKMpwFSAUdvwE4mRjBjNmmd5fP6d4FG8DAx", - "HVbwWGUx7kCgUGap1Mfcs37g6JAZ5qsfsM7TsDRcSqvfxmd", - "G45bc8Ajrd6YSXav77gQwjjGoAsR2qiGd1aLzkMy7o1RLwd", - "Cqix2rD93Mdf7ytg8tBavAig2TvhXPgPZ2mejQvkq7qgRPq", - "GpodE2S5dPeVjzHB4Drm8R9rEwcQPtwAspXqCVz1ooFWf5K", - "CwfmfRmzPKLj3ntSCejuVwYmQ1F9iZWY4meQrAVoJ2G8Kce", - "Fhp5NPvutRCJ4Gx3G8vCYGaveGcU3KgTwfrn5Zr8sLSgwVx", - "GeYRRPkyi23wSF3cJGjq82117fKJZUbWsAGimUnzb5RPbB1", - "DzCJ4y5oT611dfKQwbBDVbtCfENTdMCjb4KGMU3Mq6nyUMu", - ]; - - let authorities = authorities - .into_iter() - .map(|address| { - ( - grandpa_primitives::AuthorityId::from_ss58check(address) - .expect("hard fork authority addresses are static and they should be carefully defined; qed."), - 1, - ) - }) - .collect::>(); - - forks - .into_iter() - .map(|(set_id, hash, number)| { - let hash = Hash::from_str(hash) - .expect("hard fork hashes are static and they should be carefully defined; qed."); - - (set_id, (hash, number), authorities.clone()) - }) - .collect() -} - #[cfg(test)] mod tests { use polkadot_test_runtime_client::prelude::*; diff --git a/service/src/lib.rs b/service/src/lib.rs index 9e1964f48f8f..b02bc145f43e 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -137,15 +137,6 @@ impl IdentifyVariant for Box { } } -// If we're using prometheus, use a registry with a prefix of `polkadot`. -pub fn set_prometheus_registry(config: &mut Configuration) -> Result<(), ServiceError> { - if let Some(PrometheusConfig { registry, .. }) = config.prometheus_config.as_mut() { - *registry = Registry::new_custom(Some("polkadot".into()), None)?; - } - - Ok(()) -} - /// Starts a `ServiceBuilder` for a full service. /// /// Use this macro if you don't actually need the full service, but just the builder in order to @@ -153,7 +144,10 @@ pub fn set_prometheus_registry(config: &mut Configuration) -> Result<(), Service #[macro_export] macro_rules! new_full_start { ($config:expr, $runtime:ty, $executor:ty, $informant_prefix:expr $(,)?) => {{ - $crate::set_prometheus_registry(&mut $config)?; + // If we're using prometheus, use a registry with a prefix of `polkadot`. + if let Some(PrometheusConfig { registry, .. }) = $config.prometheus_config.as_mut() { + *registry = Registry::new_custom(Some("polkadot".into()), None)?; + } let mut import_setup = None; let mut rpc_setup = None; @@ -186,7 +180,141 @@ macro_rules! new_full_start { .ok_or_else(|| service::Error::SelectChainRequired)?; let grandpa_hard_forks = if config.chain_spec.is_kusama() { - grandpa_support::kusama_hard_forks() + /// GRANDPA hard forks due to borked migration of session keys after a runtime + /// upgrade (at #1491596), the signalled authority set changes were invalid + /// (blank keys) and were impossible to finalize. The authorities for these + /// intermediary pending changes are replaced with a static list comprised of + /// w3f validators and randomly selected validators from the latest session (at + /// #1500988). + + use sp_core::crypto::Ss58Codec; + use std::str::FromStr; + + let forks = vec![ + ( + 623, + "01e94e1e7e9cf07b3b0bf4e1717fce7448e5563901c2ef2e3b8e9ecaeba088b1", + 1492283, + ), + ( + 624, + "ddc4323c5e8966844dfaa87e0c2f74ef6b43115f17bf8e4ff38845a62d02b9a9", + 1492436, + ), + ( + 625, + "38ba115b296663e424e32d7b1655cd795719cef4fd7d579271a6d01086cf1628", + 1492586, + ), + ( + 626, + "f3172b6b8497c10fc772f5dada4eeb1f4c4919c97de9de2e1a439444d5a057ff", + 1492955, + ), + ( + 627, + "b26526aea299e9d24af29fdacd5cf4751a663d24894e3d0a37833aa14c58424a", + 1493338, + ), + ( + 628, + "3980d024327d53b8d01ef0d198a052cd058dd579508d8ed6283fe3614e0a3694", + 1493913, + ), + ( + 629, + "31f22997a786c25ee677786373368cae6fd501fd1bc4b212b8e267235c88179d", + 1495083, + ), + ( + 630, + "1c65eb250cf54b466c64f1a4003d1415a7ee275e49615450c0e0525179857eef", + 1497404, + ), + ( + 631, + "9e44116467cc9d7e224e36487bf2cf571698cae16b25f54a7430f1278331fdd8", + 1498598, + ), + ]; + + let authorities = vec![ + "CwjLJ1zPWK5Ao9WChAFp7rWGEgN3AyXXjTRPrqgm5WwBpoS", + "Dp8FHpZTzvoKXztkfrUAkF6xNf6sjVU5ZLZ29NEGUazouou", + "DtK7YfkhNWU6wEPF1dShsFdhtosVAuJPLkoGhKhG1r5LjKq", + "FLnHYBuoyThzqJ45tdb8P6yMLdocM7ir27Pg1AnpYoygm1K", + "FWEfJ5UMghr52UopgYjawAg6hQg3ztbQek75pfeRtLVi8pB", + "ECoLHAu7HKWGTB9od82HAtequYj6hvNHigkGSB9g3ApxAwB", + "GL1Tg3Uppo8GYL9NjKj4dWKcS6tW98REop9G5hpu7HgFwTa", + "ExnjU5LZMktrgtQBE3An6FsQfvaKG1ukxPqwhJydgdgarmY", + "CagLpgCBu5qJqYF2tpFX6BnU4yHvMGSjc7r3Ed1jY3tMbQt", + "DsrtmMsD4ijh3n4uodxPoiW9NZ7v7no5wVvPVj8fL1dfrWB", + "HQB4EctrVR68ozZDyBiRJzLRAEGh1YKgCkAsFjJcegL9RQA", + "H2YTYbXTFkDY1cGnv164ecnDT3hsD2bQXtyiDbcQuXcQZUV", + "H5WL8jXmbkCoEcLfvqJkbLUeGrDFsJiMXkhhRWn3joct1tE", + "DpB37GDrJDYcmg2df2eqsrPKMay1u8hyZ6sQi2FuUiUeNLu", + "FR8yjKRA9MTjvFGK8kfzrdC23Fr6xd7rfBvZXSjAsmuxURE", + "DxHPty3B9fpj3duu6Gc6gCSCAvsydJHJEY5G3oVYT8S5BYJ", + "DbVKC8ZJjevrhqSnZyJMMvmPL7oPPL4ed1roxawYnHVgyin", + "DVJV81kab2J6oTyRJ9T3NCwW2DSrysbWCssvMcE6cwZHnAd", + "Fg4rDAyzoVzf39Zo8JFPo4W314ntNWNwm3shr4xKe8M1fJg", + "GUaNcnAruMVxHGTs7gGpSUpigRJboQYQBBQyPohkFcP6NMH", + "J4BMGF4W9yWiJz4pkhQW73X6QMGpKUzmPppVnqzBCqw5dQq", + "E1cR61L1tdDEop4WdWVqcq1H1x6VqsDpSHvFyUeC41uruVJ", + "GoWLzBsj1f23YtdDpyntnvN1LwXKhF5TEeZvBeTVxofgWGR", + "CwHwmbogSwtRbrkajVBNubPvWmHBGU4bhMido54M9CjuKZD", + "FLT63y9oVXJnyiWMAL4RvWxsQx21Vymw9961Z7NRFmSG7rw", + "FoQ2y6JuHuHTG4rHFL3f2hCxfJMvtrq8wwPWdv8tsdkcyA8", + "D7QQKqqs8ocGorRA12h4QoBSHDia1DkHeXT4eMfjWQ483QH", + "J6z7FP35F9DiiU985bhkDTS3WxyeTBeoo9MtLdLoD3GiWPj", + "EjapydCK25AagodRbDECavHAy8yQY1tmeRhwUXhVWx4cFPv", + "H8admATcRkGCrF1dTDDBCjQDsYjMkuPaN9YwR2mSCj4DWMQ", + "FtHMRU1fxsoswJjBvyCGvECepC7gP2X77QbNpyikYSqqR6k", + "DzY5gwr45GVRUFzRMmeg8iffpqYF47nm3XbJhmjG97FijaE", + "D3HKWAihSUmg8HrfeFrftSwNK7no261yA9RNr3LUUdsuzuJ", + "D82DwwGJGTcSvtB3SmNrZejnSertbPzpkYvDUp3ibScL3ne", + "FTPxLXLQvMDQYFA6VqNLGwWPKhemMYP791XVj8TmDpFuV3b", + "FzGfKmS7N8Z1tvCBU5JH1eBXZQ9pCtRNoMUnNVv38wZNq72", + "GDfm1MyLAQ7Rh8YPtF6FtMweV4hz91zzeDy2sSABNNqAbmg", + "DiVQbq7sozeKp7PXPM1HLFc2m7ih8oepKLRK99oBY3QZak1", + "HErWh7D2RzrjWWB2fTJfcAejD9MJpadeWWZM2Wnk7LiNWfG", + "Es4DbDauYZYyRJbr6VxrhdcM1iufP9GtdBYf3YtSEvdwNyb", + "EBgXT6FaVo4WsN2LmfnB2jnpDFf4zay3E492RGSn6v1tY99", + "Dr9Zg4fxZurexParztL9SezFeHsPwdP8uGgULeRMbk8DDHJ", + "JEnSTZJpLh91cSryptj57RtFxq9xXqf4U5wBH3qoP91ZZhN", + "DqtRkrmtPANa8wrYR7Ce2LxJxk2iNFtiCxv1cXbx54uqdTN", + "GaxmF53xbuTFKopVEseWiaCTa8fC6f99n4YfW8MGPSPYX3s", + "EiCesgkAaighBKMpwFSAUdvwE4mRjBjNmmd5fP6d4FG8DAx", + "HVbwWGUx7kCgUGap1Mfcs37g6JAZ5qsfsM7TsDRcSqvfxmd", + "G45bc8Ajrd6YSXav77gQwjjGoAsR2qiGd1aLzkMy7o1RLwd", + "Cqix2rD93Mdf7ytg8tBavAig2TvhXPgPZ2mejQvkq7qgRPq", + "GpodE2S5dPeVjzHB4Drm8R9rEwcQPtwAspXqCVz1ooFWf5K", + "CwfmfRmzPKLj3ntSCejuVwYmQ1F9iZWY4meQrAVoJ2G8Kce", + "Fhp5NPvutRCJ4Gx3G8vCYGaveGcU3KgTwfrn5Zr8sLSgwVx", + "GeYRRPkyi23wSF3cJGjq82117fKJZUbWsAGimUnzb5RPbB1", + "DzCJ4y5oT611dfKQwbBDVbtCfENTdMCjb4KGMU3Mq6nyUMu", + ]; + + let authorities = authorities + .into_iter() + .map(|address| { + ( + grandpa_primitives::AuthorityId::from_ss58check(address) + .expect("hard fork authority addresses are static and they should be carefully defined; qed."), + 1, + ) + }) + .collect::>(); + + forks + .into_iter() + .map(|(set_id, hash, number)| { + let hash = Hash::from_str(hash) + .expect("hard fork hashes are static and they should be carefully defined; qed."); + + (set_id, (hash, number), authorities.clone()) + }) + .collect() } else { Vec::new() }; @@ -555,7 +683,10 @@ macro_rules! new_full { #[macro_export] macro_rules! new_light { ($config:expr, $runtime:ty, $dispatch:ty) => {{ - $crate::set_prometheus_registry(&mut $config)?; + // If we're using prometheus, use a registry with a prefix of `polkadot`. + if let Some(PrometheusConfig { registry, .. }) = $config.prometheus_config.as_mut() { + *registry = Registry::new_custom(Some("polkadot".into()), None)?; + } let inherent_data_providers = inherents::InherentDataProviders::new(); ServiceBuilder::new_light::($config)? From 4a3b4b03cda40742f8583dbb097aad559b53afe0 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 14:35:57 +0200 Subject: [PATCH 10/92] CLEANUP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- service/src/lib.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/service/src/lib.rs b/service/src/lib.rs index b02bc145f43e..077704c2d101 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -51,8 +51,6 @@ pub use codec::Codec; pub use polkadot_runtime; pub use kusama_runtime; pub use westend_runtime; -#[cfg(feature = "test")] -pub use polkadot_test_runtime; use prometheus_endpoint::Registry; pub use self::client::PolkadotClient; From 0d506a1a2c744c7087dc24a56cf48ccee49a0715 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 14:48:49 +0200 Subject: [PATCH 11/92] Fixed missing import --- polkadot-test-service/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index b667f04fe48d..b730a4b2c304 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -23,7 +23,7 @@ use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; use service::{error::Error as ServiceError}; use grandpa::{FinalityProofProvider as GrandpaFinalityProofProvider}; use log::info; -use service::{AbstractService, Role, TFullBackend, Configuration}; +use service::{AbstractService, Role, TFullBackend, Configuration, config::PrometheusConfig}; use consensus_common::{SelectChain, block_validation::Chain}; use polkadot_primitives::parachain::{CollatorId}; use polkadot_primitives::Block; From 16f1c67893e118b21be610a4647a6edfd4fdd88a Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 14:53:32 +0200 Subject: [PATCH 12/92] Fix missing import --- Cargo.lock | 1 + polkadot-test-service/Cargo.toml | 1 + polkadot-test-service/src/lib.rs | 1 + 3 files changed, 3 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 03ee60a28d3e..c35565442ec6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4698,6 +4698,7 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-inherents", + "substrate-prometheus-endpoint", ] [[package]] diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 754ce51bc013..4331a3b3f0e6 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -26,5 +26,6 @@ service = { package = "sc-service", git = "https://github.com/paritytech/substra sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } [features] diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index b730a4b2c304..ceecef2994b3 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -25,6 +25,7 @@ use grandpa::{FinalityProofProvider as GrandpaFinalityProofProvider}; use log::info; use service::{AbstractService, Role, TFullBackend, Configuration, config::PrometheusConfig}; use consensus_common::{SelectChain, block_validation::Chain}; +use prometheus_endpoint::Registry; use polkadot_primitives::parachain::{CollatorId}; use polkadot_primitives::Block; use polkadot_service::PolkadotClient; From 9e1bf51f61f374015061c6f055aed858af0ebd4b Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 16:36:48 +0200 Subject: [PATCH 13/92] WIP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 1 - polkadot-test-service/Cargo.toml | 1 - polkadot-test-service/src/lib.rs | 9 +- service/src/grandpa_support.rs | 142 ++++++++++++++ service/src/lib.rs | 322 ++++++++++++------------------- 5 files changed, 273 insertions(+), 202 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c35565442ec6..03ee60a28d3e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4698,7 +4698,6 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-inherents", - "substrate-prometheus-endpoint", ] [[package]] diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 4331a3b3f0e6..754ce51bc013 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -26,6 +26,5 @@ service = { package = "sc-service", git = "https://github.com/paritytech/substra sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } [features] diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index ceecef2994b3..c350bd8ee871 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -23,17 +23,16 @@ use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; use service::{error::Error as ServiceError}; use grandpa::{FinalityProofProvider as GrandpaFinalityProofProvider}; use log::info; -use service::{AbstractService, Role, TFullBackend, Configuration, config::PrometheusConfig}; +use service::{AbstractService, Role, TFullBackend, Configuration}; use consensus_common::{SelectChain, block_validation::Chain}; -use prometheus_endpoint::Registry; use polkadot_primitives::parachain::{CollatorId}; use polkadot_primitives::Block; use polkadot_service::PolkadotClient; -use polkadot_service::{grandpa_support, new_full, new_full_start, FullNodeHandles, IdentifyVariant, PolkadotExecutor}; +use polkadot_service::{new_full, new_full_start, FullNodeHandles, PolkadotExecutor}; /// Create a new Polkadot test service for a full node. pub fn polkadot_test_new_full( - mut config: Configuration, + config: Configuration, collating_for: Option<(CollatorId, parachain::Id)>, max_block_data_size: Option, authority_discovery_enabled: bool, @@ -51,7 +50,7 @@ pub fn polkadot_test_new_full( FullNodeHandles, ), ServiceError> { - let (service, client, handles) = new_full!( + let (service, client, handles) = new_full!(test config, collating_for, max_block_data_size, diff --git a/service/src/grandpa_support.rs b/service/src/grandpa_support.rs index cb78719b64d1..e210d7cfa42b 100644 --- a/service/src/grandpa_support.rs +++ b/service/src/grandpa_support.rs @@ -16,6 +16,7 @@ //! Polkadot-specific GRANDPA integration utilities. +use polkadot_primitives::Hash; use sp_runtime::traits::{Block as BlockT, NumberFor}; /// A custom GRANDPA voting rule that "pauses" voting (i.e. keeps voting for the @@ -89,6 +90,147 @@ impl grandpa::VotingRule for PauseAfterBlockFor Vec<( + grandpa_primitives::SetId, + (Hash, polkadot_primitives::BlockNumber), + grandpa_primitives::AuthorityList, +)> { + use sp_core::crypto::Ss58Codec; + use std::str::FromStr; + + let forks = vec![ + ( + 623, + "01e94e1e7e9cf07b3b0bf4e1717fce7448e5563901c2ef2e3b8e9ecaeba088b1", + 1492283, + ), + ( + 624, + "ddc4323c5e8966844dfaa87e0c2f74ef6b43115f17bf8e4ff38845a62d02b9a9", + 1492436, + ), + ( + 625, + "38ba115b296663e424e32d7b1655cd795719cef4fd7d579271a6d01086cf1628", + 1492586, + ), + ( + 626, + "f3172b6b8497c10fc772f5dada4eeb1f4c4919c97de9de2e1a439444d5a057ff", + 1492955, + ), + ( + 627, + "b26526aea299e9d24af29fdacd5cf4751a663d24894e3d0a37833aa14c58424a", + 1493338, + ), + ( + 628, + "3980d024327d53b8d01ef0d198a052cd058dd579508d8ed6283fe3614e0a3694", + 1493913, + ), + ( + 629, + "31f22997a786c25ee677786373368cae6fd501fd1bc4b212b8e267235c88179d", + 1495083, + ), + ( + 630, + "1c65eb250cf54b466c64f1a4003d1415a7ee275e49615450c0e0525179857eef", + 1497404, + ), + ( + 631, + "9e44116467cc9d7e224e36487bf2cf571698cae16b25f54a7430f1278331fdd8", + 1498598, + ), + ]; + + let authorities = vec![ + "CwjLJ1zPWK5Ao9WChAFp7rWGEgN3AyXXjTRPrqgm5WwBpoS", + "Dp8FHpZTzvoKXztkfrUAkF6xNf6sjVU5ZLZ29NEGUazouou", + "DtK7YfkhNWU6wEPF1dShsFdhtosVAuJPLkoGhKhG1r5LjKq", + "FLnHYBuoyThzqJ45tdb8P6yMLdocM7ir27Pg1AnpYoygm1K", + "FWEfJ5UMghr52UopgYjawAg6hQg3ztbQek75pfeRtLVi8pB", + "ECoLHAu7HKWGTB9od82HAtequYj6hvNHigkGSB9g3ApxAwB", + "GL1Tg3Uppo8GYL9NjKj4dWKcS6tW98REop9G5hpu7HgFwTa", + "ExnjU5LZMktrgtQBE3An6FsQfvaKG1ukxPqwhJydgdgarmY", + "CagLpgCBu5qJqYF2tpFX6BnU4yHvMGSjc7r3Ed1jY3tMbQt", + "DsrtmMsD4ijh3n4uodxPoiW9NZ7v7no5wVvPVj8fL1dfrWB", + "HQB4EctrVR68ozZDyBiRJzLRAEGh1YKgCkAsFjJcegL9RQA", + "H2YTYbXTFkDY1cGnv164ecnDT3hsD2bQXtyiDbcQuXcQZUV", + "H5WL8jXmbkCoEcLfvqJkbLUeGrDFsJiMXkhhRWn3joct1tE", + "DpB37GDrJDYcmg2df2eqsrPKMay1u8hyZ6sQi2FuUiUeNLu", + "FR8yjKRA9MTjvFGK8kfzrdC23Fr6xd7rfBvZXSjAsmuxURE", + "DxHPty3B9fpj3duu6Gc6gCSCAvsydJHJEY5G3oVYT8S5BYJ", + "DbVKC8ZJjevrhqSnZyJMMvmPL7oPPL4ed1roxawYnHVgyin", + "DVJV81kab2J6oTyRJ9T3NCwW2DSrysbWCssvMcE6cwZHnAd", + "Fg4rDAyzoVzf39Zo8JFPo4W314ntNWNwm3shr4xKe8M1fJg", + "GUaNcnAruMVxHGTs7gGpSUpigRJboQYQBBQyPohkFcP6NMH", + "J4BMGF4W9yWiJz4pkhQW73X6QMGpKUzmPppVnqzBCqw5dQq", + "E1cR61L1tdDEop4WdWVqcq1H1x6VqsDpSHvFyUeC41uruVJ", + "GoWLzBsj1f23YtdDpyntnvN1LwXKhF5TEeZvBeTVxofgWGR", + "CwHwmbogSwtRbrkajVBNubPvWmHBGU4bhMido54M9CjuKZD", + "FLT63y9oVXJnyiWMAL4RvWxsQx21Vymw9961Z7NRFmSG7rw", + "FoQ2y6JuHuHTG4rHFL3f2hCxfJMvtrq8wwPWdv8tsdkcyA8", + "D7QQKqqs8ocGorRA12h4QoBSHDia1DkHeXT4eMfjWQ483QH", + "J6z7FP35F9DiiU985bhkDTS3WxyeTBeoo9MtLdLoD3GiWPj", + "EjapydCK25AagodRbDECavHAy8yQY1tmeRhwUXhVWx4cFPv", + "H8admATcRkGCrF1dTDDBCjQDsYjMkuPaN9YwR2mSCj4DWMQ", + "FtHMRU1fxsoswJjBvyCGvECepC7gP2X77QbNpyikYSqqR6k", + "DzY5gwr45GVRUFzRMmeg8iffpqYF47nm3XbJhmjG97FijaE", + "D3HKWAihSUmg8HrfeFrftSwNK7no261yA9RNr3LUUdsuzuJ", + "D82DwwGJGTcSvtB3SmNrZejnSertbPzpkYvDUp3ibScL3ne", + "FTPxLXLQvMDQYFA6VqNLGwWPKhemMYP791XVj8TmDpFuV3b", + "FzGfKmS7N8Z1tvCBU5JH1eBXZQ9pCtRNoMUnNVv38wZNq72", + "GDfm1MyLAQ7Rh8YPtF6FtMweV4hz91zzeDy2sSABNNqAbmg", + "DiVQbq7sozeKp7PXPM1HLFc2m7ih8oepKLRK99oBY3QZak1", + "HErWh7D2RzrjWWB2fTJfcAejD9MJpadeWWZM2Wnk7LiNWfG", + "Es4DbDauYZYyRJbr6VxrhdcM1iufP9GtdBYf3YtSEvdwNyb", + "EBgXT6FaVo4WsN2LmfnB2jnpDFf4zay3E492RGSn6v1tY99", + "Dr9Zg4fxZurexParztL9SezFeHsPwdP8uGgULeRMbk8DDHJ", + "JEnSTZJpLh91cSryptj57RtFxq9xXqf4U5wBH3qoP91ZZhN", + "DqtRkrmtPANa8wrYR7Ce2LxJxk2iNFtiCxv1cXbx54uqdTN", + "GaxmF53xbuTFKopVEseWiaCTa8fC6f99n4YfW8MGPSPYX3s", + "EiCesgkAaighBKMpwFSAUdvwE4mRjBjNmmd5fP6d4FG8DAx", + "HVbwWGUx7kCgUGap1Mfcs37g6JAZ5qsfsM7TsDRcSqvfxmd", + "G45bc8Ajrd6YSXav77gQwjjGoAsR2qiGd1aLzkMy7o1RLwd", + "Cqix2rD93Mdf7ytg8tBavAig2TvhXPgPZ2mejQvkq7qgRPq", + "GpodE2S5dPeVjzHB4Drm8R9rEwcQPtwAspXqCVz1ooFWf5K", + "CwfmfRmzPKLj3ntSCejuVwYmQ1F9iZWY4meQrAVoJ2G8Kce", + "Fhp5NPvutRCJ4Gx3G8vCYGaveGcU3KgTwfrn5Zr8sLSgwVx", + "GeYRRPkyi23wSF3cJGjq82117fKJZUbWsAGimUnzb5RPbB1", + "DzCJ4y5oT611dfKQwbBDVbtCfENTdMCjb4KGMU3Mq6nyUMu", + ]; + + let authorities = authorities + .into_iter() + .map(|address| { + ( + grandpa_primitives::AuthorityId::from_ss58check(address) + .expect("hard fork authority addresses are static and they should be carefully defined; qed."), + 1, + ) + }) + .collect::>(); + + forks + .into_iter() + .map(|(set_id, hash, number)| { + let hash = Hash::from_str(hash) + .expect("hard fork hashes are static and they should be carefully defined; qed."); + + (set_id, (hash, number), authorities.clone()) + }) + .collect() +} + #[cfg(test)] mod tests { use polkadot_test_runtime_client::prelude::*; diff --git a/service/src/lib.rs b/service/src/lib.rs index 077704c2d101..852c96d6f8d0 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -141,16 +141,14 @@ impl IdentifyVariant for Box { /// be able to perform chain operations. #[macro_export] macro_rules! new_full_start { - ($config:expr, $runtime:ty, $executor:ty, $informant_prefix:expr $(,)?) => {{ + (prometheus_setup $config:expr) => {{ // If we're using prometheus, use a registry with a prefix of `polkadot`. if let Some(PrometheusConfig { registry, .. }) = $config.prometheus_config.as_mut() { *registry = Registry::new_custom(Some("polkadot".into()), None)?; } - - let mut import_setup = None; - let mut rpc_setup = None; - let inherent_data_providers = inherents::InherentDataProviders::new(); - let builder = service::ServiceBuilder::new_full::< + }}; + (start_builder $config:expr, $runtime:ty, $executor:ty, $informant_prefix:expr $(,)?) => {{ + service::ServiceBuilder::new_full::< Block, $runtime, $executor >($config)? .with_informant_prefix($informant_prefix.unwrap_or_default())? @@ -166,189 +164,57 @@ macro_rules! new_full_start { ); Ok(pool) })? - .with_import_queue(| - config, - client, - mut select_chain, - _, - spawn_task_handle, - registry, - | { - let select_chain = select_chain.take() - .ok_or_else(|| service::Error::SelectChainRequired)?; - - let grandpa_hard_forks = if config.chain_spec.is_kusama() { - /// GRANDPA hard forks due to borked migration of session keys after a runtime - /// upgrade (at #1491596), the signalled authority set changes were invalid - /// (blank keys) and were impossible to finalize. The authorities for these - /// intermediary pending changes are replaced with a static list comprised of - /// w3f validators and randomly selected validators from the latest session (at - /// #1500988). - - use sp_core::crypto::Ss58Codec; - use std::str::FromStr; - - let forks = vec![ - ( - 623, - "01e94e1e7e9cf07b3b0bf4e1717fce7448e5563901c2ef2e3b8e9ecaeba088b1", - 1492283, - ), - ( - 624, - "ddc4323c5e8966844dfaa87e0c2f74ef6b43115f17bf8e4ff38845a62d02b9a9", - 1492436, - ), - ( - 625, - "38ba115b296663e424e32d7b1655cd795719cef4fd7d579271a6d01086cf1628", - 1492586, - ), - ( - 626, - "f3172b6b8497c10fc772f5dada4eeb1f4c4919c97de9de2e1a439444d5a057ff", - 1492955, - ), - ( - 627, - "b26526aea299e9d24af29fdacd5cf4751a663d24894e3d0a37833aa14c58424a", - 1493338, - ), - ( - 628, - "3980d024327d53b8d01ef0d198a052cd058dd579508d8ed6283fe3614e0a3694", - 1493913, - ), - ( - 629, - "31f22997a786c25ee677786373368cae6fd501fd1bc4b212b8e267235c88179d", - 1495083, - ), - ( - 630, - "1c65eb250cf54b466c64f1a4003d1415a7ee275e49615450c0e0525179857eef", - 1497404, - ), - ( - 631, - "9e44116467cc9d7e224e36487bf2cf571698cae16b25f54a7430f1278331fdd8", - 1498598, - ), - ]; - - let authorities = vec![ - "CwjLJ1zPWK5Ao9WChAFp7rWGEgN3AyXXjTRPrqgm5WwBpoS", - "Dp8FHpZTzvoKXztkfrUAkF6xNf6sjVU5ZLZ29NEGUazouou", - "DtK7YfkhNWU6wEPF1dShsFdhtosVAuJPLkoGhKhG1r5LjKq", - "FLnHYBuoyThzqJ45tdb8P6yMLdocM7ir27Pg1AnpYoygm1K", - "FWEfJ5UMghr52UopgYjawAg6hQg3ztbQek75pfeRtLVi8pB", - "ECoLHAu7HKWGTB9od82HAtequYj6hvNHigkGSB9g3ApxAwB", - "GL1Tg3Uppo8GYL9NjKj4dWKcS6tW98REop9G5hpu7HgFwTa", - "ExnjU5LZMktrgtQBE3An6FsQfvaKG1ukxPqwhJydgdgarmY", - "CagLpgCBu5qJqYF2tpFX6BnU4yHvMGSjc7r3Ed1jY3tMbQt", - "DsrtmMsD4ijh3n4uodxPoiW9NZ7v7no5wVvPVj8fL1dfrWB", - "HQB4EctrVR68ozZDyBiRJzLRAEGh1YKgCkAsFjJcegL9RQA", - "H2YTYbXTFkDY1cGnv164ecnDT3hsD2bQXtyiDbcQuXcQZUV", - "H5WL8jXmbkCoEcLfvqJkbLUeGrDFsJiMXkhhRWn3joct1tE", - "DpB37GDrJDYcmg2df2eqsrPKMay1u8hyZ6sQi2FuUiUeNLu", - "FR8yjKRA9MTjvFGK8kfzrdC23Fr6xd7rfBvZXSjAsmuxURE", - "DxHPty3B9fpj3duu6Gc6gCSCAvsydJHJEY5G3oVYT8S5BYJ", - "DbVKC8ZJjevrhqSnZyJMMvmPL7oPPL4ed1roxawYnHVgyin", - "DVJV81kab2J6oTyRJ9T3NCwW2DSrysbWCssvMcE6cwZHnAd", - "Fg4rDAyzoVzf39Zo8JFPo4W314ntNWNwm3shr4xKe8M1fJg", - "GUaNcnAruMVxHGTs7gGpSUpigRJboQYQBBQyPohkFcP6NMH", - "J4BMGF4W9yWiJz4pkhQW73X6QMGpKUzmPppVnqzBCqw5dQq", - "E1cR61L1tdDEop4WdWVqcq1H1x6VqsDpSHvFyUeC41uruVJ", - "GoWLzBsj1f23YtdDpyntnvN1LwXKhF5TEeZvBeTVxofgWGR", - "CwHwmbogSwtRbrkajVBNubPvWmHBGU4bhMido54M9CjuKZD", - "FLT63y9oVXJnyiWMAL4RvWxsQx21Vymw9961Z7NRFmSG7rw", - "FoQ2y6JuHuHTG4rHFL3f2hCxfJMvtrq8wwPWdv8tsdkcyA8", - "D7QQKqqs8ocGorRA12h4QoBSHDia1DkHeXT4eMfjWQ483QH", - "J6z7FP35F9DiiU985bhkDTS3WxyeTBeoo9MtLdLoD3GiWPj", - "EjapydCK25AagodRbDECavHAy8yQY1tmeRhwUXhVWx4cFPv", - "H8admATcRkGCrF1dTDDBCjQDsYjMkuPaN9YwR2mSCj4DWMQ", - "FtHMRU1fxsoswJjBvyCGvECepC7gP2X77QbNpyikYSqqR6k", - "DzY5gwr45GVRUFzRMmeg8iffpqYF47nm3XbJhmjG97FijaE", - "D3HKWAihSUmg8HrfeFrftSwNK7no261yA9RNr3LUUdsuzuJ", - "D82DwwGJGTcSvtB3SmNrZejnSertbPzpkYvDUp3ibScL3ne", - "FTPxLXLQvMDQYFA6VqNLGwWPKhemMYP791XVj8TmDpFuV3b", - "FzGfKmS7N8Z1tvCBU5JH1eBXZQ9pCtRNoMUnNVv38wZNq72", - "GDfm1MyLAQ7Rh8YPtF6FtMweV4hz91zzeDy2sSABNNqAbmg", - "DiVQbq7sozeKp7PXPM1HLFc2m7ih8oepKLRK99oBY3QZak1", - "HErWh7D2RzrjWWB2fTJfcAejD9MJpadeWWZM2Wnk7LiNWfG", - "Es4DbDauYZYyRJbr6VxrhdcM1iufP9GtdBYf3YtSEvdwNyb", - "EBgXT6FaVo4WsN2LmfnB2jnpDFf4zay3E492RGSn6v1tY99", - "Dr9Zg4fxZurexParztL9SezFeHsPwdP8uGgULeRMbk8DDHJ", - "JEnSTZJpLh91cSryptj57RtFxq9xXqf4U5wBH3qoP91ZZhN", - "DqtRkrmtPANa8wrYR7Ce2LxJxk2iNFtiCxv1cXbx54uqdTN", - "GaxmF53xbuTFKopVEseWiaCTa8fC6f99n4YfW8MGPSPYX3s", - "EiCesgkAaighBKMpwFSAUdvwE4mRjBjNmmd5fP6d4FG8DAx", - "HVbwWGUx7kCgUGap1Mfcs37g6JAZ5qsfsM7TsDRcSqvfxmd", - "G45bc8Ajrd6YSXav77gQwjjGoAsR2qiGd1aLzkMy7o1RLwd", - "Cqix2rD93Mdf7ytg8tBavAig2TvhXPgPZ2mejQvkq7qgRPq", - "GpodE2S5dPeVjzHB4Drm8R9rEwcQPtwAspXqCVz1ooFWf5K", - "CwfmfRmzPKLj3ntSCejuVwYmQ1F9iZWY4meQrAVoJ2G8Kce", - "Fhp5NPvutRCJ4Gx3G8vCYGaveGcU3KgTwfrn5Zr8sLSgwVx", - "GeYRRPkyi23wSF3cJGjq82117fKJZUbWsAGimUnzb5RPbB1", - "DzCJ4y5oT611dfKQwbBDVbtCfENTdMCjb4KGMU3Mq6nyUMu", - ]; - - let authorities = authorities - .into_iter() - .map(|address| { - ( - grandpa_primitives::AuthorityId::from_ss58check(address) - .expect("hard fork authority addresses are static and they should be carefully defined; qed."), - 1, - ) - }) - .collect::>(); - - forks - .into_iter() - .map(|(set_id, hash, number)| { - let hash = Hash::from_str(hash) - .expect("hard fork hashes are static and they should be carefully defined; qed."); - - (set_id, (hash, number), authorities.clone()) - }) - .collect() - } else { - Vec::new() - }; + }}; + (import_queue_setup + $builder:expr, $inherent_data_providers:expr, $import_setup:expr, $grandpa_hard_forks:expr, $(,)? + ) => {{ + $builder.with_import_queue(| + _config, + client, + mut select_chain, + _, + spawn_task_handle, + registry, + | { + let select_chain = select_chain.take() + .ok_or_else(|| service::Error::SelectChainRequired)?; + + let (grandpa_block_import, grandpa_link) = + grandpa::block_import_with_authority_set_hard_forks( + client.clone(), + &(client.clone() as Arc<_>), + select_chain, + $grandpa_hard_forks, + )?; - let (grandpa_block_import, grandpa_link) = - grandpa::block_import_with_authority_set_hard_forks( - client.clone(), - &(client.clone() as Arc<_>), - select_chain, - grandpa_hard_forks, - )?; + let justification_import = grandpa_block_import.clone(); - let justification_import = grandpa_block_import.clone(); + let (block_import, babe_link) = babe::block_import( + babe::Config::get_or_compute(&*client)?, + grandpa_block_import, + client.clone(), + )?; - let (block_import, babe_link) = babe::block_import( - babe::Config::get_or_compute(&*client)?, - grandpa_block_import, - client.clone(), - )?; + let import_queue = babe::import_queue( + babe_link.clone(), + block_import.clone(), + Some(Box::new(justification_import)), + None, + client, + $inherent_data_providers.clone(), + spawn_task_handle, + registry, + )?; - let import_queue = babe::import_queue( - babe_link.clone(), - block_import.clone(), - Some(Box::new(justification_import)), - None, - client, - inherent_data_providers.clone(), - spawn_task_handle, - registry, - )?; + $import_setup = Some((block_import, grandpa_link, babe_link)); + Ok(import_queue) + })? + }}; + (finish_builder_setup $builder:expr, $inherent_data_providers:expr, $import_setup:expr) => {{ + let mut rpc_setup = None; - import_setup = Some((block_import, grandpa_link, babe_link)); - Ok(import_queue) - })? - .with_rpc_extensions_builder(|builder| { - let grandpa_link = import_setup.as_ref().map(|s| &s.1) + let builder = $builder.with_rpc_extensions_builder(|builder| { + let grandpa_link = $import_setup.as_ref().map(|s| &s.1) .expect("GRANDPA LinkHalf is present for full services or set up failed; qed."); let shared_authority_set = grandpa_link.shared_authority_set().clone(); @@ -356,7 +222,7 @@ macro_rules! new_full_start { rpc_setup = Some((shared_voter_state.clone())); - let babe_link = import_setup.as_ref().map(|s| &s.2) + let babe_link = $import_setup.as_ref().map(|s| &s.2) .expect("BabeLink is present for full services or set up faile; qed."); let babe_config = babe_link.config().clone(); @@ -389,23 +255,47 @@ macro_rules! new_full_start { }) })?; - (builder, import_setup, inherent_data_providers, rpc_setup) - }} + (builder, $import_setup, $inherent_data_providers, rpc_setup) + }}; + ($config:expr, $runtime:ty, $executor:ty, $informant_prefix:expr $(,)?) => {{ + let inherent_data_providers = inherents::InherentDataProviders::new(); + let mut import_setup = None; + new_full_start!(prometheus_setup $config); + let grandpa_hard_forks = if $config.chain_spec.is_kusama() { + $crate::grandpa_support::kusama_hard_forks() + } else { + Vec::new() + }; + let builder = new_full_start!(start_builder $config, $runtime, $executor, $informant_prefix); + let builder = new_full_start!(import_queue_setup + builder, inherent_data_providers, import_setup, grandpa_hard_forks, + ); + new_full_start!(finish_builder_setup builder, inherent_data_providers, import_setup) + }}; + (test $config:expr, $runtime:ty, $executor:ty, $informant_prefix:expr $(,)?) => {{ + let inherent_data_providers = inherents::InherentDataProviders::new(); + let mut import_setup = None; + let grandpa_hard_forks = Vec::new(); + let builder = new_full_start!(start_builder $config, $runtime, $executor, $informant_prefix); + let builder = new_full_start!(import_queue_setup + builder, inherent_data_providers, import_setup, grandpa_hard_forks, + ); + new_full_start!(finish_builder_setup builder, inherent_data_providers, import_setup) + }}; } /// Builds a new service for a full client. #[macro_export] macro_rules! new_full { ( + with_full_start $config:expr, $collating_for:expr, $max_block_data_size:expr, $authority_discovery_enabled:expr, $slot_duration:expr, $grandpa_pause:expr, - $runtime:ty, - $dispatch:ty, - $informant_prefix:expr $(,)? + $new_full_start:expr $(,)? ) => {{ use sc_network::Event; use sc_client_api::ExecutorProvider; @@ -416,18 +306,17 @@ macro_rules! new_full { 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 max_block_data_size = $max_block_data_size; 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, mut rpc_setup) = - new_full_start!($config, $runtime, $dispatch, $informant_prefix); + let (builder, mut import_setup, inherent_data_providers, mut rpc_setup) = $new_full_start; let service = builder .with_finality_proof_provider(|client, backend| { @@ -641,7 +530,7 @@ macro_rules! new_full { ); grandpa::VotingRulesBuilder::default() - .add(grandpa_support::PauseAfterBlockFor(block, delay)) + .add($crate::grandpa_support::PauseAfterBlockFor(block, delay)) .build() }, None => @@ -674,7 +563,50 @@ macro_rules! new_full { handles.polkadot_network = Some(polkadot_network_service); (service, client, handles) - }} + }}; + ( + $config:expr, + $collating_for:expr, + $max_block_data_size:expr, + $authority_discovery_enabled:expr, + $slot_duration:expr, + $grandpa_pause:expr, + $runtime:ty, + $dispatch:ty, + $informant_prefix:expr, + ) => {{ + new_full!(with_full_start + $config, + $collating_for, + $max_block_data_size, + $authority_discovery_enabled, + $slot_duration, + $grandpa_pause, + new_full_start!($config, $runtime, $dispatch, $informant_prefix), + ) + }}; + ( + test + $config:expr, + $collating_for:expr, + $max_block_data_size:expr, + $authority_discovery_enabled:expr, + $slot_duration:expr, + $grandpa_pause:expr, + $runtime:ty, + $dispatch:ty, + $informant_prefix:expr, + ) => {{ + new_full!(with_full_start + $config, + $collating_for, + $max_block_data_size, + $authority_discovery_enabled, + $slot_duration, + $grandpa_pause, + new_full_start!(test $config, $runtime, $dispatch, $informant_prefix), + ) + }}; } /// Builds a new service for a light client. From 186a764716d724c9954a5abc1a984e163e88097a Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 16:57:23 +0200 Subject: [PATCH 14/92] CLEANUP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- polkadot-test-service/src/lib.rs | 4 ---- service/src/lib.rs | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index c350bd8ee871..eadbc0635f6e 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -37,8 +37,6 @@ pub fn polkadot_test_new_full( max_block_data_size: Option, authority_discovery_enabled: bool, slot_duration: u64, - grandpa_pause: Option<(u32, u32)>, - informant_prefix: Option, ) -> Result<( impl AbstractService, @@ -56,10 +54,8 @@ pub fn polkadot_test_new_full( max_block_data_size, authority_discovery_enabled, slot_duration, - grandpa_pause, polkadot_test_runtime::RuntimeApi, PolkadotExecutor, - informant_prefix, ); Ok((service, client, handles)) diff --git a/service/src/lib.rs b/service/src/lib.rs index 852c96d6f8d0..53a380fdbff2 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -592,10 +592,8 @@ macro_rules! new_full { $max_block_data_size:expr, $authority_discovery_enabled:expr, $slot_duration:expr, - $grandpa_pause:expr, $runtime:ty, $dispatch:ty, - $informant_prefix:expr, ) => {{ new_full!(with_full_start $config, @@ -603,8 +601,8 @@ macro_rules! new_full { $max_block_data_size, $authority_discovery_enabled, $slot_duration, - $grandpa_pause, - new_full_start!(test $config, $runtime, $dispatch, $informant_prefix), + None, + new_full_start!(test $config, $runtime, $dispatch, None), ) }}; } From 528b2edae526c6ef2a07df6abb99e21c7e41c8de Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 15 Jun 2020 18:07:40 +0200 Subject: [PATCH 15/92] WIP Attempt to make a test --- Cargo.lock | 13 ++ polkadot-test-service/Cargo.toml | 4 +- polkadot-test-service/tests/build-blocks.rs | 127 ++++++++++++++++++++ 3 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 polkadot-test-service/tests/build-blocks.rs diff --git a/Cargo.lock b/Cargo.lock index 03ee60a28d3e..bc3a14ce21fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -153,12 +153,23 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" +[[package]] +name = "async-attributes" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd3d156917d94862e779f356c5acae312b08fd3121e792c857d7928c8088423" +dependencies = [ + "quote 1.0.6", + "syn 1.0.27", +] + [[package]] name = "async-std" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "538ecb01eb64eecd772087e5b6f7540cbc917f047727339a472dafed2185b267" dependencies = [ + "async-attributes", "async-task", "broadcaster", "crossbeam-channel", @@ -4677,6 +4688,7 @@ dependencies = [ name = "polkadot-test-service" version = "0.8.2" dependencies = [ + "async-std", "futures 0.3.5", "log 0.4.8", "polkadot-availability-store", @@ -4698,6 +4710,7 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-inherents", + "tempfile", ] [[package]] diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 754ce51bc013..ff0e39b8834f 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -27,4 +27,6 @@ sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -[features] +[dev-dependencies] +tempfile = "3.1.0" +async-std = { version = "1.2.0", features = [ "attributes" ] } diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs new file mode 100644 index 000000000000..a78006aeaaf2 --- /dev/null +++ b/polkadot-test-service/tests/build-blocks.rs @@ -0,0 +1,127 @@ +use polkadot_test_service::*; +use polkadot_service::{PolkadotChainSpec, Configuration, Role, chain_spec::polkadot_local_testnet_config}; +use service::{TaskType, BasePath, DatabaseConfig, config::{KeystoreConfig, WasmExecutionMethod}}; +use sc_network::{config::{NetworkConfiguration, TransportConfig}, multiaddr}; +use tempfile::{Builder, TempDir}; +use std::pin::Pin; +use std::sync::Arc; +use futures::{FutureExt as _, select, pin_mut}; +use std::iter; +use std::net::Ipv4Addr; +use std::time::Duration; + +fn node_config( + index: usize, + spec: &PolkadotChainSpec, + role: Role, + task_executor: Arc + Send>>, TaskType) + Send + Sync>, + key_seed: Option, + base_port: u16, + root: &TempDir, +) -> Configuration +{ + let root = root.path().join(format!("node-{}", index)); + + let mut network_config = NetworkConfiguration::new( + format!("Node {}", index), + "network/test/0.1", + Default::default(), + None, + ); + + network_config.allow_non_globals_in_dht = true; + + network_config.listen_addresses.push( + iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1))) + .chain(iter::once(multiaddr::Protocol::Tcp(base_port + index as u16))) + .collect() + ); + + network_config.transport = TransportConfig::Normal { + enable_mdns: false, + allow_private_ipv4: true, + wasm_external_transport: None, + use_yamux_flow_control: true, + }; + + Configuration { + impl_name: "network-test-impl", + impl_version: "0.1", + role, + task_executor, + transaction_pool: Default::default(), + network: network_config, + keystore: KeystoreConfig::Path { + path: root.join("key"), + password: None + }, + database: DatabaseConfig::RocksDb { + path: root.join("db"), + cache_size: 128, + }, + state_cache_size: 16777216, + state_cache_child_ratio: None, + pruning: Default::default(), + chain_spec: Box::new((*spec).clone()), + wasm_method: WasmExecutionMethod::Interpreted, + execution_strategies: Default::default(), + rpc_http: None, + rpc_ws: None, + rpc_ws_max_connections: None, + rpc_cors: None, + rpc_methods: Default::default(), + prometheus_config: None, + telemetry_endpoints: None, + telemetry_external_transport: None, + default_heap_pages: None, + offchain_worker: Default::default(), + force_authoring: false, + disable_grandpa: false, + dev_key_seed: key_seed, + tracing_targets: None, + tracing_receiver: Default::default(), + max_runtime_instances: 8, + announce_block: true, + base_path: Some(BasePath::new(root)), + } +} + +#[async_std::test] +async fn ensure_test_service_build_blocks() { + let spec = polkadot_local_testnet_config(); + let temp = Builder::new().prefix("polkadot-test-service").tempdir().unwrap(); + let task_executor = { + Arc::new(move |fut: Pin + Send>>, _| { async_std::task::spawn(fut.unit_error()); }) + }; + let key = String::new(); + let base_port = 27015; + let config = node_config( + 0, + &spec, + Role::Authority { sentry_nodes: Vec::new() }, + task_executor, + Some(key), + base_port, + &temp, + ); + let authority_discovery_enabled = false; + let (service, _client, _handles) = polkadot_test_new_full( + config, + None, + None, + authority_discovery_enabled, + 6000, + ).unwrap(); + + let t1 = service.fuse(); + let t2 = async_std::task::sleep(Duration::from_secs(10)).fuse(); + + pin_mut!(t1, t2); + + select! { + _ = t1 => {}, + _ = t2 => {}, + } + + assert!(false); +} From 88c57d3caeed703fdc7a0d8dfd6f5f190177a3f0 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 16 Jun 2020 09:47:12 +0200 Subject: [PATCH 16/92] Change most const to storage --- runtime/test-runtime/src/lib.rs | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 5712290ae3f7..1b4da92f53cd 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -164,8 +164,8 @@ impl system::offchain::SendTransactionTypes for Runtime where } parameter_types! { - pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64; - pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK; + pub storage EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64; + pub storage ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK; } impl babe::Trait for Runtime { @@ -177,7 +177,7 @@ impl babe::Trait for Runtime { } parameter_types! { - pub const IndexDeposit: Balance = 1 * DOLLARS; + pub storage IndexDeposit: Balance = 1 * DOLLARS; } impl indices::Trait for Runtime { @@ -188,7 +188,7 @@ impl indices::Trait for Runtime { } parameter_types! { - pub const ExistentialDeposit: Balance = 1 * CENTS; + pub storage ExistentialDeposit: Balance = 1 * CENTS; } impl balances::Trait for Runtime { @@ -200,8 +200,8 @@ impl balances::Trait for Runtime { } parameter_types! { - pub const TransactionByteFee: Balance = 10 * MILLICENTS; - pub const TargetBlockFullness: Perquintill = Perquintill::from_percent(25); + pub storage TransactionByteFee: Balance = 10 * MILLICENTS; + pub storage TargetBlockFullness: Perquintill = Perquintill::from_percent(25); } impl transaction_payment::Trait for Runtime { @@ -213,7 +213,7 @@ impl transaction_payment::Trait for Runtime { } parameter_types! { - pub const MinimumPeriod: u64 = 0; + pub storage MinimumPeriod: u64 = 0; } impl timestamp::Trait for Runtime { type Moment = u64; @@ -222,7 +222,7 @@ impl timestamp::Trait for Runtime { } parameter_types! { - pub const UncleGenerations: u32 = 0; + pub storage UncleGenerations: u32 = 0; } // TODO: substrate#2986 implement this properly @@ -234,8 +234,8 @@ impl authorship::Trait for Runtime { } parameter_types! { - pub const Period: BlockNumber = 10 * MINUTES; - pub const Offset: BlockNumber = 0; + pub storage Period: BlockNumber = 10 * MINUTES; + pub storage Offset: BlockNumber = 0; } impl_opaque_keys! { @@ -247,7 +247,7 @@ impl_opaque_keys! { } parameter_types! { - pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17); + pub storage DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17); } impl session::Trait for Runtime { @@ -280,16 +280,16 @@ pallet_staking_reward_curve::build! { parameter_types! { // Six sessions in an era (6 hours). - pub const SessionsPerEra: SessionIndex = 6; + pub storage SessionsPerEra: SessionIndex = 6; // 28 eras for unbonding (7 days). - pub const BondingDuration: staking::EraIndex = 28; + pub storage BondingDuration: staking::EraIndex = 28; // 28 eras in which slashes can be cancelled (7 days). - pub const SlashDeferDuration: staking::EraIndex = 28; + pub storage SlashDeferDuration: staking::EraIndex = 28; pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE; - pub const MaxNominatorRewardedPerValidator: u32 = 64; - pub const ElectionLookahead: BlockNumber = 0; - pub const StakingUnsignedPriority: TransactionPriority = TransactionPriority::max_value() / 2; - pub const MaxIterations: u32 = 10; + pub storage MaxNominatorRewardedPerValidator: u32 = 64; + pub storage ElectionLookahead: BlockNumber = 0; + pub storage StakingUnsignedPriority: TransactionPriority = TransactionPriority::max_value() / 2; + pub storage MaxIterations: u32 = 10; pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000); } @@ -345,12 +345,12 @@ impl attestations::Trait for Runtime { } parameter_types! { - pub const MaxCodeSize: u32 = 10 * 1024 * 1024; // 10 MB - pub const MaxHeadDataSize: u32 = 20 * 1024; // 20 KB + pub storage MaxCodeSize: u32 = 10 * 1024 * 1024; // 10 MB + pub storage MaxHeadDataSize: u32 = 20 * 1024; // 20 KB - pub const ValidationUpgradeFrequency: BlockNumber = 2; - pub const ValidationUpgradeDelay: BlockNumber = 1; - pub const SlashPeriod: BlockNumber = 1 * MINUTES; + pub storage ValidationUpgradeFrequency: BlockNumber = 2; + pub storage ValidationUpgradeDelay: BlockNumber = 1; + pub storage SlashPeriod: BlockNumber = 1 * MINUTES; } impl parachains::Trait for Runtime { @@ -426,7 +426,7 @@ impl system::offchain::SigningTypes for Runtime { } parameter_types! { - pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); + pub storage OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); } impl offences::Trait for Runtime { @@ -439,9 +439,9 @@ impl offences::Trait for Runtime { impl authority_discovery::Trait for Runtime {} parameter_types! { - pub const ParathreadDeposit: Balance = 5 * DOLLARS; + pub storage ParathreadDeposit: Balance = 5 * DOLLARS; pub const QueueSize: usize = 2; - pub const MaxRetries: u32 = 3; + pub storage MaxRetries: u32 = 3; } impl registrar::Trait for Runtime { @@ -455,8 +455,8 @@ impl registrar::Trait for Runtime { } parameter_types! { - pub const LeasePeriod: BlockNumber = 100_000; - pub const EndingPeriod: BlockNumber = 1000; + pub storage LeasePeriod: BlockNumber = 100_000; + pub storage EndingPeriod: BlockNumber = 1000; } impl slots::Trait for Runtime { @@ -480,7 +480,7 @@ impl claims::Trait for Runtime { } parameter_types! { - pub const MinVestedTransfer: Balance = 100 * DOLLARS; + pub storage MinVestedTransfer: Balance = 100 * DOLLARS; } impl vesting::Trait for Runtime { From b5b219e632f9f8ea3586b0b0db35838aa2a206ca Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 16 Jun 2020 09:52:45 +0200 Subject: [PATCH 17/92] Add Get impl --- runtime/test-runtime/src/lib.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 1b4da92f53cd..ed6f67f006ac 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -51,7 +51,7 @@ use sp_core::OpaqueMetadata; use sp_staking::SessionIndex; use frame_support::{ parameter_types, construct_runtime, debug, - traits::{KeyOwnerProofSystem, Randomness}, + traits::{Get, KeyOwnerProofSystem, Randomness}, weights::Weight, }; use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; @@ -748,3 +748,11 @@ sp_api::impl_runtime_apis! { } } } + +trait Config { + type EpochDuration: Get; +} + +impl Config for Runtime { + type EpochDuration = EpochDuration; +} From 9aba20a883bb64f1d0901ef44dea55f428633d09 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 16 Jun 2020 11:46:22 +0200 Subject: [PATCH 18/92] Move everything to the test crate to create an API --- polkadot-test-service/src/lib.rs | 110 ++++++++++++++++++- polkadot-test-service/tests/build-blocks.rs | 111 ++------------------ 2 files changed, 115 insertions(+), 106 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index eadbc0635f6e..e35a3206ee60 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -20,15 +20,20 @@ use std::sync::Arc; use std::time::Duration; use polkadot_primitives::{parachain, Hash, BlockId}; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; -use service::{error::Error as ServiceError}; +use service::{error::Error as ServiceError, TaskType, BasePath, config::{KeystoreConfig, DatabaseConfig, +WasmExecutionMethod}}; use grandpa::{FinalityProofProvider as GrandpaFinalityProofProvider}; use log::info; use service::{AbstractService, Role, TFullBackend, Configuration}; +use sc_network::{config::{NetworkConfiguration, TransportConfig}, multiaddr}; use consensus_common::{SelectChain, block_validation::Chain}; use polkadot_primitives::parachain::{CollatorId}; use polkadot_primitives::Block; use polkadot_service::PolkadotClient; -use polkadot_service::{new_full, new_full_start, FullNodeHandles, PolkadotExecutor}; +use polkadot_service::{new_full, new_full_start, FullNodeHandles, PolkadotExecutor, chain_spec::polkadot_local_testnet_config, PolkadotChainSpec}; +use std::path::PathBuf; +use std::pin::Pin; +use std::net::Ipv4Addr; /// Create a new Polkadot test service for a full node. pub fn polkadot_test_new_full( @@ -60,3 +65,104 @@ pub fn polkadot_test_new_full( Ok((service, client, handles)) } + +fn node_config( + index: usize, + spec: &PolkadotChainSpec, + role: Role, + task_executor: Arc + Send>>, TaskType) + Send + Sync>, + key_seed: Option, + base_port: u16, + root: &PathBuf, +) -> Configuration +{ + let root = root.join(format!("node-{}", index)); + + let mut network_config = NetworkConfiguration::new( + format!("Node {}", index), + "network/test/0.1", + Default::default(), + None, + ); + + network_config.allow_non_globals_in_dht = true; + + network_config.listen_addresses.push( + std::iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1))) + .chain(std::iter::once(multiaddr::Protocol::Tcp(base_port + index as u16))) + .collect() + ); + + network_config.transport = TransportConfig::Normal { + enable_mdns: false, + allow_private_ipv4: true, + wasm_external_transport: None, + use_yamux_flow_control: true, + }; + + Configuration { + impl_name: "network-test-impl", + impl_version: "0.1", + role, + task_executor, + transaction_pool: Default::default(), + network: network_config, + keystore: KeystoreConfig::Path { + path: root.join("key"), + password: None + }, + database: DatabaseConfig::RocksDb { + path: root.join("db"), + cache_size: 128, + }, + state_cache_size: 16777216, + state_cache_child_ratio: None, + pruning: Default::default(), + chain_spec: Box::new((*spec).clone()), + wasm_method: WasmExecutionMethod::Interpreted, + execution_strategies: Default::default(), + rpc_http: None, + rpc_ws: None, + rpc_ws_max_connections: None, + rpc_cors: None, + rpc_methods: Default::default(), + prometheus_config: None, + telemetry_endpoints: None, + telemetry_external_transport: None, + default_heap_pages: None, + offchain_worker: Default::default(), + force_authoring: false, + disable_grandpa: false, + dev_key_seed: key_seed, + tracing_targets: None, + tracing_receiver: Default::default(), + max_runtime_instances: 8, + announce_block: true, + base_path: Some(BasePath::new(root)), + } +} + +pub fn run_test_node(task_executor: Arc + Send>>, TaskType) + Send + Sync>, root: &PathBuf) -> Result { + let spec = polkadot_local_testnet_config(); + let key = String::new(); + let base_port = 27015; + let config = node_config( + 0, + &spec, + Role::Authority { sentry_nodes: Vec::new() }, + task_executor, + Some(key), + base_port, + &root, + ); + let authority_discovery_enabled = false; + let (service, _client, _handles) = polkadot_test_new_full( + config, + None, + None, + authority_discovery_enabled, + 6000, + ).unwrap(); + + Ok(service) +} diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index a78006aeaaf2..324ec709f4ec 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -1,117 +1,20 @@ use polkadot_test_service::*; -use polkadot_service::{PolkadotChainSpec, Configuration, Role, chain_spec::polkadot_local_testnet_config}; -use service::{TaskType, BasePath, DatabaseConfig, config::{KeystoreConfig, WasmExecutionMethod}}; -use sc_network::{config::{NetworkConfiguration, TransportConfig}, multiaddr}; -use tempfile::{Builder, TempDir}; use std::pin::Pin; use std::sync::Arc; use futures::{FutureExt as _, select, pin_mut}; -use std::iter; -use std::net::Ipv4Addr; use std::time::Duration; +use service::TaskType; -fn node_config( - index: usize, - spec: &PolkadotChainSpec, - role: Role, - task_executor: Arc + Send>>, TaskType) + Send + Sync>, - key_seed: Option, - base_port: u16, - root: &TempDir, -) -> Configuration -{ - let root = root.path().join(format!("node-{}", index)); - - let mut network_config = NetworkConfiguration::new( - format!("Node {}", index), - "network/test/0.1", - Default::default(), - None, - ); - - network_config.allow_non_globals_in_dht = true; - - network_config.listen_addresses.push( - iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1))) - .chain(iter::once(multiaddr::Protocol::Tcp(base_port + index as u16))) - .collect() - ); - - network_config.transport = TransportConfig::Normal { - enable_mdns: false, - allow_private_ipv4: true, - wasm_external_transport: None, - use_yamux_flow_control: true, - }; - - Configuration { - impl_name: "network-test-impl", - impl_version: "0.1", - role, - task_executor, - transaction_pool: Default::default(), - network: network_config, - keystore: KeystoreConfig::Path { - path: root.join("key"), - password: None - }, - database: DatabaseConfig::RocksDb { - path: root.join("db"), - cache_size: 128, - }, - state_cache_size: 16777216, - state_cache_child_ratio: None, - pruning: Default::default(), - chain_spec: Box::new((*spec).clone()), - wasm_method: WasmExecutionMethod::Interpreted, - execution_strategies: Default::default(), - rpc_http: None, - rpc_ws: None, - rpc_ws_max_connections: None, - rpc_cors: None, - rpc_methods: Default::default(), - prometheus_config: None, - telemetry_endpoints: None, - telemetry_external_transport: None, - default_heap_pages: None, - offchain_worker: Default::default(), - force_authoring: false, - disable_grandpa: false, - dev_key_seed: key_seed, - tracing_targets: None, - tracing_receiver: Default::default(), - max_runtime_instances: 8, - announce_block: true, - base_path: Some(BasePath::new(root)), - } +fn task_executor() -> Arc + Send>>, TaskType) + Send + Sync> { + Arc::new(move |fut: Pin + Send>>, _| { async_std::task::spawn(fut.unit_error()); }) } #[async_std::test] async fn ensure_test_service_build_blocks() { - let spec = polkadot_local_testnet_config(); - let temp = Builder::new().prefix("polkadot-test-service").tempdir().unwrap(); - let task_executor = { - Arc::new(move |fut: Pin + Send>>, _| { async_std::task::spawn(fut.unit_error()); }) - }; - let key = String::new(); - let base_port = 27015; - let config = node_config( - 0, - &spec, - Role::Authority { sentry_nodes: Vec::new() }, - task_executor, - Some(key), - base_port, - &temp, - ); - let authority_discovery_enabled = false; - let (service, _client, _handles) = polkadot_test_new_full( - config, - None, - None, - authority_discovery_enabled, - 6000, - ).unwrap(); + let temp = tempfile::Builder::new().prefix("polkadot-test-service").tempdir().unwrap(); + let task_executor = task_executor(); + + let service = run_test_node(task_executor, &temp.path().to_path_buf()).unwrap(); let t1 = service.fuse(); let t2 = async_std::task::sleep(Duration::from_secs(10)).fuse(); From 83d9bf3c0e3262ea88119ccacf6b7e66a691ab0f Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 16 Jun 2020 13:03:38 +0200 Subject: [PATCH 19/92] create chain spec --- Cargo.lock | 4 + polkadot-test-service/Cargo.toml | 4 + polkadot-test-service/src/lib.rs | 154 ++++++++++++++++++++++++++++++- 3 files changed, 160 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc3a14ce21fc..1ec137592701 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4691,6 +4691,7 @@ dependencies = [ "async-std", "futures 0.3.5", "log 0.4.8", + "pallet-staking", "polkadot-availability-store", "polkadot-network", "polkadot-primitives", @@ -4699,6 +4700,7 @@ dependencies = [ "polkadot-test-runtime", "polkadot-validation", "sc-authority-discovery", + "sc-chain-spec", "sc-client-api", "sc-consensus", "sc-consensus-babe", @@ -4707,9 +4709,11 @@ dependencies = [ "sc-service", "sc-transaction-pool", "sp-consensus", + "sp-consensus-babe", "sp-core", "sp-finality-grandpa", "sp-inherents", + "sp-runtime", "tempfile", ] diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index ff0e39b8834f..fee36cd6821a 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -26,6 +26,10 @@ service = { package = "sc-service", git = "https://github.com/paritytech/substra sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] tempfile = "3.1.0" diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index e35a3206ee60..1c780a083322 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -18,7 +18,7 @@ use std::sync::Arc; use std::time::Duration; -use polkadot_primitives::{parachain, Hash, BlockId}; +use polkadot_primitives::{parachain::{self, ValidatorId}, Hash, BlockId, AccountId}; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; use service::{error::Error as ServiceError, TaskType, BasePath, config::{KeystoreConfig, DatabaseConfig, WasmExecutionMethod}}; @@ -30,10 +30,26 @@ use consensus_common::{SelectChain, block_validation::Chain}; use polkadot_primitives::parachain::{CollatorId}; use polkadot_primitives::Block; use polkadot_service::PolkadotClient; -use polkadot_service::{new_full, new_full_start, FullNodeHandles, PolkadotExecutor, chain_spec::polkadot_local_testnet_config, PolkadotChainSpec}; +use polkadot_service::{new_full, new_full_start, FullNodeHandles, PolkadotExecutor, +chain_spec::{get_account_id_from_seed, get_from_seed, Extensions}}; use std::path::PathBuf; use std::pin::Pin; use std::net::Ipv4Addr; +use babe_primitives::AuthorityId as BabeId; +use grandpa::AuthorityId as GrandpaId; +use polkadot_test_runtime::constants::currency::DOTS; +use sp_core::sr25519; +use sc_chain_spec::{ChainType}; +use sp_runtime::{Perbill}; +use pallet_staking::Forcing; + +const DEFAULT_PROTOCOL_ID: &str = "dot"; + +/// The `ChainSpec parametrised for polkadot runtime`. +pub type PolkadotChainSpec = service::GenericChainSpec< + polkadot_test_runtime::GenesisConfig, + Extensions, +>; /// Create a new Polkadot test service for a full node. pub fn polkadot_test_new_full( @@ -166,3 +182,137 @@ pub fn run_test_node(task_executor: Arc PolkadotChainSpec { + PolkadotChainSpec::from_genesis( + "Local Testnet", + "local_testnet", + ChainType::Local, + polkadot_local_testnet_genesis, + vec![], + None, + Some(DEFAULT_PROTOCOL_ID), + None, + Default::default(), + ) +} + +fn polkadot_local_testnet_genesis() -> polkadot_test_runtime::GenesisConfig { + polkadot_testnet_genesis( + vec![ + get_authority_keys_from_seed("Alice"), + get_authority_keys_from_seed("Bob"), + ], + get_account_id_from_seed::("Alice"), + None, + ) +} + +/// Helper function to generate stash, controller and session key from seed +fn get_authority_keys_from_seed(seed: &str) -> ( + AccountId, + AccountId, + BabeId, + GrandpaId, + ValidatorId, +) { + ( + get_account_id_from_seed::(&format!("{}//stash", seed)), + get_account_id_from_seed::(seed), + get_from_seed::(seed), + get_from_seed::(seed), + get_from_seed::(seed), + ) +} + +fn testnet_accounts() -> Vec { + vec![ + get_account_id_from_seed::("Alice"), + get_account_id_from_seed::("Bob"), + get_account_id_from_seed::("Charlie"), + get_account_id_from_seed::("Dave"), + get_account_id_from_seed::("Eve"), + get_account_id_from_seed::("Ferdie"), + get_account_id_from_seed::("Alice//stash"), + get_account_id_from_seed::("Bob//stash"), + get_account_id_from_seed::("Charlie//stash"), + get_account_id_from_seed::("Dave//stash"), + get_account_id_from_seed::("Eve//stash"), + get_account_id_from_seed::("Ferdie//stash"), + ] +} + +/// Helper function to create polkadot GenesisConfig for testing +fn polkadot_testnet_genesis( + initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ValidatorId)>, + root_key: AccountId, + endowed_accounts: Option>, +) -> polkadot_test_runtime::GenesisConfig { + use polkadot_test_runtime as polkadot; + + let endowed_accounts: Vec = endowed_accounts.unwrap_or_else(testnet_accounts); + + const ENDOWMENT: u128 = 1_000_000 * DOTS; + const STASH: u128 = 100 * DOTS; + + polkadot::GenesisConfig { + system: Some(polkadot::SystemConfig { + code: polkadot::WASM_BINARY.to_vec(), + changes_trie_config: Default::default(), + }), + indices: Some(polkadot::IndicesConfig { + indices: vec![], + }), + balances: Some(polkadot::BalancesConfig { + balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(), + }), + session: Some(polkadot::SessionConfig { + keys: initial_authorities.iter().map(|x| ( + x.0.clone(), + x.0.clone(), + polkadot_test_runtime::SessionKeys { + babe: x.2.clone(), + grandpa: x.3.clone(), + parachain_validator: x.4.clone(), + }, + )).collect::>(), + }), + staking: Some(polkadot::StakingConfig { + minimum_validator_count: 1, + validator_count: 2, + stakers: initial_authorities.iter() + .map(|x| (x.0.clone(), x.1.clone(), STASH, polkadot::StakerStatus::Validator)) + .collect(), + invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), + force_era: Forcing::NotForcing, + slash_reward_fraction: Perbill::from_percent(10), + .. Default::default() + }), + babe: Some(Default::default()), + grandpa: Some(Default::default()), + authority_discovery: Some(polkadot::AuthorityDiscoveryConfig { + keys: vec![], + }), + parachains: Some(polkadot::ParachainsConfig { + authorities: vec![], + }), + registrar: Some(polkadot::RegistrarConfig{ + parachains: vec![], + _phdata: Default::default(), + }), + claims: Some(polkadot::ClaimsConfig { + claims: vec![], + vesting: vec![], + }), + vesting: Some(polkadot::VestingConfig { + vesting: vec![], + }), + // TODO: it should have one? + /* + sudo: Some(polkadot::SudoConfig { + key: root_key, + }), + */ + } +} From 84fe08a1fe850c50a3357da9741bf64bace9a467 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 16 Jun 2020 13:41:26 +0200 Subject: [PATCH 20/92] Parametrize storage update --- Cargo.lock | 1 + polkadot-test-service/Cargo.toml | 1 + polkadot-test-service/src/lib.rs | 29 ++++++++++++++++++--- polkadot-test-service/tests/build-blocks.rs | 10 ++++++- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ec137592701..c153a18bd394 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4714,6 +4714,7 @@ dependencies = [ "sp-finality-grandpa", "sp-inherents", "sp-runtime", + "sp-state-machine", "tempfile", ] diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index fee36cd6821a..2d7c62a1c629 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -30,6 +30,7 @@ sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "mas babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] tempfile = "3.1.0" diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 1c780a083322..43309a82ec8b 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -39,9 +39,10 @@ use babe_primitives::AuthorityId as BabeId; use grandpa::AuthorityId as GrandpaId; use polkadot_test_runtime::constants::currency::DOTS; use sp_core::sr25519; -use sc_chain_spec::{ChainType}; +use sc_chain_spec::{ChainType, ChainSpec}; use sp_runtime::{Perbill}; use pallet_staking::Forcing; +use sp_state_machine::BasicExternalities; const DEFAULT_PROTOCOL_ID: &str = "dot"; @@ -158,8 +159,30 @@ fn node_config( } } -pub fn run_test_node(task_executor: Arc + Send>>, TaskType) + Send + Sync>, root: &PathBuf) -> Result { - let spec = polkadot_local_testnet_config(); +pub fn run_test_node( + task_executor: Arc + Send>>, TaskType) + Send + Sync>, + root: &PathBuf, + storage_update_func: impl Fn(), +) -> Result { + let mut spec = polkadot_local_testnet_config(); + + let mut storage = spec.as_storage_builder().build_storage().unwrap(); + BasicExternalities::execute_with_storage( + &mut storage, + storage_update_func, + ); + + spec.set_storage(storage); + + let mut storage = spec.as_storage_builder().build_storage().unwrap(); + BasicExternalities::execute_with_storage( + &mut storage, + || { + use polkadot_test_runtime::*; + panic!("{:?}", EpochDuration::get()); + }, + ); + let key = String::new(); let base_port = 27015; let config = node_config( diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 324ec709f4ec..b885596112e3 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -14,7 +14,15 @@ async fn ensure_test_service_build_blocks() { let temp = tempfile::Builder::new().prefix("polkadot-test-service").tempdir().unwrap(); let task_executor = task_executor(); - let service = run_test_node(task_executor, &temp.path().to_path_buf()).unwrap(); + let service = run_test_node( + task_executor, + &temp.path().to_path_buf(), + || { + use polkadot_test_runtime::*; + EpochDuration::set(&42); + //panic!("{:?}", EpochDuration::get()); + }, + ).unwrap(); let t1 = service.fuse(); let t2 = async_std::task::sleep(Duration::from_secs(10)).fuse(); From df439481768bff66cb64d24dff25a37e96eb6472 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 16 Jun 2020 13:53:26 +0200 Subject: [PATCH 21/92] CLEANUP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- polkadot-test-service/src/chain_spec.rs | 153 +++++++++++++++++++++++ polkadot-test-service/src/lib.rs | 157 +----------------------- 2 files changed, 159 insertions(+), 151 deletions(-) create mode 100644 polkadot-test-service/src/chain_spec.rs diff --git a/polkadot-test-service/src/chain_spec.rs b/polkadot-test-service/src/chain_spec.rs new file mode 100644 index 000000000000..fbb60c5fa49e --- /dev/null +++ b/polkadot-test-service/src/chain_spec.rs @@ -0,0 +1,153 @@ +use polkadot_primitives::{parachain::{ValidatorId}, AccountId}; +use polkadot_service::{ +chain_spec::{get_account_id_from_seed, get_from_seed, Extensions}}; +use babe_primitives::AuthorityId as BabeId; +use grandpa::AuthorityId as GrandpaId; +use polkadot_test_runtime::constants::currency::DOTS; +use sp_core::sr25519; +use sc_chain_spec::{ChainType}; +use sp_runtime::{Perbill}; +use pallet_staking::Forcing; + +const DEFAULT_PROTOCOL_ID: &str = "dot"; + +/// The `ChainSpec parametrised for polkadot runtime`. +pub type PolkadotChainSpec = service::GenericChainSpec< + polkadot_test_runtime::GenesisConfig, + Extensions, +>; + + +/// Polkadot local testnet config (multivalidator Alice + Bob) +pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { + PolkadotChainSpec::from_genesis( + "Local Testnet", + "local_testnet", + ChainType::Local, + polkadot_local_testnet_genesis, + vec![], + None, + Some(DEFAULT_PROTOCOL_ID), + None, + Default::default(), + ) +} + +fn polkadot_local_testnet_genesis() -> polkadot_test_runtime::GenesisConfig { + polkadot_testnet_genesis( + vec![ + get_authority_keys_from_seed("Alice"), + get_authority_keys_from_seed("Bob"), + ], + get_account_id_from_seed::("Alice"), + None, + ) +} + +/// Helper function to generate stash, controller and session key from seed +fn get_authority_keys_from_seed(seed: &str) -> ( + AccountId, + AccountId, + BabeId, + GrandpaId, + ValidatorId, +) { + ( + get_account_id_from_seed::(&format!("{}//stash", seed)), + get_account_id_from_seed::(seed), + get_from_seed::(seed), + get_from_seed::(seed), + get_from_seed::(seed), + ) +} + +fn testnet_accounts() -> Vec { + vec![ + get_account_id_from_seed::("Alice"), + get_account_id_from_seed::("Bob"), + get_account_id_from_seed::("Charlie"), + get_account_id_from_seed::("Dave"), + get_account_id_from_seed::("Eve"), + get_account_id_from_seed::("Ferdie"), + get_account_id_from_seed::("Alice//stash"), + get_account_id_from_seed::("Bob//stash"), + get_account_id_from_seed::("Charlie//stash"), + get_account_id_from_seed::("Dave//stash"), + get_account_id_from_seed::("Eve//stash"), + get_account_id_from_seed::("Ferdie//stash"), + ] +} + +/// Helper function to create polkadot GenesisConfig for testing +fn polkadot_testnet_genesis( + initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ValidatorId)>, + _root_key: AccountId, // TODO + endowed_accounts: Option>, +) -> polkadot_test_runtime::GenesisConfig { + use polkadot_test_runtime as polkadot; + + let endowed_accounts: Vec = endowed_accounts.unwrap_or_else(testnet_accounts); + + const ENDOWMENT: u128 = 1_000_000 * DOTS; + const STASH: u128 = 100 * DOTS; + + polkadot::GenesisConfig { + system: Some(polkadot::SystemConfig { + code: polkadot::WASM_BINARY.to_vec(), + changes_trie_config: Default::default(), + }), + indices: Some(polkadot::IndicesConfig { + indices: vec![], + }), + balances: Some(polkadot::BalancesConfig { + balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(), + }), + session: Some(polkadot::SessionConfig { + keys: initial_authorities.iter().map(|x| ( + x.0.clone(), + x.0.clone(), + polkadot_test_runtime::SessionKeys { + babe: x.2.clone(), + grandpa: x.3.clone(), + parachain_validator: x.4.clone(), + }, + )).collect::>(), + }), + staking: Some(polkadot::StakingConfig { + minimum_validator_count: 1, + validator_count: 2, + stakers: initial_authorities.iter() + .map(|x| (x.0.clone(), x.1.clone(), STASH, polkadot::StakerStatus::Validator)) + .collect(), + invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), + force_era: Forcing::NotForcing, + slash_reward_fraction: Perbill::from_percent(10), + .. Default::default() + }), + babe: Some(Default::default()), + grandpa: Some(Default::default()), + authority_discovery: Some(polkadot::AuthorityDiscoveryConfig { + keys: vec![], + }), + parachains: Some(polkadot::ParachainsConfig { + authorities: vec![], + }), + registrar: Some(polkadot::RegistrarConfig{ + parachains: vec![], + _phdata: Default::default(), + }), + claims: Some(polkadot::ClaimsConfig { + claims: vec![], + vesting: vec![], + }), + vesting: Some(polkadot::VestingConfig { + vesting: vec![], + }), + // TODO: it should have one? + /* + sudo: Some(polkadot::SudoConfig { + key: root_key, + }), + */ + } +} diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 43309a82ec8b..165983eade21 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -16,9 +16,11 @@ //! Polkadot test service only. +mod chain_spec; + use std::sync::Arc; use std::time::Duration; -use polkadot_primitives::{parachain::{self, ValidatorId}, Hash, BlockId, AccountId}; +use polkadot_primitives::{parachain::{self}, Hash, BlockId}; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; use service::{error::Error as ServiceError, TaskType, BasePath, config::{KeystoreConfig, DatabaseConfig, WasmExecutionMethod}}; @@ -31,26 +33,13 @@ use polkadot_primitives::parachain::{CollatorId}; use polkadot_primitives::Block; use polkadot_service::PolkadotClient; use polkadot_service::{new_full, new_full_start, FullNodeHandles, PolkadotExecutor, -chain_spec::{get_account_id_from_seed, get_from_seed, Extensions}}; +}; use std::path::PathBuf; use std::pin::Pin; use std::net::Ipv4Addr; -use babe_primitives::AuthorityId as BabeId; -use grandpa::AuthorityId as GrandpaId; -use polkadot_test_runtime::constants::currency::DOTS; -use sp_core::sr25519; -use sc_chain_spec::{ChainType, ChainSpec}; -use sp_runtime::{Perbill}; -use pallet_staking::Forcing; +use sc_chain_spec::{ChainSpec}; use sp_state_machine::BasicExternalities; - -const DEFAULT_PROTOCOL_ID: &str = "dot"; - -/// The `ChainSpec parametrised for polkadot runtime`. -pub type PolkadotChainSpec = service::GenericChainSpec< - polkadot_test_runtime::GenesisConfig, - Extensions, ->; +pub use chain_spec::*; /// Create a new Polkadot test service for a full node. pub fn polkadot_test_new_full( @@ -205,137 +194,3 @@ pub fn run_test_node( Ok(service) } - -/// Polkadot local testnet config (multivalidator Alice + Bob) -fn polkadot_local_testnet_config() -> PolkadotChainSpec { - PolkadotChainSpec::from_genesis( - "Local Testnet", - "local_testnet", - ChainType::Local, - polkadot_local_testnet_genesis, - vec![], - None, - Some(DEFAULT_PROTOCOL_ID), - None, - Default::default(), - ) -} - -fn polkadot_local_testnet_genesis() -> polkadot_test_runtime::GenesisConfig { - polkadot_testnet_genesis( - vec![ - get_authority_keys_from_seed("Alice"), - get_authority_keys_from_seed("Bob"), - ], - get_account_id_from_seed::("Alice"), - None, - ) -} - -/// Helper function to generate stash, controller and session key from seed -fn get_authority_keys_from_seed(seed: &str) -> ( - AccountId, - AccountId, - BabeId, - GrandpaId, - ValidatorId, -) { - ( - get_account_id_from_seed::(&format!("{}//stash", seed)), - get_account_id_from_seed::(seed), - get_from_seed::(seed), - get_from_seed::(seed), - get_from_seed::(seed), - ) -} - -fn testnet_accounts() -> Vec { - vec![ - get_account_id_from_seed::("Alice"), - get_account_id_from_seed::("Bob"), - get_account_id_from_seed::("Charlie"), - get_account_id_from_seed::("Dave"), - get_account_id_from_seed::("Eve"), - get_account_id_from_seed::("Ferdie"), - get_account_id_from_seed::("Alice//stash"), - get_account_id_from_seed::("Bob//stash"), - get_account_id_from_seed::("Charlie//stash"), - get_account_id_from_seed::("Dave//stash"), - get_account_id_from_seed::("Eve//stash"), - get_account_id_from_seed::("Ferdie//stash"), - ] -} - -/// Helper function to create polkadot GenesisConfig for testing -fn polkadot_testnet_genesis( - initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ValidatorId)>, - root_key: AccountId, - endowed_accounts: Option>, -) -> polkadot_test_runtime::GenesisConfig { - use polkadot_test_runtime as polkadot; - - let endowed_accounts: Vec = endowed_accounts.unwrap_or_else(testnet_accounts); - - const ENDOWMENT: u128 = 1_000_000 * DOTS; - const STASH: u128 = 100 * DOTS; - - polkadot::GenesisConfig { - system: Some(polkadot::SystemConfig { - code: polkadot::WASM_BINARY.to_vec(), - changes_trie_config: Default::default(), - }), - indices: Some(polkadot::IndicesConfig { - indices: vec![], - }), - balances: Some(polkadot::BalancesConfig { - balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(), - }), - session: Some(polkadot::SessionConfig { - keys: initial_authorities.iter().map(|x| ( - x.0.clone(), - x.0.clone(), - polkadot_test_runtime::SessionKeys { - babe: x.2.clone(), - grandpa: x.3.clone(), - parachain_validator: x.4.clone(), - }, - )).collect::>(), - }), - staking: Some(polkadot::StakingConfig { - minimum_validator_count: 1, - validator_count: 2, - stakers: initial_authorities.iter() - .map(|x| (x.0.clone(), x.1.clone(), STASH, polkadot::StakerStatus::Validator)) - .collect(), - invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), - force_era: Forcing::NotForcing, - slash_reward_fraction: Perbill::from_percent(10), - .. Default::default() - }), - babe: Some(Default::default()), - grandpa: Some(Default::default()), - authority_discovery: Some(polkadot::AuthorityDiscoveryConfig { - keys: vec![], - }), - parachains: Some(polkadot::ParachainsConfig { - authorities: vec![], - }), - registrar: Some(polkadot::RegistrarConfig{ - parachains: vec![], - _phdata: Default::default(), - }), - claims: Some(polkadot::ClaimsConfig { - claims: vec![], - vesting: vec![], - }), - vesting: Some(polkadot::VestingConfig { - vesting: vec![], - }), - // TODO: it should have one? - /* - sudo: Some(polkadot::SudoConfig { - key: root_key, - }), - */ - } -} From 7a27276b56ff5b8464ae698032683270ff789a86 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 16 Jun 2020 14:11:39 +0200 Subject: [PATCH 22/92] regex to the rescue --- runtime/test-runtime/src/lib.rs | 56 +++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index ed6f67f006ac..a88ff15de3f5 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -751,8 +751,64 @@ sp_api::impl_runtime_apis! { trait Config { type EpochDuration: Get; + type ExpectedBlockTime: Get; + type IndexDeposit: Get; + type ExistentialDeposit: Get; + type TransactionByteFee: Get; + type TargetBlockFullness: Get; + type MinimumPeriod: Get; + type UncleGenerations: Get; + type Period: Get; + type Offset: Get; + type DisabledValidatorsThreshold: Get; + type SessionsPerEra: Get; + type BondingDuration: Get; + type SlashDeferDuration: Get; + type MaxNominatorRewardedPerValidator: Get; + type ElectionLookahead: Get; + type StakingUnsignedPriority: Get; + type MaxIterations: Get; + type MaxCodeSize: Get; + type MaxHeadDataSize: Get; + type ValidationUpgradeFrequency: Get; + type ValidationUpgradeDelay: Get; + type SlashPeriod: Get; + type OffencesWeightSoftLimit: Get; + type ParathreadDeposit: Get; + type MaxRetries: Get; + type LeasePeriod: Get; + type EndingPeriod: Get; + type MinVestedTransfer: Get; } impl Config for Runtime { type EpochDuration = EpochDuration; + type ExpectedBlockTime = ExpectedBlockTime; + type IndexDeposit = IndexDeposit; + type ExistentialDeposit = ExistentialDeposit; + type TransactionByteFee = TransactionByteFee; + type TargetBlockFullness = TargetBlockFullness; + type MinimumPeriod = MinimumPeriod; + type UncleGenerations = UncleGenerations; + type Period = Period; + type Offset = Offset; + type DisabledValidatorsThreshold = DisabledValidatorsThreshold; + type SessionsPerEra = SessionsPerEra; + type BondingDuration = BondingDuration; + type SlashDeferDuration = SlashDeferDuration; + type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; + type ElectionLookahead = ElectionLookahead; + type StakingUnsignedPriority = StakingUnsignedPriority; + type MaxIterations = MaxIterations; + type MaxCodeSize = MaxCodeSize; + type MaxHeadDataSize = MaxHeadDataSize; + type ValidationUpgradeFrequency = ValidationUpgradeFrequency; + type ValidationUpgradeDelay = ValidationUpgradeDelay; + type SlashPeriod = SlashPeriod; + type OffencesWeightSoftLimit = OffencesWeightSoftLimit; + type ParathreadDeposit = ParathreadDeposit; + type MaxRetries = MaxRetries; + type LeasePeriod = LeasePeriod; + type EndingPeriod = EndingPeriod; + type MinVestedTransfer = MinVestedTransfer; } From 29b8a34a23a499fd26b762d6231a2bf0864f2436 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 16 Jun 2020 15:06:05 +0200 Subject: [PATCH 23/92] Improving API --- polkadot-test-service/Cargo.toml | 2 +- polkadot-test-service/src/lib.rs | 50 +++++++++------------ polkadot-test-service/tests/build-blocks.rs | 5 +-- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 2d7c62a1c629..dfa51c69eb08 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -31,7 +31,7 @@ babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/par sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } +tempfile = "3.1.0" [dev-dependencies] -tempfile = "3.1.0" async-std = { version = "1.2.0", features = [ "attributes" ] } diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 165983eade21..65db23be481f 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -22,7 +22,7 @@ use std::sync::Arc; use std::time::Duration; use polkadot_primitives::{parachain::{self}, Hash, BlockId}; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; -use service::{error::Error as ServiceError, TaskType, BasePath, config::{KeystoreConfig, DatabaseConfig, +use service::{error::Error as ServiceError, TaskType, config::{KeystoreConfig, DatabaseConfig, WasmExecutionMethod}}; use grandpa::{FinalityProofProvider as GrandpaFinalityProofProvider}; use log::info; @@ -34,7 +34,7 @@ use polkadot_primitives::Block; use polkadot_service::PolkadotClient; use polkadot_service::{new_full, new_full_start, FullNodeHandles, PolkadotExecutor, }; -use std::path::PathBuf; +use std::path::{Path}; use std::pin::Pin; use std::net::Ipv4Addr; use sc_chain_spec::{ChainSpec}; @@ -72,20 +72,18 @@ pub fn polkadot_test_new_full( Ok((service, client, handles)) } -fn node_config( - index: usize, +fn node_config>( spec: &PolkadotChainSpec, role: Role, task_executor: Arc + Send>>, TaskType) + Send + Sync>, key_seed: Option, - base_port: u16, - root: &PathBuf, + port: u16, + root: P, ) -> Configuration { - let root = root.join(format!("node-{}", index)); - + let root = root.as_ref().to_path_buf(); let mut network_config = NetworkConfiguration::new( - format!("Node {}", index), + format!("Polkadot Test Node on {}", port), "network/test/0.1", Default::default(), None, @@ -95,7 +93,7 @@ fn node_config( network_config.listen_addresses.push( std::iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1))) - .chain(std::iter::once(multiaddr::Protocol::Tcp(base_port + index as u16))) + .chain(std::iter::once(multiaddr::Protocol::Tcp(port))) .collect() ); @@ -107,7 +105,7 @@ fn node_config( }; Configuration { - impl_name: "network-test-impl", + impl_name: "polkadot-test-node", impl_version: "0.1", role, task_executor, @@ -144,15 +142,20 @@ fn node_config( tracing_receiver: Default::default(), max_runtime_instances: 8, announce_block: true, - base_path: Some(BasePath::new(root)), + base_path: Some(root.into()), } } pub fn run_test_node( task_executor: Arc + Send>>, TaskType) + Send + Sync>, - root: &PathBuf, + port: u16, storage_update_func: impl Fn(), -) -> Result { +) -> Result<(impl AbstractService, Arc, + polkadot_test_runtime::RuntimeApi + >>, FullNodeHandles, tempfile::TempDir), ()> { + let base_path = tempfile::Builder::new().prefix("polkadot-test-service").tempdir().unwrap(); let mut spec = polkadot_local_testnet_config(); let mut storage = spec.as_storage_builder().build_storage().unwrap(); @@ -163,28 +166,17 @@ pub fn run_test_node( spec.set_storage(storage); - let mut storage = spec.as_storage_builder().build_storage().unwrap(); - BasicExternalities::execute_with_storage( - &mut storage, - || { - use polkadot_test_runtime::*; - panic!("{:?}", EpochDuration::get()); - }, - ); - let key = String::new(); - let base_port = 27015; let config = node_config( - 0, &spec, Role::Authority { sentry_nodes: Vec::new() }, task_executor, Some(key), - base_port, - &root, + port, + &base_path, ); let authority_discovery_enabled = false; - let (service, _client, _handles) = polkadot_test_new_full( + let (service, client, handles) = polkadot_test_new_full( config, None, None, @@ -192,5 +184,5 @@ pub fn run_test_node( 6000, ).unwrap(); - Ok(service) + Ok((service, client, handles, base_path)) } diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index b885596112e3..7636855f13f3 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -11,12 +11,11 @@ fn task_executor() -> Arc + Send #[async_std::test] async fn ensure_test_service_build_blocks() { - let temp = tempfile::Builder::new().prefix("polkadot-test-service").tempdir().unwrap(); let task_executor = task_executor(); - let service = run_test_node( + let (service, _client, _handles, _base_path) = run_test_node( task_executor, - &temp.path().to_path_buf(), + 27015, || { use polkadot_test_runtime::*; EpochDuration::set(&42); From 4ca5082dc29db71e9b9e8f921049b05e745fdca0 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 16 Jun 2020 15:13:22 +0200 Subject: [PATCH 24/92] format --- polkadot-test-service/src/chain_spec.rs | 80 +++++++------- polkadot-test-service/src/lib.rs | 109 +++++++++++--------- polkadot-test-service/tests/build-blocks.rs | 28 ++--- 3 files changed, 115 insertions(+), 102 deletions(-) diff --git a/polkadot-test-service/src/chain_spec.rs b/polkadot-test-service/src/chain_spec.rs index fbb60c5fa49e..a3c61d9dc276 100644 --- a/polkadot-test-service/src/chain_spec.rs +++ b/polkadot-test-service/src/chain_spec.rs @@ -1,22 +1,18 @@ -use polkadot_primitives::{parachain::{ValidatorId}, AccountId}; -use polkadot_service::{ -chain_spec::{get_account_id_from_seed, get_from_seed, Extensions}}; use babe_primitives::AuthorityId as BabeId; use grandpa::AuthorityId as GrandpaId; +use pallet_staking::Forcing; +use polkadot_primitives::{parachain::ValidatorId, AccountId}; +use polkadot_service::chain_spec::{get_account_id_from_seed, get_from_seed, Extensions}; use polkadot_test_runtime::constants::currency::DOTS; +use sc_chain_spec::ChainType; use sp_core::sr25519; -use sc_chain_spec::{ChainType}; -use sp_runtime::{Perbill}; -use pallet_staking::Forcing; +use sp_runtime::Perbill; const DEFAULT_PROTOCOL_ID: &str = "dot"; /// The `ChainSpec parametrised for polkadot runtime`. -pub type PolkadotChainSpec = service::GenericChainSpec< - polkadot_test_runtime::GenesisConfig, - Extensions, ->; - +pub type PolkadotChainSpec = + service::GenericChainSpec; /// Polkadot local testnet config (multivalidator Alice + Bob) pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { @@ -45,13 +41,9 @@ fn polkadot_local_testnet_genesis() -> polkadot_test_runtime::GenesisConfig { } /// Helper function to generate stash, controller and session key from seed -fn get_authority_keys_from_seed(seed: &str) -> ( - AccountId, - AccountId, - BabeId, - GrandpaId, - ValidatorId, -) { +fn get_authority_keys_from_seed( + seed: &str, +) -> (AccountId, AccountId, BabeId, GrandpaId, ValidatorId) { ( get_account_id_from_seed::(&format!("{}//stash", seed)), get_account_id_from_seed::(seed), @@ -96,43 +88,55 @@ fn polkadot_testnet_genesis( code: polkadot::WASM_BINARY.to_vec(), changes_trie_config: Default::default(), }), - indices: Some(polkadot::IndicesConfig { - indices: vec![], - }), + indices: Some(polkadot::IndicesConfig { indices: vec![] }), balances: Some(polkadot::BalancesConfig { - balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(), + balances: endowed_accounts + .iter() + .map(|k| (k.clone(), ENDOWMENT)) + .collect(), }), session: Some(polkadot::SessionConfig { - keys: initial_authorities.iter().map(|x| ( - x.0.clone(), - x.0.clone(), + keys: initial_authorities + .iter() + .map(|x| { + ( + x.0.clone(), + x.0.clone(), polkadot_test_runtime::SessionKeys { babe: x.2.clone(), grandpa: x.3.clone(), parachain_validator: x.4.clone(), }, - )).collect::>(), + ) + }) + .collect::>(), }), staking: Some(polkadot::StakingConfig { minimum_validator_count: 1, validator_count: 2, - stakers: initial_authorities.iter() - .map(|x| (x.0.clone(), x.1.clone(), STASH, polkadot::StakerStatus::Validator)) + stakers: initial_authorities + .iter() + .map(|x| { + ( + x.0.clone(), + x.1.clone(), + STASH, + polkadot::StakerStatus::Validator, + ) + }) .collect(), - invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), - force_era: Forcing::NotForcing, - slash_reward_fraction: Perbill::from_percent(10), - .. Default::default() + invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), + force_era: Forcing::NotForcing, + slash_reward_fraction: Perbill::from_percent(10), + ..Default::default() }), babe: Some(Default::default()), grandpa: Some(Default::default()), - authority_discovery: Some(polkadot::AuthorityDiscoveryConfig { - keys: vec![], - }), + authority_discovery: Some(polkadot::AuthorityDiscoveryConfig { keys: vec![] }), parachains: Some(polkadot::ParachainsConfig { authorities: vec![], }), - registrar: Some(polkadot::RegistrarConfig{ + registrar: Some(polkadot::RegistrarConfig { parachains: vec![], _phdata: Default::default(), }), @@ -140,9 +144,7 @@ fn polkadot_testnet_genesis( claims: vec![], vesting: vec![], }), - vesting: Some(polkadot::VestingConfig { - vesting: vec![], - }), + vesting: Some(polkadot::VestingConfig { vesting: vec![] }), // TODO: it should have one? /* sudo: Some(polkadot::SudoConfig { diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 65db23be481f..3ab060d08189 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -18,28 +18,36 @@ mod chain_spec; -use std::sync::Arc; -use std::time::Duration; -use polkadot_primitives::{parachain::{self}, Hash, BlockId}; -use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; -use service::{error::Error as ServiceError, TaskType, config::{KeystoreConfig, DatabaseConfig, -WasmExecutionMethod}}; -use grandpa::{FinalityProofProvider as GrandpaFinalityProofProvider}; +pub use chain_spec::*; +use consensus_common::{block_validation::Chain, SelectChain}; +use grandpa::FinalityProofProvider as GrandpaFinalityProofProvider; use log::info; -use service::{AbstractService, Role, TFullBackend, Configuration}; -use sc_network::{config::{NetworkConfiguration, TransportConfig}, multiaddr}; -use consensus_common::{SelectChain, block_validation::Chain}; -use polkadot_primitives::parachain::{CollatorId}; +use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; +use polkadot_primitives::parachain::CollatorId; use polkadot_primitives::Block; +use polkadot_primitives::{ + parachain::{self}, + BlockId, Hash, +}; use polkadot_service::PolkadotClient; -use polkadot_service::{new_full, new_full_start, FullNodeHandles, PolkadotExecutor, +use polkadot_service::{new_full, new_full_start, FullNodeHandles, PolkadotExecutor}; +use sc_chain_spec::ChainSpec; +use sc_network::{ + config::{NetworkConfiguration, TransportConfig}, + multiaddr, }; -use std::path::{Path}; -use std::pin::Pin; -use std::net::Ipv4Addr; -use sc_chain_spec::{ChainSpec}; +use service::{ + config::{DatabaseConfig, KeystoreConfig, WasmExecutionMethod}, + error::Error as ServiceError, + TaskType, +}; +use service::{AbstractService, Configuration, Role, TFullBackend}; use sp_state_machine::BasicExternalities; -pub use chain_spec::*; +use std::net::Ipv4Addr; +use std::path::Path; +use std::pin::Pin; +use std::sync::Arc; +use std::time::Duration; /// Create a new Polkadot test service for a full node. pub fn polkadot_test_new_full( @@ -48,17 +56,14 @@ pub fn polkadot_test_new_full( max_block_data_size: Option, authority_discovery_enabled: bool, slot_duration: u64, -) - -> Result<( +) -> Result< + ( impl AbstractService, - Arc, - polkadot_test_runtime::RuntimeApi - >>, + Arc, polkadot_test_runtime::RuntimeApi>>, FullNodeHandles, - ), ServiceError> -{ + ), + ServiceError, +> { let (service, client, handles) = new_full!(test config, collating_for, @@ -75,12 +80,13 @@ pub fn polkadot_test_new_full( fn node_config>( spec: &PolkadotChainSpec, role: Role, - task_executor: Arc + Send>>, TaskType) + Send + Sync>, + task_executor: Arc< + dyn Fn(Pin + Send>>, TaskType) + Send + Sync, + >, key_seed: Option, port: u16, root: P, -) -> Configuration -{ +) -> Configuration { let root = root.as_ref().to_path_buf(); let mut network_config = NetworkConfiguration::new( format!("Polkadot Test Node on {}", port), @@ -94,7 +100,7 @@ fn node_config>( network_config.listen_addresses.push( std::iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1))) .chain(std::iter::once(multiaddr::Protocol::Tcp(port))) - .collect() + .collect(), ); network_config.transport = TransportConfig::Normal { @@ -113,7 +119,7 @@ fn node_config>( network: network_config, keystore: KeystoreConfig::Path { path: root.join("key"), - password: None + password: None, }, database: DatabaseConfig::RocksDb { path: root.join("db"), @@ -147,42 +153,45 @@ fn node_config>( } pub fn run_test_node( - task_executor: Arc + Send>>, TaskType) + Send + Sync>, + task_executor: Arc< + dyn Fn(Pin + Send>>, TaskType) + Send + Sync, + >, port: u16, storage_update_func: impl Fn(), -) -> Result<(impl AbstractService, Arc, - polkadot_test_runtime::RuntimeApi - >>, FullNodeHandles, tempfile::TempDir), ()> { - let base_path = tempfile::Builder::new().prefix("polkadot-test-service").tempdir().unwrap(); +) -> Result< + ( + impl AbstractService, + Arc, polkadot_test_runtime::RuntimeApi>>, + FullNodeHandles, + tempfile::TempDir, + ), + (), +> { + let base_path = tempfile::Builder::new() + .prefix("polkadot-test-service") + .tempdir() + .unwrap(); let mut spec = polkadot_local_testnet_config(); let mut storage = spec.as_storage_builder().build_storage().unwrap(); - BasicExternalities::execute_with_storage( - &mut storage, - storage_update_func, - ); + BasicExternalities::execute_with_storage(&mut storage, storage_update_func); spec.set_storage(storage); let key = String::new(); let config = node_config( &spec, - Role::Authority { sentry_nodes: Vec::new() }, + Role::Authority { + sentry_nodes: Vec::new(), + }, task_executor, Some(key), port, &base_path, ); let authority_discovery_enabled = false; - let (service, client, handles) = polkadot_test_new_full( - config, - None, - None, - authority_discovery_enabled, - 6000, - ).unwrap(); + let (service, client, handles) = + polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000).unwrap(); Ok((service, client, handles, base_path)) } diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 7636855f13f3..e0358c13c149 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -1,27 +1,29 @@ +use futures::{pin_mut, select, FutureExt as _}; use polkadot_test_service::*; +use service::TaskType; use std::pin::Pin; use std::sync::Arc; -use futures::{FutureExt as _, select, pin_mut}; use std::time::Duration; -use service::TaskType; -fn task_executor() -> Arc + Send>>, TaskType) + Send + Sync> { - Arc::new(move |fut: Pin + Send>>, _| { async_std::task::spawn(fut.unit_error()); }) +fn task_executor( +) -> Arc + Send>>, TaskType) + Send + Sync> { + Arc::new( + move |fut: Pin + Send>>, _| { + async_std::task::spawn(fut.unit_error()); + }, + ) } #[async_std::test] async fn ensure_test_service_build_blocks() { let task_executor = task_executor(); - let (service, _client, _handles, _base_path) = run_test_node( - task_executor, - 27015, - || { - use polkadot_test_runtime::*; - EpochDuration::set(&42); - //panic!("{:?}", EpochDuration::get()); - }, - ).unwrap(); + let (service, _client, _handles, _base_path) = run_test_node(task_executor, 27015, || { + use polkadot_test_runtime::*; + EpochDuration::set(&42); + //panic!("{:?}", EpochDuration::get()); + }) + .unwrap(); let t1 = service.fuse(); let t2 = async_std::task::sleep(Duration::from_secs(10)).fuse(); From f67af134452debba163e2c3a78f6eb90a939a44f Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 17 Jun 2020 17:44:37 +0200 Subject: [PATCH 25/92] WIP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 3 +++ polkadot-test-service/Cargo.toml | 5 +++- polkadot-test-service/src/lib.rs | 16 ++++++++--- polkadot-test-service/tests/build-blocks.rs | 30 ++++++++++++++++----- runtime/test-runtime/src/constants.rs | 2 +- runtime/test-runtime/src/lib.rs | 3 ++- 6 files changed, 45 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c153a18bd394..00f7f341972c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4689,6 +4689,7 @@ name = "polkadot-test-service" version = "0.8.2" dependencies = [ "async-std", + "frame-benchmarking", "futures 0.3.5", "log 0.4.8", "pallet-staking", @@ -4701,9 +4702,11 @@ dependencies = [ "polkadot-validation", "sc-authority-discovery", "sc-chain-spec", + "sc-cli", "sc-client-api", "sc-consensus", "sc-consensus-babe", + "sc-executor", "sc-finality-grandpa", "sc-network", "sc-service", diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index dfa51c69eb08..33eb3dd0bfeb 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -7,6 +7,7 @@ edition = "2018" [dependencies] log = "0.4.8" futures = "0.3.4" +tempfile = "3.1.0" av_store = { package = "polkadot-availability-store", path = "../availability-store" } consensus = { package = "polkadot-validation", path = "../validation" } polkadot-primitives = { path = "../primitives" } @@ -31,7 +32,9 @@ babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/par sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } -tempfile = "3.1.0" +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] async-std = { version = "1.2.0", features = [ "attributes" ] } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 3ab060d08189..1bcfa8b50f94 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -30,7 +30,7 @@ use polkadot_primitives::{ BlockId, Hash, }; use polkadot_service::PolkadotClient; -use polkadot_service::{new_full, new_full_start, FullNodeHandles, PolkadotExecutor}; +use polkadot_service::{new_full, new_full_start, FullNodeHandles}; use sc_chain_spec::ChainSpec; use sc_network::{ config::{NetworkConfiguration, TransportConfig}, @@ -48,6 +48,14 @@ use std::path::Path; use std::pin::Pin; use std::sync::Arc; use std::time::Duration; +use sc_executor::native_executor_instance; + +native_executor_instance!( + pub PolkadotTestExecutor, + polkadot_test_runtime::api::dispatch, + polkadot_test_runtime::native_version, + frame_benchmarking::benchmarking::HostFunctions, +); /// Create a new Polkadot test service for a full node. pub fn polkadot_test_new_full( @@ -71,7 +79,7 @@ pub fn polkadot_test_new_full( authority_discovery_enabled, slot_duration, polkadot_test_runtime::RuntimeApi, - PolkadotExecutor, + PolkadotTestExecutor, ); Ok((service, client, handles)) @@ -157,6 +165,7 @@ pub fn run_test_node( dyn Fn(Pin + Send>>, TaskType) + Send + Sync, >, port: u16, + key: &str, storage_update_func: impl Fn(), ) -> Result< ( @@ -178,14 +187,13 @@ pub fn run_test_node( spec.set_storage(storage); - let key = String::new(); let config = node_config( &spec, Role::Authority { sentry_nodes: Vec::new(), }, task_executor, - Some(key), + Some(format!("//{}", key)), port, &base_path, ); diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index e0358c13c149..56804a1a3e12 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -16,23 +16,39 @@ fn task_executor( #[async_std::test] async fn ensure_test_service_build_blocks() { - let task_executor = task_executor(); + sc_cli::init_logger(""); + let (service_alice, _client_alice, _handles_alice, _base_path_alice) = run_test_node(task_executor(), 27015, "alice", || { + use polkadot_test_runtime::*; + //EpochDuration::set(&42); + //ExpectedBlockTime::set(&6000); + //panic!("{:?}", ExpectedBlockTime::get()); + //panic!("{:?}", MinimumPeriod::get()); + SlotDuration::set(&2000); + //MinimumPeriod::set(&1000); + }) + .unwrap(); - let (service, _client, _handles, _base_path) = run_test_node(task_executor, 27015, || { + let (service_bob, _client_bob, _handles_bob, _base_path_bob) = run_test_node(task_executor(), 27016, "bob", || { use polkadot_test_runtime::*; - EpochDuration::set(&42); - //panic!("{:?}", EpochDuration::get()); + //EpochDuration::set(&42); + //ExpectedBlockTime::set(&6000); + //panic!("{:?}", ExpectedBlockTime::get()); + //panic!("{:?}", MinimumPeriod::get()); + SlotDuration::set(&2000); + //MinimumPeriod::set(&1000); }) .unwrap(); - let t1 = service.fuse(); - let t2 = async_std::task::sleep(Duration::from_secs(10)).fuse(); + let t1 = service_alice.fuse(); + let t2 = service_bob.fuse(); + let t3 = async_std::task::sleep(Duration::from_secs(20)).fuse(); - pin_mut!(t1, t2); + pin_mut!(t1, t2, t3); select! { _ = t1 => {}, _ = t2 => {}, + _ = t3 => {}, } assert!(false); diff --git a/runtime/test-runtime/src/constants.rs b/runtime/test-runtime/src/constants.rs index b0431e55f268..7109bde1e959 100644 --- a/runtime/test-runtime/src/constants.rs +++ b/runtime/test-runtime/src/constants.rs @@ -29,7 +29,7 @@ pub mod time { use primitives::{Moment, BlockNumber}; // Testnet pub const MILLISECS_PER_BLOCK: Moment = 1000; - pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK; + pub const SLOT_DURATION: Moment = 3000; // Testnet pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES; diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index a88ff15de3f5..f2dbb4aad231 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -213,7 +213,8 @@ impl transaction_payment::Trait for Runtime { } parameter_types! { - pub storage MinimumPeriod: u64 = 0; + pub storage SlotDuration: u64 = SLOT_DURATION; + pub storage MinimumPeriod: u64 = SlotDuration::get() / 2; } impl timestamp::Trait for Runtime { type Moment = u64; From 5ae17942582eca17db2b6d751d346ab16ad14f73 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 17 Jun 2020 17:54:23 +0200 Subject: [PATCH 26/92] WIP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- polkadot-test-service/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 1bcfa8b50f94..34ac240c66a3 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -112,7 +112,7 @@ fn node_config>( ); network_config.transport = TransportConfig::Normal { - enable_mdns: false, + enable_mdns: true, // TODO: keep it that way or disable it? allow_private_ipv4: true, wasm_external_transport: None, use_yamux_flow_control: true, From 0061afe648a6b2028828863be1d4257d771956e6 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 18 Jun 2020 13:13:10 +0200 Subject: [PATCH 27/92] WIP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 1 + polkadot-test-service/Cargo.toml | 1 + polkadot-test-service/src/lib.rs | 5 +- polkadot-test-service/tests/build-blocks.rs | 51 +++++++++++++-------- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 00f7f341972c..a1bcbf051c5b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4716,6 +4716,7 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-inherents", + "sp-keyring", "sp-runtime", "sp-state-machine", "tempfile", diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 33eb3dd0bfeb..01fc2447eac0 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -34,6 +34,7 @@ pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "ma sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] async-std = { version = "1.2.0", features = [ "attributes" ] } diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 34ac240c66a3..6a2ecd693f44 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -49,6 +49,7 @@ use std::pin::Pin; use std::sync::Arc; use std::time::Duration; use sc_executor::native_executor_instance; +use sp_keyring::Sr25519Keyring; native_executor_instance!( pub PolkadotTestExecutor, @@ -165,7 +166,7 @@ pub fn run_test_node( dyn Fn(Pin + Send>>, TaskType) + Send + Sync, >, port: u16, - key: &str, + key: Sr25519Keyring, storage_update_func: impl Fn(), ) -> Result< ( @@ -193,7 +194,7 @@ pub fn run_test_node( sentry_nodes: Vec::new(), }, task_executor, - Some(format!("//{}", key)), + Some(key.to_seed()), port, &base_path, ); diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 56804a1a3e12..2c8f9d577baf 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -1,9 +1,11 @@ -use futures::{pin_mut, select, FutureExt as _}; +use futures::{future, pin_mut, select, FutureExt as _, StreamExt}; use polkadot_test_service::*; use service::TaskType; use std::pin::Pin; use std::sync::Arc; -use std::time::Duration; +use sp_keyring::Sr25519Keyring; +use sc_client_api::client::BlockchainEvents; +use std::collections::HashSet; fn task_executor( ) -> Arc + Send>>, TaskType) + Send + Sync> { @@ -17,39 +19,50 @@ fn task_executor( #[async_std::test] async fn ensure_test_service_build_blocks() { sc_cli::init_logger(""); - let (service_alice, _client_alice, _handles_alice, _base_path_alice) = run_test_node(task_executor(), 27015, "alice", || { + let (service_alice, client_alice, _handles_alice, _base_path_alice) = run_test_node(task_executor(), 27015, Sr25519Keyring::Alice, || { use polkadot_test_runtime::*; - //EpochDuration::set(&42); - //ExpectedBlockTime::set(&6000); - //panic!("{:?}", ExpectedBlockTime::get()); - //panic!("{:?}", MinimumPeriod::get()); SlotDuration::set(&2000); - //MinimumPeriod::set(&1000); }) .unwrap(); - let (service_bob, _client_bob, _handles_bob, _base_path_bob) = run_test_node(task_executor(), 27016, "bob", || { + let (service_bob, client_bob, _handles_bob, _base_path_bob) = run_test_node(task_executor(), 27016, Sr25519Keyring::Bob, || { use polkadot_test_runtime::*; - //EpochDuration::set(&42); - //ExpectedBlockTime::set(&6000); - //panic!("{:?}", ExpectedBlockTime::get()); - //panic!("{:?}", MinimumPeriod::get()); SlotDuration::set(&2000); - //MinimumPeriod::set(&1000); }) .unwrap(); let t1 = service_alice.fuse(); let t2 = service_bob.fuse(); - let t3 = async_std::task::sleep(Duration::from_secs(20)).fuse(); + let t3 = future::join( + async move { + let mut import_notification_stream = client_alice.import_notification_stream(); + let mut blocks = HashSet::new(); + + while let Some(notification) = import_notification_stream.next().await { + blocks.insert(notification.hash); + if blocks.len() == 3 { + break; + } + } + }, + async move { + let mut import_notification_stream = client_bob.import_notification_stream(); + let mut blocks = HashSet::new(); + + while let Some(notification) = import_notification_stream.next().await { + blocks.insert(notification.hash); + if blocks.len() == 3 { + break; + } + } + }, + ).fuse(); pin_mut!(t1, t2, t3); select! { - _ = t1 => {}, - _ = t2 => {}, + _ = t1 => panic!("service Alice failed"), + _ = t2 => panic!("service Bob failed"), _ = t3 => {}, } - - assert!(false); } From 2fd2d7186add1e4b37bfbd83536268b78d412d60 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 18 Jun 2020 18:23:35 +0200 Subject: [PATCH 28/92] WIP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 273 ++++++++++---------- polkadot-test-service/Cargo.toml | 1 + polkadot-test-service/src/lib.rs | 14 +- polkadot-test-service/tests/build-blocks.rs | 70 +++-- 4 files changed, 190 insertions(+), 168 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a1bcbf051c5b..8a975ba745d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1182,7 +1182,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", ] @@ -1190,7 +1190,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -1207,7 +1207,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1225,7 +1225,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -1240,7 +1240,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "serde", @@ -1251,7 +1251,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "bitmask", "frame-metadata", @@ -1276,7 +1276,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.17", @@ -1287,7 +1287,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1299,7 +1299,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.6", @@ -1309,7 +1309,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1325,7 +1325,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -1339,7 +1339,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "sp-api", @@ -3241,7 +3241,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3257,7 +3257,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3272,7 +3272,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3294,7 +3294,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3308,7 +3308,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3324,7 +3324,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3339,7 +3339,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3354,7 +3354,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3370,7 +3370,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3390,7 +3390,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3406,7 +3406,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3426,7 +3426,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3442,7 +3442,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3456,7 +3456,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3471,7 +3471,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3485,7 +3485,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3500,7 +3500,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3521,7 +3521,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3536,7 +3536,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3549,7 +3549,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "enumflags2", "frame-support", @@ -3564,7 +3564,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3579,7 +3579,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3597,7 +3597,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3611,7 +3611,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3625,7 +3625,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3647,7 +3647,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.17", @@ -3658,7 +3658,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3672,7 +3672,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3690,7 +3690,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "frame-system", @@ -3704,7 +3704,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3722,7 +3722,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-support", "parity-scale-codec", @@ -3735,7 +3735,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3750,7 +3750,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-benchmarking", "frame-support", @@ -3766,7 +3766,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4700,6 +4700,7 @@ dependencies = [ "polkadot-service", "polkadot-test-runtime", "polkadot-validation", + "rand 0.7.3", "sc-authority-discovery", "sc-chain-spec", "sc-cli", @@ -5492,7 +5493,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "bytes 0.5.4", "derive_more 0.99.7", @@ -5519,7 +5520,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5543,7 +5544,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5559,7 +5560,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5575,7 +5576,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.17", @@ -5586,7 +5587,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5626,7 +5627,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "fnv", @@ -5662,7 +5663,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "blake2-rfc", "hash-db", @@ -5691,7 +5692,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5702,7 +5703,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "fork-tree", @@ -5744,7 +5745,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -5767,7 +5768,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5780,7 +5781,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5802,7 +5803,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "log 0.4.8", "sc-client-api", @@ -5816,7 +5817,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "lazy_static", @@ -5844,7 +5845,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -5861,7 +5862,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5876,7 +5877,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -5897,7 +5898,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "assert_matches", "derive_more 0.99.7", @@ -5935,7 +5936,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "finality-grandpa", @@ -5952,7 +5953,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -5970,7 +5971,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "hex", @@ -5985,7 +5986,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "hash-db", "lazy_static", @@ -6004,7 +6005,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "bitflags", "bs58", @@ -6056,7 +6057,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6071,7 +6072,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "env_logger", "futures 0.3.5", @@ -6098,7 +6099,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "bytes 0.5.4", "fnv", @@ -6125,7 +6126,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "futures 0.3.5", "libp2p", @@ -6138,7 +6139,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6147,7 +6148,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "futures 0.3.5", "hash-db", @@ -6179,7 +6180,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6203,7 +6204,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6218,7 +6219,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "directories", @@ -6281,7 +6282,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6295,7 +6296,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "bytes 0.5.4", "futures 0.3.5", @@ -6317,7 +6318,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "erased-serde", "log 0.4.8", @@ -6332,7 +6333,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6352,7 +6353,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6739,7 +6740,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -6751,7 +6752,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "hash-db", "parity-scale-codec", @@ -6766,7 +6767,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6778,7 +6779,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "serde", @@ -6790,7 +6791,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "integer-sqrt", "num-traits 0.2.11", @@ -6803,7 +6804,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "sp-api", @@ -6815,7 +6816,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6826,7 +6827,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "sp-api", @@ -6838,7 +6839,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -6854,7 +6855,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "serde", "serde_json", @@ -6863,7 +6864,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6886,7 +6887,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "sp-api", @@ -6900,7 +6901,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "merlin", "parity-scale-codec", @@ -6917,7 +6918,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6929,7 +6930,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "base58", "blake2-rfc", @@ -6971,7 +6972,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -6980,7 +6981,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.6", @@ -6990,7 +6991,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "environmental", "parity-scale-codec", @@ -7001,7 +7002,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7017,7 +7018,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7027,7 +7028,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "parity-scale-codec", @@ -7039,7 +7040,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "futures 0.3.5", "hash-db", @@ -7059,7 +7060,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "lazy_static", "sp-core", @@ -7070,7 +7071,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "serde", @@ -7082,7 +7083,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.17", @@ -7093,7 +7094,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "sp-api", "sp-core", @@ -7103,7 +7104,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "backtrace", "log 0.4.8", @@ -7112,7 +7113,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "serde", "sp-core", @@ -7121,7 +7122,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "either", "hash256-std-hasher", @@ -7143,7 +7144,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7158,7 +7159,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "Inflector", "proc-macro-crate", @@ -7170,7 +7171,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "serde", "serde_json", @@ -7179,7 +7180,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "sp-api", @@ -7192,7 +7193,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7202,7 +7203,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "hash-db", "log 0.4.8", @@ -7221,12 +7222,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" [[package]] name = "sp-storage" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7238,7 +7239,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7252,7 +7253,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "tracing", ] @@ -7260,7 +7261,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -7276,7 +7277,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "hash-db", "memory-db", @@ -7290,7 +7291,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "futures 0.3.5", "futures-core", @@ -7301,7 +7302,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7313,7 +7314,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7444,7 +7445,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "chrono", "clear_on_drop", @@ -7471,7 +7472,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "platforms", ] @@ -7479,7 +7480,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7500,7 +7501,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "async-std", "derive_more 0.99.7", @@ -7514,7 +7515,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "futures 0.3.5", "hash-db", @@ -7536,7 +7537,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "cfg-if", "frame-executive", @@ -7576,7 +7577,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7597,7 +7598,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" +source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" [[package]] name = "substrate-wasm-builder-runner" diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 01fc2447eac0..4d7d6f08d8f8 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -8,6 +8,7 @@ edition = "2018" log = "0.4.8" futures = "0.3.4" tempfile = "3.1.0" +rand = "0.7.3" av_store = { package = "polkadot-availability-store", path = "../availability-store" } consensus = { package = "polkadot-validation", path = "../validation" } polkadot-primitives = { path = "../primitives" } diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 6a2ecd693f44..b77d9bfe0bfa 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -37,7 +37,7 @@ use sc_network::{ multiaddr, }; use service::{ - config::{DatabaseConfig, KeystoreConfig, WasmExecutionMethod}, + config::{DatabaseConfig, MultiaddrWithPeerId, KeystoreConfig, WasmExecutionMethod}, error::Error as ServiceError, TaskType, }; @@ -95,6 +95,7 @@ fn node_config>( key_seed: Option, port: u16, root: P, + boot_nodes: Vec, ) -> Configuration { let root = root.as_ref().to_path_buf(); let mut network_config = NetworkConfiguration::new( @@ -104,6 +105,8 @@ fn node_config>( None, ); + network_config.boot_nodes = boot_nodes; + network_config.allow_non_globals_in_dht = true; network_config.listen_addresses.push( @@ -113,7 +116,7 @@ fn node_config>( ); network_config.transport = TransportConfig::Normal { - enable_mdns: true, // TODO: keep it that way or disable it? + enable_mdns: false, allow_private_ipv4: true, wasm_external_transport: None, use_yamux_flow_control: true, @@ -161,13 +164,13 @@ fn node_config>( } } -pub fn run_test_node( +pub async fn run_test_node( task_executor: Arc< dyn Fn(Pin + Send>>, TaskType) + Send + Sync, >, - port: u16, key: Sr25519Keyring, storage_update_func: impl Fn(), + boot_nodes: Vec, ) -> Result< ( impl AbstractService, @@ -195,8 +198,9 @@ pub fn run_test_node( }, task_executor, Some(key.to_seed()), - port, + 0, &base_path, + boot_nodes, ); let authority_discovery_enabled = false; let (service, client, handles) = diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 2c8f9d577baf..be5ff6ab3259 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -1,11 +1,12 @@ use futures::{future, pin_mut, select, FutureExt as _, StreamExt}; use polkadot_test_service::*; -use service::TaskType; +use service::{AbstractService, TaskType, config::MultiaddrWithPeerId}; use std::pin::Pin; use std::sync::Arc; use sp_keyring::Sr25519Keyring; use sc_client_api::client::BlockchainEvents; use std::collections::HashSet; +use polkadot_primitives::Block as RelayBlock; fn task_executor( ) -> Arc + Send>>, TaskType) + Send + Sync> { @@ -18,24 +19,9 @@ fn task_executor( #[async_std::test] async fn ensure_test_service_build_blocks() { - sc_cli::init_logger(""); - let (service_alice, client_alice, _handles_alice, _base_path_alice) = run_test_node(task_executor(), 27015, Sr25519Keyring::Alice, || { - use polkadot_test_runtime::*; - SlotDuration::set(&2000); - }) - .unwrap(); - - let (service_bob, client_bob, _handles_bob, _base_path_bob) = run_test_node(task_executor(), 27016, Sr25519Keyring::Bob, || { - use polkadot_test_runtime::*; - SlotDuration::set(&2000); - }) - .unwrap(); - - let t1 = service_alice.fuse(); - let t2 = service_bob.fuse(); - let t3 = future::join( + let ensure_blocks_created = |client: Arc>| { async move { - let mut import_notification_stream = client_alice.import_notification_stream(); + let mut import_notification_stream = client.import_notification_stream(); let mut blocks = HashSet::new(); while let Some(notification) = import_notification_stream.next().await { @@ -44,18 +30,48 @@ async fn ensure_test_service_build_blocks() { break; } } + } + }; + + sc_cli::init_logger(""); + let (service_alice, client_alice, _handles_alice, _base_path_alice) = run_test_node( + task_executor(), + Sr25519Keyring::Alice, + || { + use polkadot_test_runtime::*; + SlotDuration::set(&2000); }, - async move { - let mut import_notification_stream = client_bob.import_notification_stream(); - let mut blocks = HashSet::new(); + Vec::new(), + ) + .await + .unwrap(); - while let Some(notification) = import_notification_stream.next().await { - blocks.insert(notification.hash); - if blocks.len() == 3 { - break; - } - } + let (service_bob, client_bob, _handles_bob, _base_path_bob) = run_test_node( + task_executor(), + Sr25519Keyring::Bob, + || { + use polkadot_test_runtime::*; + SlotDuration::set(&2000); }, + vec![ + { + let network = service_alice.network(); + + MultiaddrWithPeerId { + multiaddr: network.listen_addresses().await.remove(0), + peer_id: network.local_peer_id().clone(), + } + }, + ], + ) + .await + .unwrap(); + + let t1 = service_alice.fuse(); + let t2 = service_bob.fuse(); + let t3 = future::join( + ensure_blocks_created(client_alice), + ensure_blocks_created(client_bob), ).fuse(); pin_mut!(t1, t2, t3); From 899505d1b4dd60200acc072581c0ac8eaa4ba57b Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 18 Jun 2020 18:24:10 +0200 Subject: [PATCH 29/92] use memory --- polkadot-test-service/src/lib.rs | 21 ++++++++++++++------- polkadot-test-service/tests/build-blocks.rs | 15 +++------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index b77d9bfe0bfa..ac7c76712c59 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -33,8 +33,8 @@ use polkadot_service::PolkadotClient; use polkadot_service::{new_full, new_full_start, FullNodeHandles}; use sc_chain_spec::ChainSpec; use sc_network::{ - config::{NetworkConfiguration, TransportConfig}, - multiaddr, + config::{NetworkConfiguration, TransportConfig, NodeKeyConfig, Secret}, + multiaddr, PeerId, }; use service::{ config::{DatabaseConfig, MultiaddrWithPeerId, KeystoreConfig, WasmExecutionMethod}, @@ -98,6 +98,7 @@ fn node_config>( boot_nodes: Vec, ) -> Configuration { let root = root.as_ref().to_path_buf(); + let mut network_config = NetworkConfiguration::new( format!("Polkadot Test Node on {}", port), "network/test/0.1", @@ -110,9 +111,7 @@ fn node_config>( network_config.allow_non_globals_in_dht = true; network_config.listen_addresses.push( - std::iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1))) - .chain(std::iter::once(multiaddr::Protocol::Tcp(port))) - .collect(), + multiaddr::Protocol::Memory(rand::random()).into(), ); network_config.transport = TransportConfig::Normal { @@ -164,7 +163,7 @@ fn node_config>( } } -pub async fn run_test_node( +pub fn run_test_node( task_executor: Arc< dyn Fn(Pin + Send>>, TaskType) + Send + Sync, >, @@ -176,6 +175,7 @@ pub async fn run_test_node( impl AbstractService, Arc, polkadot_test_runtime::RuntimeApi>>, FullNodeHandles, + MultiaddrWithPeerId, tempfile::TempDir, ), (), @@ -202,9 +202,16 @@ pub async fn run_test_node( &base_path, boot_nodes, ); + let multiaddr = config.network.listen_addresses[0].clone(); let authority_discovery_enabled = false; let (service, client, handles) = polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000).unwrap(); - Ok((service, client, handles, base_path)) + let peer_id = service.network().local_peer_id().clone(); + let multiaddr_with_peer_id = MultiaddrWithPeerId { + multiaddr, + peer_id + }; + + Ok((service, client, handles, multiaddr_with_peer_id, base_path)) } diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index be5ff6ab3259..301defd075b1 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -34,7 +34,7 @@ async fn ensure_test_service_build_blocks() { }; sc_cli::init_logger(""); - let (service_alice, client_alice, _handles_alice, _base_path_alice) = run_test_node( + let (service_alice, client_alice, _handles_alice, alice_boot_node, _base_path_alice) = run_test_node( task_executor(), Sr25519Keyring::Alice, || { @@ -43,10 +43,9 @@ async fn ensure_test_service_build_blocks() { }, Vec::new(), ) - .await .unwrap(); - let (service_bob, client_bob, _handles_bob, _base_path_bob) = run_test_node( + let (service_bob, client_bob, _handles_bob, _bob_boot_node, _base_path_bob) = run_test_node( task_executor(), Sr25519Keyring::Bob, || { @@ -54,17 +53,9 @@ async fn ensure_test_service_build_blocks() { SlotDuration::set(&2000); }, vec![ - { - let network = service_alice.network(); - - MultiaddrWithPeerId { - multiaddr: network.listen_addresses().await.remove(0), - peer_id: network.local_peer_id().clone(), - } - }, + alice_boot_node, ], ) - .await .unwrap(); let t1 = service_alice.fuse(); From 25eb9247da158b99f5d3f050497cd21702e83cf8 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 19 Jun 2020 10:42:19 +0200 Subject: [PATCH 30/92] fixing last commit --- polkadot-test-service/src/lib.rs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index ac7c76712c59..e238211851f2 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -33,8 +33,8 @@ use polkadot_service::PolkadotClient; use polkadot_service::{new_full, new_full_start, FullNodeHandles}; use sc_chain_spec::ChainSpec; use sc_network::{ - config::{NetworkConfiguration, TransportConfig, NodeKeyConfig, Secret}, - multiaddr, PeerId, + config::{NetworkConfiguration, TransportConfig}, + multiaddr, }; use service::{ config::{DatabaseConfig, MultiaddrWithPeerId, KeystoreConfig, WasmExecutionMethod}, @@ -43,7 +43,6 @@ use service::{ }; use service::{AbstractService, Configuration, Role, TFullBackend}; use sp_state_machine::BasicExternalities; -use std::net::Ipv4Addr; use std::path::Path; use std::pin::Pin; use std::sync::Arc; @@ -114,12 +113,7 @@ fn node_config>( multiaddr::Protocol::Memory(rand::random()).into(), ); - network_config.transport = TransportConfig::Normal { - enable_mdns: false, - allow_private_ipv4: true, - wasm_external_transport: None, - use_yamux_flow_control: true, - }; + network_config.transport = TransportConfig::MemoryOnly; Configuration { impl_name: "polkadot-test-node", From 780fbdfc0bd2a388c1b90b2e488a406d5b88f80a Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 19 Jun 2020 12:05:45 +0200 Subject: [PATCH 31/92] WIP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- polkadot-test-service/src/lib.rs | 60 ++++++++++++++++----- polkadot-test-service/tests/build-blocks.rs | 44 +++++---------- 2 files changed, 60 insertions(+), 44 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index e238211851f2..aff6fb75cbb5 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -49,6 +49,9 @@ use std::sync::Arc; use std::time::Duration; use sc_executor::native_executor_instance; use sp_keyring::Sr25519Keyring; +use std::collections::HashSet; +use sc_client_api::BlockchainEvents; +use futures::{future::Future, StreamExt}; native_executor_instance!( pub PolkadotTestExecutor, @@ -165,22 +168,15 @@ pub fn run_test_node( storage_update_func: impl Fn(), boot_nodes: Vec, ) -> Result< - ( - impl AbstractService, - Arc, polkadot_test_runtime::RuntimeApi>>, - FullNodeHandles, - MultiaddrWithPeerId, - tempfile::TempDir, - ), - (), + PolkadotTestNode, polkadot_test_runtime::RuntimeApi>>, + ServiceError, > { let base_path = tempfile::Builder::new() .prefix("polkadot-test-service") - .tempdir() - .unwrap(); + .tempdir()?; let mut spec = polkadot_local_testnet_config(); - let mut storage = spec.as_storage_builder().build_storage().unwrap(); + let mut storage = spec.as_storage_builder().build_storage()?; BasicExternalities::execute_with_storage(&mut storage, storage_update_func); spec.set_storage(storage); @@ -199,7 +195,7 @@ pub fn run_test_node( let multiaddr = config.network.listen_addresses[0].clone(); let authority_discovery_enabled = false; let (service, client, handles) = - polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000).unwrap(); + polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000)?; let peer_id = service.network().local_peer_id().clone(); let multiaddr_with_peer_id = MultiaddrWithPeerId { @@ -207,5 +203,43 @@ pub fn run_test_node( peer_id }; - Ok((service, client, handles, multiaddr_with_peer_id, base_path)) + let node = PolkadotTestNode { + service, + client, + handles, + multiaddr_with_peer_id, + base_path, + }; + + Ok(node) +} + +pub struct PolkadotTestNode { + pub service: S, + pub client: Arc, + pub handles: FullNodeHandles, + pub multiaddr_with_peer_id: MultiaddrWithPeerId, + pub base_path: tempfile::TempDir, +} + +impl PolkadotTestNode +where + C: BlockchainEvents, +{ + pub fn wait_for_blocks(&self, count: usize) -> impl Future { + assert_ne!(count, 0, "'count' argument must be greater than 1"); + let client = self.client.clone(); + + async move { + let mut import_notification_stream = client.import_notification_stream(); + let mut blocks = HashSet::new(); + + while let Some(notification) = import_notification_stream.next().await { + blocks.insert(notification.hash); + if blocks.len() == 3 { + break; + } + } + } + } } diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 301defd075b1..9b6565277d36 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -1,15 +1,11 @@ -use futures::{future, pin_mut, select, FutureExt as _, StreamExt}; +use futures::{future, pin_mut, select, FutureExt as _}; use polkadot_test_service::*; -use service::{AbstractService, TaskType, config::MultiaddrWithPeerId}; use std::pin::Pin; use std::sync::Arc; use sp_keyring::Sr25519Keyring; -use sc_client_api::client::BlockchainEvents; -use std::collections::HashSet; -use polkadot_primitives::Block as RelayBlock; fn task_executor( -) -> Arc + Send>>, TaskType) + Send + Sync> { +) -> Arc + Send>>, service::TaskType) + Send + Sync> { Arc::new( move |fut: Pin + Send>>, _| { async_std::task::spawn(fut.unit_error()); @@ -19,22 +15,8 @@ fn task_executor( #[async_std::test] async fn ensure_test_service_build_blocks() { - let ensure_blocks_created = |client: Arc>| { - async move { - let mut import_notification_stream = client.import_notification_stream(); - let mut blocks = HashSet::new(); - - while let Some(notification) = import_notification_stream.next().await { - blocks.insert(notification.hash); - if blocks.len() == 3 { - break; - } - } - } - }; - sc_cli::init_logger(""); - let (service_alice, client_alice, _handles_alice, alice_boot_node, _base_path_alice) = run_test_node( + let alice = run_test_node( task_executor(), Sr25519Keyring::Alice, || { @@ -45,7 +27,7 @@ async fn ensure_test_service_build_blocks() { ) .unwrap(); - let (service_bob, client_bob, _handles_bob, _bob_boot_node, _base_path_bob) = run_test_node( + let bob = run_test_node( task_executor(), Sr25519Keyring::Bob, || { @@ -53,23 +35,23 @@ async fn ensure_test_service_build_blocks() { SlotDuration::set(&2000); }, vec![ - alice_boot_node, + alice.multiaddr_with_peer_id.clone(), ], ) .unwrap(); - let t1 = service_alice.fuse(); - let t2 = service_bob.fuse(); - let t3 = future::join( - ensure_blocks_created(client_alice), - ensure_blocks_created(client_bob), + let t1 = future::join( + alice.wait_for_blocks(3), + bob.wait_for_blocks(3), ).fuse(); + let t2 = alice.service.fuse(); + let t3 = bob.service.fuse(); pin_mut!(t1, t2, t3); select! { - _ = t1 => panic!("service Alice failed"), - _ = t2 => panic!("service Bob failed"), - _ = t3 => {}, + _ = t1 => {}, + _ = t2 => panic!("service Alice failed"), + _ = t3 => panic!("service Bob failed"), } } From 302fa9add873debcb03b391d9496e442d3539201 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 19 Jun 2020 12:09:53 +0200 Subject: [PATCH 32/92] max allowed time --- polkadot-test-service/tests/build-blocks.rs | 90 +++++++++++++-------- 1 file changed, 56 insertions(+), 34 deletions(-) diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 9b6565277d36..bdc2451b9def 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -3,6 +3,10 @@ use polkadot_test_service::*; use std::pin::Pin; use std::sync::Arc; use sp_keyring::Sr25519Keyring; +use std::time::Duration; +use async_std::task::sleep; + +static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); fn task_executor( ) -> Arc + Send>>, service::TaskType) + Send + Sync> { @@ -15,43 +19,61 @@ fn task_executor( #[async_std::test] async fn ensure_test_service_build_blocks() { - sc_cli::init_logger(""); - let alice = run_test_node( - task_executor(), - Sr25519Keyring::Alice, - || { - use polkadot_test_runtime::*; - SlotDuration::set(&2000); - }, - Vec::new(), - ) - .unwrap(); - - let bob = run_test_node( - task_executor(), - Sr25519Keyring::Bob, - || { - use polkadot_test_runtime::*; - SlotDuration::set(&2000); - }, - vec![ - alice.multiaddr_with_peer_id.clone(), - ], - ) - .unwrap(); + let t1 = sleep(Duration::from_secs( + INTEGRATION_TEST_ALLOWED_TIME + .and_then(|x| x.parse().ok()) + .unwrap_or(600), + )) + .fuse(); + let t2 = async { + sc_cli::init_logger(""); + let alice = run_test_node( + task_executor(), + Sr25519Keyring::Alice, + || { + use polkadot_test_runtime::*; + SlotDuration::set(&2000); + }, + Vec::new(), + ) + .unwrap(); - let t1 = future::join( - alice.wait_for_blocks(3), - bob.wait_for_blocks(3), - ).fuse(); - let t2 = alice.service.fuse(); - let t3 = bob.service.fuse(); + let bob = run_test_node( + task_executor(), + Sr25519Keyring::Bob, + || { + use polkadot_test_runtime::*; + SlotDuration::set(&2000); + }, + vec![ + alice.multiaddr_with_peer_id.clone(), + ], + ) + .unwrap(); - pin_mut!(t1, t2, t3); + let t1 = future::join( + alice.wait_for_blocks(3), + bob.wait_for_blocks(3), + ).fuse(); + let t2 = alice.service.fuse(); + let t3 = bob.service.fuse(); + + pin_mut!(t1, t2, t3); + + select! { + _ = t1 => {}, + _ = t2 => panic!("service Alice failed"), + _ = t3 => panic!("service Bob failed"), + } + } + .fuse(); + + pin_mut!(t1, t2); select! { - _ = t1 => {}, - _ = t2 => panic!("service Alice failed"), - _ = t3 => panic!("service Bob failed"), + _ = t1 => { + panic!("the test took too long, maybe no parachain blocks have been produced"); + }, + _ = t2 => {}, } } From a3ba37bb942dcec79aa189d4c54972dba3031ab0 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 19 Jun 2020 12:10:51 +0200 Subject: [PATCH 33/92] CLEANUP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 1 - polkadot-test-service/Cargo.toml | 1 - polkadot-test-service/tests/build-blocks.rs | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a975ba745d3..c66cf181f210 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4703,7 +4703,6 @@ dependencies = [ "rand 0.7.3", "sc-authority-discovery", "sc-chain-spec", - "sc-cli", "sc-client-api", "sc-consensus", "sc-consensus-babe", diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 4d7d6f08d8f8..bfad8d4b0a0c 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -39,4 +39,3 @@ sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master [dev-dependencies] async-std = { version = "1.2.0", features = [ "attributes" ] } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index bdc2451b9def..c8b2d854d469 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -26,7 +26,6 @@ async fn ensure_test_service_build_blocks() { )) .fuse(); let t2 = async { - sc_cli::init_logger(""); let alice = run_test_node( task_executor(), Sr25519Keyring::Alice, @@ -72,7 +71,7 @@ async fn ensure_test_service_build_blocks() { select! { _ = t1 => { - panic!("the test took too long, maybe no parachain blocks have been produced"); + panic!("the test took too long, maybe no blocks have been produced"); }, _ = t2 => {}, } From d36cdc2bf5305559505afba6afe8f073eed33db1 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 19 Jun 2020 12:15:01 +0200 Subject: [PATCH 34/92] fmt --- polkadot-test-service/src/lib.rs | 28 ++++++++++----------- polkadot-test-service/tests/build-blocks.rs | 16 +++++------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index aff6fb75cbb5..7aa7f5342aea 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -20,6 +20,7 @@ mod chain_spec; pub use chain_spec::*; use consensus_common::{block_validation::Chain, SelectChain}; +use futures::{future::Future, StreamExt}; use grandpa::FinalityProofProvider as GrandpaFinalityProofProvider; use log::info; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; @@ -32,26 +33,25 @@ use polkadot_primitives::{ use polkadot_service::PolkadotClient; use polkadot_service::{new_full, new_full_start, FullNodeHandles}; use sc_chain_spec::ChainSpec; +use sc_client_api::BlockchainEvents; +use sc_executor::native_executor_instance; use sc_network::{ config::{NetworkConfiguration, TransportConfig}, multiaddr, }; use service::{ - config::{DatabaseConfig, MultiaddrWithPeerId, KeystoreConfig, WasmExecutionMethod}, + config::{DatabaseConfig, KeystoreConfig, MultiaddrWithPeerId, WasmExecutionMethod}, error::Error as ServiceError, TaskType, }; use service::{AbstractService, Configuration, Role, TFullBackend}; +use sp_keyring::Sr25519Keyring; use sp_state_machine::BasicExternalities; +use std::collections::HashSet; use std::path::Path; use std::pin::Pin; use std::sync::Arc; use std::time::Duration; -use sc_executor::native_executor_instance; -use sp_keyring::Sr25519Keyring; -use std::collections::HashSet; -use sc_client_api::BlockchainEvents; -use futures::{future::Future, StreamExt}; native_executor_instance!( pub PolkadotTestExecutor, @@ -112,9 +112,9 @@ fn node_config>( network_config.allow_non_globals_in_dht = true; - network_config.listen_addresses.push( - multiaddr::Protocol::Memory(rand::random()).into(), - ); + network_config + .listen_addresses + .push(multiaddr::Protocol::Memory(rand::random()).into()); network_config.transport = TransportConfig::MemoryOnly; @@ -168,7 +168,10 @@ pub fn run_test_node( storage_update_func: impl Fn(), boot_nodes: Vec, ) -> Result< - PolkadotTestNode, polkadot_test_runtime::RuntimeApi>>, + PolkadotTestNode< + impl AbstractService, + impl PolkadotClient, polkadot_test_runtime::RuntimeApi>, + >, ServiceError, > { let base_path = tempfile::Builder::new() @@ -198,10 +201,7 @@ pub fn run_test_node( polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000)?; let peer_id = service.network().local_peer_id().clone(); - let multiaddr_with_peer_id = MultiaddrWithPeerId { - multiaddr, - peer_id - }; + let multiaddr_with_peer_id = MultiaddrWithPeerId { multiaddr, peer_id }; let node = PolkadotTestNode { service, diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index c8b2d854d469..9981f0e51a89 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -1,15 +1,16 @@ +use async_std::task::sleep; use futures::{future, pin_mut, select, FutureExt as _}; use polkadot_test_service::*; +use sp_keyring::Sr25519Keyring; use std::pin::Pin; use std::sync::Arc; -use sp_keyring::Sr25519Keyring; use std::time::Duration; -use async_std::task::sleep; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); fn task_executor( -) -> Arc + Send>>, service::TaskType) + Send + Sync> { +) -> Arc + Send>>, service::TaskType) + Send + Sync> +{ Arc::new( move |fut: Pin + Send>>, _| { async_std::task::spawn(fut.unit_error()); @@ -44,16 +45,11 @@ async fn ensure_test_service_build_blocks() { use polkadot_test_runtime::*; SlotDuration::set(&2000); }, - vec![ - alice.multiaddr_with_peer_id.clone(), - ], + vec![alice.multiaddr_with_peer_id.clone()], ) .unwrap(); - let t1 = future::join( - alice.wait_for_blocks(3), - bob.wait_for_blocks(3), - ).fuse(); + let t1 = future::join(alice.wait_for_blocks(3), bob.wait_for_blocks(3)).fuse(); let t2 = alice.service.fuse(); let t3 = bob.service.fuse(); From 960f1f138b2f638ab88340d702c0a630c46120af Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 19 Jun 2020 12:40:41 +0200 Subject: [PATCH 35/92] Revert Cargo.lock --- Cargo.lock | 272 ++++++++++++++++++++++++++--------------------------- 1 file changed, 136 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c66cf181f210..267b686236a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1182,7 +1182,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", ] @@ -1190,7 +1190,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -1207,7 +1207,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1225,7 +1225,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -1240,7 +1240,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "serde", @@ -1251,7 +1251,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "bitmask", "frame-metadata", @@ -1276,7 +1276,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.17", @@ -1287,7 +1287,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1299,7 +1299,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.6", @@ -1309,7 +1309,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1325,7 +1325,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -1339,7 +1339,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "sp-api", @@ -3241,7 +3241,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3257,7 +3257,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3272,7 +3272,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3294,7 +3294,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3308,7 +3308,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3324,7 +3324,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3339,7 +3339,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3354,7 +3354,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3370,7 +3370,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3390,7 +3390,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3406,7 +3406,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3426,7 +3426,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3442,7 +3442,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3456,7 +3456,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3471,7 +3471,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3485,7 +3485,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3500,7 +3500,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3521,7 +3521,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3536,7 +3536,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3549,7 +3549,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "enumflags2", "frame-support", @@ -3564,7 +3564,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3579,7 +3579,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3597,7 +3597,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3611,7 +3611,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3625,7 +3625,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3647,7 +3647,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.17", @@ -3658,7 +3658,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3672,7 +3672,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3690,7 +3690,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "frame-system", @@ -3704,7 +3704,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3722,7 +3722,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-support", "parity-scale-codec", @@ -3735,7 +3735,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3750,7 +3750,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3766,7 +3766,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5492,7 +5492,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "bytes 0.5.4", "derive_more 0.99.7", @@ -5519,7 +5519,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5543,7 +5543,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5559,7 +5559,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5575,7 +5575,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.17", @@ -5586,7 +5586,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5626,7 +5626,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "fnv", @@ -5662,7 +5662,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "blake2-rfc", "hash-db", @@ -5691,7 +5691,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5702,7 +5702,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "fork-tree", @@ -5744,7 +5744,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -5767,7 +5767,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5780,7 +5780,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5802,7 +5802,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "log 0.4.8", "sc-client-api", @@ -5816,7 +5816,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "lazy_static", @@ -5844,7 +5844,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -5861,7 +5861,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5876,7 +5876,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -5897,7 +5897,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "assert_matches", "derive_more 0.99.7", @@ -5935,7 +5935,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "finality-grandpa", @@ -5952,7 +5952,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -5970,7 +5970,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "hex", @@ -5985,7 +5985,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "hash-db", "lazy_static", @@ -6004,7 +6004,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "bitflags", "bs58", @@ -6056,7 +6056,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6071,7 +6071,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "env_logger", "futures 0.3.5", @@ -6098,7 +6098,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "bytes 0.5.4", "fnv", @@ -6125,7 +6125,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "futures 0.3.5", "libp2p", @@ -6138,7 +6138,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6147,7 +6147,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "futures 0.3.5", "hash-db", @@ -6179,7 +6179,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6203,7 +6203,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6218,7 +6218,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "directories", @@ -6281,7 +6281,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6295,7 +6295,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "bytes 0.5.4", "futures 0.3.5", @@ -6317,7 +6317,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "erased-serde", "log 0.4.8", @@ -6332,7 +6332,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6352,7 +6352,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6739,7 +6739,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -6751,7 +6751,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "hash-db", "parity-scale-codec", @@ -6766,7 +6766,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6778,7 +6778,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "serde", @@ -6790,7 +6790,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "integer-sqrt", "num-traits 0.2.11", @@ -6803,7 +6803,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "sp-api", @@ -6815,7 +6815,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6826,7 +6826,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "sp-api", @@ -6838,7 +6838,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -6854,7 +6854,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "serde", "serde_json", @@ -6863,7 +6863,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6886,7 +6886,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "sp-api", @@ -6900,7 +6900,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "merlin", "parity-scale-codec", @@ -6917,7 +6917,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6929,7 +6929,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "base58", "blake2-rfc", @@ -6971,7 +6971,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -6980,7 +6980,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.6", @@ -6990,7 +6990,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "environmental", "parity-scale-codec", @@ -7001,7 +7001,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7017,7 +7017,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7027,7 +7027,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "parity-scale-codec", @@ -7039,7 +7039,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "futures 0.3.5", "hash-db", @@ -7059,7 +7059,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "lazy_static", "sp-core", @@ -7070,7 +7070,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "serde", @@ -7082,7 +7082,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.17", @@ -7093,7 +7093,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "sp-api", "sp-core", @@ -7103,7 +7103,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "backtrace", "log 0.4.8", @@ -7112,7 +7112,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "serde", "sp-core", @@ -7121,7 +7121,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "either", "hash256-std-hasher", @@ -7143,7 +7143,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7158,7 +7158,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "Inflector", "proc-macro-crate", @@ -7170,7 +7170,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "serde", "serde_json", @@ -7179,7 +7179,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "sp-api", @@ -7192,7 +7192,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7202,7 +7202,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "hash-db", "log 0.4.8", @@ -7221,12 +7221,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" [[package]] name = "sp-storage" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7238,7 +7238,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7252,7 +7252,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "tracing", ] @@ -7260,7 +7260,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -7276,7 +7276,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "hash-db", "memory-db", @@ -7290,7 +7290,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "futures 0.3.5", "futures-core", @@ -7301,7 +7301,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7313,7 +7313,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7444,7 +7444,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "chrono", "clear_on_drop", @@ -7471,7 +7471,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "platforms", ] @@ -7479,7 +7479,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7500,7 +7500,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "async-std", "derive_more 0.99.7", @@ -7514,7 +7514,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "futures 0.3.5", "hash-db", @@ -7536,7 +7536,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "cfg-if", "frame-executive", @@ -7576,7 +7576,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7597,7 +7597,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#65365aa504af820a3e5f987af672c1744e395c1c" +source = "git+https://github.com/paritytech/substrate#d735e4d0b5378c227f81a5127a1d4544de112fd8" [[package]] name = "substrate-wasm-builder-runner" From de25f2445be31455619b25669b81ccf36e5c86ca Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 19 Jun 2020 13:44:31 +0200 Subject: [PATCH 36/92] CLEANUP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- polkadot-test-service/tests/build-blocks.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 9981f0e51a89..15f7531e44d9 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -30,10 +30,7 @@ async fn ensure_test_service_build_blocks() { let alice = run_test_node( task_executor(), Sr25519Keyring::Alice, - || { - use polkadot_test_runtime::*; - SlotDuration::set(&2000); - }, + || {}, Vec::new(), ) .unwrap(); @@ -41,10 +38,7 @@ async fn ensure_test_service_build_blocks() { let bob = run_test_node( task_executor(), Sr25519Keyring::Bob, - || { - use polkadot_test_runtime::*; - SlotDuration::set(&2000); - }, + || {}, vec![alice.multiaddr_with_peer_id.clone()], ) .unwrap(); From ee93ecd7789068ff5016ee540aeef62ce65a0fa7 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 19 Jun 2020 13:51:23 +0200 Subject: [PATCH 37/92] Added sudo --- Cargo.lock | 1 + polkadot-test-service/src/chain_spec.rs | 5 +---- runtime/test-runtime/Cargo.toml | 1 + runtime/test-runtime/src/genesismap.rs | 1 + runtime/test-runtime/src/lib.rs | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 267b686236a3..afc33d340671 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4628,6 +4628,7 @@ dependencies = [ "pallet-session", "pallet-staking", "pallet-staking-reward-curve", + "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", diff --git a/polkadot-test-service/src/chain_spec.rs b/polkadot-test-service/src/chain_spec.rs index a3c61d9dc276..08237e437aa3 100644 --- a/polkadot-test-service/src/chain_spec.rs +++ b/polkadot-test-service/src/chain_spec.rs @@ -73,7 +73,7 @@ fn testnet_accounts() -> Vec { /// Helper function to create polkadot GenesisConfig for testing fn polkadot_testnet_genesis( initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ValidatorId)>, - _root_key: AccountId, // TODO + root_key: AccountId, endowed_accounts: Option>, ) -> polkadot_test_runtime::GenesisConfig { use polkadot_test_runtime as polkadot; @@ -145,11 +145,8 @@ fn polkadot_testnet_genesis( vesting: vec![], }), vesting: Some(polkadot::VestingConfig { vesting: vec![] }), - // TODO: it should have one? - /* sudo: Some(polkadot::SudoConfig { key: root_key, }), - */ } } diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index 3be110546c1f..7aa2b3e0a17f 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -49,6 +49,7 @@ pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", 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 } +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 } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } diff --git a/runtime/test-runtime/src/genesismap.rs b/runtime/test-runtime/src/genesismap.rs index bd0a8cbc75f0..9df3d34eb713 100644 --- a/runtime/test-runtime/src/genesismap.rs +++ b/runtime/test-runtime/src/genesismap.rs @@ -68,6 +68,7 @@ impl GenesisConfig { registrar: None, vesting: None, authority_discovery: None, + sudo: None, }; config.assimilate_storage(&mut storage).expect("Adding `system::GensisConfig` to the genesis"); diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index f2dbb4aad231..b4984583d550 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -491,6 +491,11 @@ impl vesting::Trait for Runtime { type MinVestedTransfer = MinVestedTransfer; } +impl sudo::Trait for Runtime { + type Event = Event; + type Call = Call; +} + construct_runtime! { pub enum Runtime where Block = Block, @@ -530,6 +535,9 @@ construct_runtime! { // Vesting. Usable initially, but removed once all vesting is finished. Vesting: vesting::{Module, Call, Storage, Event, Config}, + + // Sudo. Last module. + Sudo: sudo::{Module, Call, Storage, Config, Event}, } } From f48b07125492fc9b488f87231dd5e85671820eb6 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 19 Jun 2020 14:01:30 +0200 Subject: [PATCH 38/92] fix merge upgrade --- polkadot-test-service/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 7aa7f5342aea..103e73ecfd0d 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -141,6 +141,7 @@ fn node_config>( execution_strategies: Default::default(), rpc_http: None, rpc_ws: None, + rpc_ipc: None, rpc_ws_max_connections: None, rpc_cors: None, rpc_methods: Default::default(), From 9c04748ad8d75bc73b5b736d38e35fb84358c4ca Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 19 Jun 2020 15:32:54 +0200 Subject: [PATCH 39/92] Cargo.lock --- Cargo.lock | 336 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 189 insertions(+), 147 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fffd0bf6f20a..4efb975e9e4e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1183,7 +1183,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", ] @@ -1191,7 +1191,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -1208,7 +1208,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1226,7 +1226,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -1241,7 +1241,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "serde", @@ -1252,7 +1252,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "bitmask", "frame-metadata", @@ -1277,7 +1277,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1288,7 +1288,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1300,7 +1300,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1326,7 +1326,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -1340,7 +1340,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "sp-api", @@ -2319,7 +2319,7 @@ dependencies = [ "static_assertions", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", - "trie-db", + "trie-db 0.20.1", ] [[package]] @@ -2886,9 +2886,9 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be512cb2ccb4ecbdca937fdd4a62ea5f09f8e7195466a85e4632b3d5bcce82e6" +checksum = "fb2999ff7a65d5a1d72172f6d51fa2ea03024b51aee709ba5ff81c3c629a2410" dependencies = [ "ahash", "hash-db", @@ -3278,7 +3278,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3294,7 +3294,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3309,7 +3309,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3331,7 +3331,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3345,7 +3345,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3361,7 +3361,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3376,7 +3376,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3391,7 +3391,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3407,7 +3407,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3427,7 +3427,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3443,7 +3443,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3463,7 +3463,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3479,7 +3479,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3493,7 +3493,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3508,7 +3508,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3522,7 +3522,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3537,7 +3537,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3558,7 +3558,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3573,7 +3573,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3586,7 +3586,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "enumflags2", "frame-support", @@ -3601,7 +3601,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3616,7 +3616,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3636,7 +3636,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3650,7 +3650,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3664,7 +3664,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3686,7 +3686,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3697,7 +3697,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3711,7 +3711,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3729,7 +3729,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "frame-system", @@ -3744,7 +3744,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3762,7 +3762,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-support", "parity-scale-codec", @@ -3775,7 +3775,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3790,7 +3790,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3806,7 +3806,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4457,7 +4457,7 @@ dependencies = [ "static_assertions", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", - "trie-db", + "trie-db 0.20.1", ] [[package]] @@ -4501,7 +4501,7 @@ dependencies = [ "sp-std", "sp-trie", "static_assertions", - "trie-db", + "trie-db 0.20.1", ] [[package]] @@ -4545,7 +4545,7 @@ dependencies = [ "sp-staking", "sp-std", "sp-trie", - "trie-db", + "trie-db 0.20.1", ] [[package]] @@ -4732,7 +4732,7 @@ dependencies = [ "sp-version", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", - "trie-db", + "trie-db 0.20.1", ] [[package]] @@ -5426,6 +5426,27 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "rental" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8545debe98b2b139fb04cad8618b530e9b07c152d99a5de83c860b877d67847f" +dependencies = [ + "rental-impl", + "stable_deref_trait", +] + +[[package]] +name = "rental-impl" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de" +dependencies = [ + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", +] + [[package]] name = "ring" version = "0.16.15" @@ -5566,7 +5587,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "bytes 0.5.4", "derive_more 0.99.8", @@ -5593,7 +5614,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5617,7 +5638,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5633,7 +5654,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5649,7 +5670,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5660,7 +5681,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5700,7 +5721,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "fnv", @@ -5736,7 +5757,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "blake2-rfc", "hash-db", @@ -5765,7 +5786,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5776,7 +5797,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "fork-tree", @@ -5818,7 +5839,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -5831,6 +5852,7 @@ dependencies = [ "sc-rpc-api", "serde", "sp-api", + "sp-application-crypto", "sp-blockchain", "sp-consensus", "sp-consensus-babe", @@ -5841,7 +5863,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5854,7 +5876,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5876,7 +5898,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "log 0.4.8", "sc-client-api", @@ -5890,7 +5912,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "lazy_static", @@ -5918,7 +5940,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -5935,7 +5957,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -5950,7 +5972,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -5971,7 +5993,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "assert_matches", "derive_more 0.99.8", @@ -6009,7 +6031,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "finality-grandpa", @@ -6026,7 +6048,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6045,10 +6067,11 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "hex", + "merlin", "parking_lot 0.10.2", "rand 0.7.3", "serde_json", @@ -6060,7 +6083,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "hash-db", "lazy_static", @@ -6079,7 +6102,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "bitflags", "bs58", @@ -6131,7 +6154,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6146,7 +6169,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "env_logger", "futures 0.3.5", @@ -6173,7 +6196,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "bytes 0.5.4", "fnv", @@ -6200,7 +6223,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "futures 0.3.5", "libp2p", @@ -6213,7 +6236,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6222,7 +6245,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "futures 0.3.5", "hash-db", @@ -6254,7 +6277,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6278,7 +6301,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6294,7 +6317,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "directories", @@ -6357,7 +6380,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6371,7 +6394,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "bytes 0.5.4", "futures 0.3.5", @@ -6393,22 +6416,24 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "erased-serde", "log 0.4.8", "parking_lot 0.10.2", + "rustc-hash", "sc-telemetry", "serde", "serde_json", "slog", + "sp-tracing", "tracing-core", ] [[package]] name = "sc-transaction-graph" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6428,7 +6453,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6815,7 +6840,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6827,7 +6852,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "hash-db", "parity-scale-codec", @@ -6842,7 +6867,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6854,7 +6879,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "serde", @@ -6866,7 +6891,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -6879,7 +6904,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "sp-api", @@ -6891,7 +6916,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6902,7 +6927,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "sp-api", @@ -6914,7 +6939,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6930,7 +6955,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "serde", "serde_json", @@ -6939,7 +6964,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6962,7 +6987,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "sp-api", @@ -6976,7 +7001,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "merlin", "parity-scale-codec", @@ -6984,6 +7009,7 @@ dependencies = [ "sp-application-crypto", "sp-consensus", "sp-consensus-vrf", + "sp-core", "sp-inherents", "sp-runtime", "sp-std", @@ -6993,7 +7019,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7005,7 +7031,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "base58", "blake2-rfc", @@ -7047,7 +7073,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7056,7 +7082,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7066,7 +7092,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "environmental", "parity-scale-codec", @@ -7077,7 +7103,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7093,7 +7119,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7103,7 +7129,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "parity-scale-codec", @@ -7115,7 +7141,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "futures 0.3.5", "hash-db", @@ -7128,6 +7154,7 @@ dependencies = [ "sp-runtime-interface", "sp-state-machine", "sp-std", + "sp-tracing", "sp-trie", "sp-wasm-interface", ] @@ -7135,7 +7162,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "lazy_static", "sp-core", @@ -7146,7 +7173,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "serde", @@ -7158,7 +7185,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7169,7 +7196,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "sp-api", "sp-core", @@ -7179,7 +7206,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "backtrace", "log 0.4.8", @@ -7188,7 +7215,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "serde", "sp-core", @@ -7197,7 +7224,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "either", "hash256-std-hasher", @@ -7219,7 +7246,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7234,7 +7261,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "Inflector", "proc-macro-crate", @@ -7246,7 +7273,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "serde", "serde_json", @@ -7255,7 +7282,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "sp-api", @@ -7268,7 +7295,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7278,7 +7305,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "hash-db", "log 0.4.8", @@ -7290,19 +7317,19 @@ dependencies = [ "sp-externalities", "sp-panic-handler", "sp-trie", - "trie-db", + "trie-db 0.21.0", "trie-root", ] [[package]] name = "sp-std" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" [[package]] name = "sp-storage" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7314,7 +7341,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7328,15 +7355,17 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ + "log 0.4.8", + "rental", "tracing", ] [[package]] name = "sp-transaction-pool" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7352,21 +7381,21 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "hash-db", "memory-db", "parity-scale-codec", "sp-core", "sp-std", - "trie-db", + "trie-db 0.21.0", "trie-root", ] [[package]] name = "sp-utils" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "futures 0.3.5", "futures-core", @@ -7378,7 +7407,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7390,7 +7419,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7521,7 +7550,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "chrono", "clear_on_drop", @@ -7548,7 +7577,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "platforms", ] @@ -7556,7 +7585,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7579,7 +7608,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "async-std", "derive_more 0.99.8", @@ -7593,7 +7622,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "futures 0.3.5", "hash-db", @@ -7615,7 +7644,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "cfg-if", "frame-executive", @@ -7649,13 +7678,13 @@ dependencies = [ "sp-trie", "sp-version", "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate)", - "trie-db", + "trie-db 0.21.0", ] [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc3" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7676,7 +7705,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#0c42cedaac0b1bf3a608031ee3e494b51bfaa0fe" +source = "git+https://github.com/paritytech/substrate#3ca1d91f0f53f03d95e5335ad3d7d125e379c9d6" [[package]] name = "substrate-wasm-builder-runner" @@ -8416,6 +8445,19 @@ dependencies = [ "smallvec 1.4.0", ] +[[package]] +name = "trie-db" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb230c24c741993b04cfccbabb45acff6f6480c5f00d3ed8794ea43db3a9d727" +dependencies = [ + "hash-db", + "hashbrown", + "log 0.4.8", + "rustc-hex", + "smallvec 1.4.0", +] + [[package]] name = "trie-root" version = "0.16.0" @@ -8910,7 +8952,7 @@ dependencies = [ "static_assertions", "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0", - "trie-db", + "trie-db 0.20.1", ] [[package]] From 3a0eee33753d16ef3bd0f9cda20dd29b49d6a177 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 22 Jun 2020 10:01:13 +0200 Subject: [PATCH 40/92] Fixed slot_duration for test w/ and w/out service --- polkadot-test-service/src/chain_spec.rs | 4 +--- polkadot-test-service/src/lib.rs | 6 ++++++ runtime/test-runtime/src/constants.rs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/polkadot-test-service/src/chain_spec.rs b/polkadot-test-service/src/chain_spec.rs index 08237e437aa3..c49c0f021d3a 100644 --- a/polkadot-test-service/src/chain_spec.rs +++ b/polkadot-test-service/src/chain_spec.rs @@ -145,8 +145,6 @@ fn polkadot_testnet_genesis( vesting: vec![], }), vesting: Some(polkadot::VestingConfig { vesting: vec![] }), - sudo: Some(polkadot::SudoConfig { - key: root_key, - }), + sudo: Some(polkadot::SudoConfig { key: root_key }), } } diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 103e73ecfd0d..a24057276ffb 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -181,6 +181,12 @@ pub fn run_test_node( let mut spec = polkadot_local_testnet_config(); let mut storage = spec.as_storage_builder().build_storage()?; + BasicExternalities::execute_with_storage(&mut storage, || { + use polkadot_test_runtime::*; + + // NOTE: this is required because the default value is 0 for testing without a service + SlotDuration::set(&2000); + }); BasicExternalities::execute_with_storage(&mut storage, storage_update_func); spec.set_storage(storage); diff --git a/runtime/test-runtime/src/constants.rs b/runtime/test-runtime/src/constants.rs index 7109bde1e959..8367c4afeeee 100644 --- a/runtime/test-runtime/src/constants.rs +++ b/runtime/test-runtime/src/constants.rs @@ -29,7 +29,7 @@ pub mod time { use primitives::{Moment, BlockNumber}; // Testnet pub const MILLISECS_PER_BLOCK: Moment = 1000; - pub const SLOT_DURATION: Moment = 3000; + pub const SLOT_DURATION: Moment = 0; // must stay 0 for some tests // Testnet pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES; From f2444bcb360552a612651c6e7943f73e90967fc4 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 22 Jun 2020 10:05:52 +0200 Subject: [PATCH 41/92] increase spec version --- runtime/kusama/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 84376032372d..64909f2bb52b 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -86,7 +86,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("kusama"), impl_name: create_runtime_str!("parity-kusama"), authoring_version: 2, - spec_version: 2011, + spec_version: 2012, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, From acb88cce22e62cdb808718c90381a9c7ec2d3675 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 22 Jun 2020 10:50:41 +0200 Subject: [PATCH 42/92] better fix --- network/test/src/block_import.rs | 2 +- node/service/src/grandpa_support.rs | 8 ++++++-- polkadot-test-service/src/lib.rs | 6 ------ runtime/test-runtime/client/src/lib.rs | 21 +++++++++++++++------ runtime/test-runtime/src/constants.rs | 2 +- service/src/grandpa_support.rs | 8 ++++++-- 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/network/test/src/block_import.rs b/network/test/src/block_import.rs index ce4c9f8ba0b6..51edacf8ad5a 100644 --- a/network/test/src/block_import.rs +++ b/network/test/src/block_import.rs @@ -29,7 +29,7 @@ fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock) let mut client = polkadot_test_runtime_client::new(); let mut builder = client.new_block(Default::default()).unwrap(); - let extrinsics = polkadot_test_runtime_client::needed_extrinsics(vec![]); + let extrinsics = polkadot_test_runtime_client::needed_extrinsics(vec![], 0); for extrinsic in &extrinsics { builder.push(extrinsic.clone()).unwrap(); diff --git a/node/service/src/grandpa_support.rs b/node/service/src/grandpa_support.rs index a875c4b45a37..806a189d9fe5 100644 --- a/node/service/src/grandpa_support.rs +++ b/node/service/src/grandpa_support.rs @@ -250,17 +250,21 @@ mod tests { let mut push_blocks = { let mut client = client.clone(); + let mut base = 0; + move |n| { - for _ in 0..n { + for i in 0..n { let mut builder = client.new_block(Default::default()).unwrap(); - for extrinsic in polkadot_test_runtime_client::needed_extrinsics(vec![]) { + for extrinsic in polkadot_test_runtime_client::needed_extrinsics(vec![], base + i) { builder.push(extrinsic).unwrap() } let block = builder.build().unwrap().block; client.import(BlockOrigin::Own, block).unwrap(); } + + base += n; } }; diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index a24057276ffb..103e73ecfd0d 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -181,12 +181,6 @@ pub fn run_test_node( let mut spec = polkadot_local_testnet_config(); let mut storage = spec.as_storage_builder().build_storage()?; - BasicExternalities::execute_with_storage(&mut storage, || { - use polkadot_test_runtime::*; - - // NOTE: this is required because the default value is 0 for testing without a service - SlotDuration::set(&2000); - }); BasicExternalities::execute_with_storage(&mut storage, storage_update_func); spec.set_storage(storage); diff --git a/runtime/test-runtime/client/src/lib.rs b/runtime/test-runtime/client/src/lib.rs index 2e026647195f..65e587f9607e 100644 --- a/runtime/test-runtime/client/src/lib.rs +++ b/runtime/test-runtime/client/src/lib.rs @@ -20,6 +20,7 @@ use std::sync::Arc; use std::collections::BTreeMap; +use std::convert::TryFrom; pub use substrate_test_client::*; pub use polkadot_test_runtime as runtime; @@ -323,20 +324,28 @@ pub fn new_native_executor() -> sc_executor::NativeExecutor { } /// Extrinsics that must be included in each block. -pub fn needed_extrinsics(heads: Vec) -> Vec { +/// +/// The index of the block must be provided to calculate a valid timestamp for the block. The value starts at 0 and +/// should be incremented by one for every block produced. +pub fn needed_extrinsics( + heads: Vec, + i: u64, +) -> Vec { use polkadot_runtime_common::parachains; + let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH) + .expect("now always later than unix epoch; qed") + .as_millis() + (i * polkadot_test_runtime::constants::time::SLOT_DURATION / 2) as u128; + vec![ polkadot_test_runtime::UncheckedExtrinsic { function: polkadot_test_runtime::Call::Parachains(parachains::Call::set_heads(heads)), signature: None, }, polkadot_test_runtime::UncheckedExtrinsic { - function: polkadot_test_runtime::Call::Timestamp(pallet_timestamp::Call::set({ - std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH) - .expect("now always later than unix epoch; qed") - .as_millis() as u64 - })), + function: polkadot_test_runtime::Call::Timestamp(pallet_timestamp::Call::set( + u64::try_from(timestamp).expect("unexpectedly big timestamp"), + )), signature: None, } ] diff --git a/runtime/test-runtime/src/constants.rs b/runtime/test-runtime/src/constants.rs index 8367c4afeeee..ccac55d2b6f0 100644 --- a/runtime/test-runtime/src/constants.rs +++ b/runtime/test-runtime/src/constants.rs @@ -29,7 +29,7 @@ pub mod time { use primitives::{Moment, BlockNumber}; // Testnet pub const MILLISECS_PER_BLOCK: Moment = 1000; - pub const SLOT_DURATION: Moment = 0; // must stay 0 for some tests + pub const SLOT_DURATION: Moment = 2000; // Testnet pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES; diff --git a/service/src/grandpa_support.rs b/service/src/grandpa_support.rs index e210d7cfa42b..794b4e4fc180 100644 --- a/service/src/grandpa_support.rs +++ b/service/src/grandpa_support.rs @@ -250,17 +250,21 @@ mod tests { let mut push_blocks = { let mut client = client.clone(); + let mut base = 0; + move |n| { - for _ in 0..n { + for i in 0..n { let mut builder = client.new_block(Default::default()).unwrap(); - for extrinsic in polkadot_test_runtime_client::needed_extrinsics(vec![]) { + for extrinsic in polkadot_test_runtime_client::needed_extrinsics(vec![], base + i) { builder.push(extrinsic).unwrap() } let block = builder.build().unwrap().block; client.import(BlockOrigin::Own, block).unwrap(); } + + base += n; } }; From 6e5e0608a22eb4f4beca940d52ebff7024ad4d3d Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 22 Jun 2020 11:41:20 +0200 Subject: [PATCH 43/92] Update runtime/test-runtime/client/src/lib.rs --- runtime/test-runtime/client/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/test-runtime/client/src/lib.rs b/runtime/test-runtime/client/src/lib.rs index 65e587f9607e..d1f4466bab78 100644 --- a/runtime/test-runtime/client/src/lib.rs +++ b/runtime/test-runtime/client/src/lib.rs @@ -344,7 +344,7 @@ pub fn needed_extrinsics( }, polkadot_test_runtime::UncheckedExtrinsic { function: polkadot_test_runtime::Call::Timestamp(pallet_timestamp::Call::set( - u64::try_from(timestamp).expect("unexpectedly big timestamp"), + u64::try_from(timestamp).expect("unexpected big timestamp"), )), signature: None, } From 3de82c2f8956091820b3c751005d0ff8ed654d07 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 30 Jun 2020 14:16:19 +0200 Subject: [PATCH 44/92] Added doc and simplified API --- polkadot-test-service/src/chain_spec.rs | 14 ++++- polkadot-test-service/src/lib.rs | 74 ++++++++++++++++--------- 2 files changed, 60 insertions(+), 28 deletions(-) diff --git a/polkadot-test-service/src/chain_spec.rs b/polkadot-test-service/src/chain_spec.rs index c49c0f021d3a..11512f1666e2 100644 --- a/polkadot-test-service/src/chain_spec.rs +++ b/polkadot-test-service/src/chain_spec.rs @@ -4,7 +4,7 @@ use pallet_staking::Forcing; use polkadot_primitives::{parachain::ValidatorId, AccountId}; use polkadot_service::chain_spec::{get_account_id_from_seed, get_from_seed, Extensions}; use polkadot_test_runtime::constants::currency::DOTS; -use sc_chain_spec::ChainType; +use sc_chain_spec::{ChainSpec, ChainType}; use sp_core::sr25519; use sp_runtime::Perbill; @@ -148,3 +148,15 @@ fn polkadot_testnet_genesis( sudo: Some(polkadot::SudoConfig { key: root_key }), } } + +/// Can be called for a `Configuration` to check if it is a configuration for the `Test` network. +pub trait IdentifyVariant { + /// Returns if this is a configuration for the `Test` network. + fn is_test(&self) -> bool; +} + +impl IdentifyVariant for Box { + fn is_test(&self) -> bool { + self.id().starts_with("test") || self.id().starts_with("tst") // TODO not sure why I need a 3 chars variant + } +} diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 103e73ecfd0d..3f7d9d162886 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -16,6 +16,8 @@ //! Polkadot test service only. +#![warn(missing_docs)] + mod chain_spec; pub use chain_spec::*; @@ -33,7 +35,7 @@ use polkadot_primitives::{ use polkadot_service::PolkadotClient; use polkadot_service::{new_full, new_full_start, FullNodeHandles}; use sc_chain_spec::ChainSpec; -use sc_client_api::BlockchainEvents; +use sc_client_api::{execution_extensions::ExecutionStrategies, BlockchainEvents}; use sc_executor::native_executor_instance; use sc_network::{ config::{NetworkConfiguration, TransportConfig}, @@ -88,21 +90,31 @@ pub fn polkadot_test_new_full( Ok((service, client, handles)) } -fn node_config>( - spec: &PolkadotChainSpec, - role: Role, +/// Create a Polkadot `Configuration`. By default an in-memory socket will be used, therefore you need to provide boot +/// nodes if you want the future node to be connected to other nodes. The `storage_update_func` can be used to make +/// adjustements to the runtime before the node starts. +pub fn node_config>( + storage_update_func: impl Fn(), task_executor: Arc< dyn Fn(Pin + Send>>, TaskType) + Send + Sync, >, - key_seed: Option, - port: u16, + key: Sr25519Keyring, root: P, boot_nodes: Vec, -) -> Configuration { +) -> Result { let root = root.as_ref().to_path_buf(); + let role = Role::Authority { + sentry_nodes: Vec::new(), + }; + let key_seed = key.to_seed(); + let mut spec = polkadot_local_testnet_config(); + let mut storage = spec.as_storage_builder().build_storage()?; + + BasicExternalities::execute_with_storage(&mut storage, storage_update_func); + spec.set_storage(storage); let mut network_config = NetworkConfiguration::new( - format!("Polkadot Test Node on {}", port), + format!("Polkadot Test Node for: {}", key_seed), "network/test/0.1", Default::default(), None, @@ -118,7 +130,7 @@ fn node_config>( network_config.transport = TransportConfig::MemoryOnly; - Configuration { + Ok(Configuration { impl_name: "polkadot-test-node", impl_version: "0.1", role, @@ -136,9 +148,16 @@ fn node_config>( state_cache_size: 16777216, state_cache_child_ratio: None, pruning: Default::default(), - chain_spec: Box::new((*spec).clone()), + chain_spec: Box::new(spec), wasm_method: WasmExecutionMethod::Interpreted, - execution_strategies: Default::default(), + // NOTE: we enforce the use of the native runtime to make the errors more debuggable + execution_strategies: ExecutionStrategies { + syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible, + importing: sc_client_api::ExecutionStrategy::NativeWhenPossible, + block_construction: sc_client_api::ExecutionStrategy::NativeWhenPossible, + offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible, + other: sc_client_api::ExecutionStrategy::NativeWhenPossible, + }, rpc_http: None, rpc_ws: None, rpc_ipc: None, @@ -152,15 +171,18 @@ fn node_config>( offchain_worker: Default::default(), force_authoring: false, disable_grandpa: false, - dev_key_seed: key_seed, + dev_key_seed: Some(key_seed), tracing_targets: None, tracing_receiver: Default::default(), max_runtime_instances: 8, announce_block: true, base_path: Some(root.into()), - } + }) } +/// Run a Polkadot test node using the Polkadot test runtime. The node will be using an in-memory socket, therefore you +/// need to provide boot nodes if you want it to be connected to other nodes. The `storage_update_func` can be used to +/// make adjustements to the runtime before the node starts. pub fn run_test_node( task_executor: Arc< dyn Fn(Pin + Send>>, TaskType) + Send + Sync, @@ -178,24 +200,14 @@ pub fn run_test_node( let base_path = tempfile::Builder::new() .prefix("polkadot-test-service") .tempdir()?; - let mut spec = polkadot_local_testnet_config(); - - let mut storage = spec.as_storage_builder().build_storage()?; - BasicExternalities::execute_with_storage(&mut storage, storage_update_func); - - spec.set_storage(storage); let config = node_config( - &spec, - Role::Authority { - sentry_nodes: Vec::new(), - }, + storage_update_func, task_executor, - Some(key.to_seed()), - 0, + key, &base_path, boot_nodes, - ); + )?; let multiaddr = config.network.listen_addresses[0].clone(); let authority_discovery_enabled = false; let (service, client, handles) = @@ -215,11 +227,17 @@ pub fn run_test_node( Ok(node) } +/// A Polkadot test node instance used for testing. pub struct PolkadotTestNode { + /// Service's instance. pub service: S, + /// Client's instance. pub client: Arc, + /// Node's handles. pub handles: FullNodeHandles, + /// The `MultiaddrWithPeerId` to this node. This is useful if you want to pass it as "boot node" to other nodes. pub multiaddr_with_peer_id: MultiaddrWithPeerId, + /// A `TempDir` where the node data is stored. The directory is deleted when the object is dropped. pub base_path: tempfile::TempDir, } @@ -227,6 +245,8 @@ impl PolkadotTestNode where C: BlockchainEvents, { + /// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks + /// are ever created, thus you should restrict the maximum amount of time of the test execution. pub fn wait_for_blocks(&self, count: usize) -> impl Future { assert_ne!(count, 0, "'count' argument must be greater than 1"); let client = self.client.clone(); @@ -237,7 +257,7 @@ where while let Some(notification) = import_notification_stream.next().await { blocks.insert(notification.hash); - if blocks.len() == 3 { + if blocks.len() == count { break; } } From 8f4245d552542e87bcbc2cca734a501e080ad631 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 30 Jun 2020 14:23:38 +0200 Subject: [PATCH 45/92] Make wait_for_blocks more generic to avoid duplication in cumulus --- polkadot-test-service/src/lib.rs | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 3f7d9d162886..6ca9cb98c695 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -32,8 +32,7 @@ use polkadot_primitives::{ parachain::{self}, BlockId, Hash, }; -use polkadot_service::PolkadotClient; -use polkadot_service::{new_full, new_full_start, FullNodeHandles}; +use polkadot_service::{new_full, new_full_start, FullNodeHandles, PolkadotClient, BlockT}; use sc_chain_spec::ChainSpec; use sc_client_api::{execution_extensions::ExecutionStrategies, BlockchainEvents}; use sc_executor::native_executor_instance; @@ -251,16 +250,26 @@ where assert_ne!(count, 0, "'count' argument must be greater than 1"); let client = self.client.clone(); - async move { - let mut import_notification_stream = client.import_notification_stream(); - let mut blocks = HashSet::new(); + wait_for_blocks(client.clone(), count) + } +} + +/// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks +/// are ever created, thus you should restrict the maximum amount of time of the test execution. +pub async fn wait_for_blocks(client: Arc, count: usize) +where + C: BlockchainEvents, + B: BlockT, +{ + assert_ne!(count, 0, "'count' argument must be greater than 1"); + + let mut import_notification_stream = client.import_notification_stream(); + let mut blocks = HashSet::new(); - while let Some(notification) = import_notification_stream.next().await { - blocks.insert(notification.hash); - if blocks.len() == count { - break; - } - } + while let Some(notification) = import_notification_stream.next().await { + blocks.insert(notification.hash); + if blocks.len() == count { + break; } } } From 481688020824fe7e9771fb7eb3bc21127243f49d Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 30 Jun 2020 15:58:10 +0200 Subject: [PATCH 46/92] Removed base_path as this is not needed anymore --- polkadot-test-service/src/lib.rs | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index ca05898d4c7c..9eae1d070e7e 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -47,11 +47,10 @@ use service::{ error::Error as ServiceError, TaskExecutor, TaskManager, }; -use service::{Configuration, Role, TFullBackend}; +use service::{Configuration, Role, TFullBackend, BasePath}; use sp_keyring::Sr25519Keyring; use sp_state_machine::BasicExternalities; use std::collections::HashSet; -use std::path::Path; use std::sync::Arc; use std::time::Duration; @@ -94,14 +93,14 @@ pub fn polkadot_test_new_full( /// Create a Polkadot `Configuration`. By default an in-memory socket will be used, therefore you need to provide boot /// nodes if you want the future node to be connected to other nodes. The `storage_update_func` can be used to make /// adjustements to the runtime before the node starts. -pub fn node_config>( +pub fn node_config( storage_update_func: impl Fn(), task_executor: TaskExecutor, key: Sr25519Keyring, - root: P, boot_nodes: Vec, ) -> Result { - let root = root.as_ref().to_path_buf(); + let base_path = BasePath::new_temp_dir()?; + let root = base_path.path(); let role = Role::Authority { sentry_nodes: Vec::new(), }; @@ -175,7 +174,7 @@ pub fn node_config>( tracing_receiver: Default::default(), max_runtime_instances: 8, announce_block: true, - base_path: Some(root.into()), + base_path: Some(base_path), informant_output_format: Default::default(), }) } @@ -195,13 +194,10 @@ pub fn run_test_node( >, ServiceError, > { - let base_path = tempfile::Builder::new().prefix("polkadot-test").tempdir()?; - let config = node_config( storage_update_func, task_executor, key, - &base_path, boot_nodes, )?; let multiaddr = config.network.listen_addresses[0].clone(); @@ -217,7 +213,6 @@ pub fn run_test_node( client, handles, multiaddr_with_peer_id, - base_path, }; Ok(node) @@ -233,8 +228,6 @@ pub struct PolkadotTestNode { pub handles: FullNodeHandles, /// The `MultiaddrWithPeerId` to this node. This is useful if you want to pass it as "boot node" to other nodes. pub multiaddr_with_peer_id: MultiaddrWithPeerId, - /// A `TempDir` where the node data is stored. The directory is deleted when the object is dropped. - pub base_path: tempfile::TempDir, } impl PolkadotTestNode From f35262e101183ba566482049860dbad5dfa8b608 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 30 Jun 2020 17:10:44 +0200 Subject: [PATCH 47/92] Helper to send transaction more easily --- Cargo.lock | 2 + polkadot-test-service/Cargo.toml | 2 + polkadot-test-service/src/lib.rs | 68 ++++++++++++++++++++++++++------ service/src/lib.rs | 10 ++--- 4 files changed, 66 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d54a0c282552..5ff274645b75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4858,7 +4858,9 @@ version = "0.8.2" dependencies = [ "async-std", "frame-benchmarking", + "futures 0.1.29", "futures 0.3.5", + "hex", "log 0.4.8", "pallet-staking", "polkadot-availability-store", diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index bfad8d4b0a0c..b7b7c32496a3 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -9,6 +9,8 @@ log = "0.4.8" futures = "0.3.4" tempfile = "3.1.0" rand = "0.7.3" +hex = "0.4" +futures01 = { package = "futures", version = "0.1.29" } av_store = { package = "polkadot-availability-store", path = "../availability-store" } consensus = { package = "polkadot-validation", path = "../validation" } polkadot-primitives = { path = "../primitives" } diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 9eae1d070e7e..a5121eb1be18 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -45,10 +45,11 @@ use sc_network::{ use service::{ config::{DatabaseConfig, KeystoreConfig, MultiaddrWithPeerId, WasmExecutionMethod}, error::Error as ServiceError, - TaskExecutor, TaskManager, + RpcHandlers, RpcSession, TaskExecutor, TaskManager, }; -use service::{Configuration, Role, TFullBackend, BasePath}; +use service::{BasePath, Configuration, Role, TFullBackend}; use sp_keyring::Sr25519Keyring; +use sp_runtime::{codec::Encode, OpaqueExtrinsic}; use sp_state_machine::BasicExternalities; use std::collections::HashSet; use std::sync::Arc; @@ -74,10 +75,11 @@ pub fn polkadot_test_new_full( Arc, polkadot_test_runtime::RuntimeApi>>, FullNodeHandles, Arc>, + Arc, ), ServiceError, > { - let (task_manager, client, handles, network) = new_full!(test + let (task_manager, client, handles, network, rpc_handlers) = new_full!(test config, collating_for, max_block_data_size, @@ -87,7 +89,7 @@ pub fn polkadot_test_new_full( PolkadotTestExecutor, ); - Ok((task_manager, client, handles, network)) + Ok((task_manager, client, handles, network, rpc_handlers)) } /// Create a Polkadot `Configuration`. By default an in-memory socket will be used, therefore you need to provide boot @@ -194,15 +196,10 @@ pub fn run_test_node( >, ServiceError, > { - let config = node_config( - storage_update_func, - task_executor, - key, - boot_nodes, - )?; + let config = node_config(storage_update_func, task_executor, key, boot_nodes)?; let multiaddr = config.network.listen_addresses[0].clone(); let authority_discovery_enabled = false; - let (task_manager, client, handles, network) = + let (task_manager, client, handles, network, rpc_handlers) = polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000)?; let peer_id = network.local_peer_id().clone(); @@ -213,6 +210,7 @@ pub fn run_test_node( client, handles, multiaddr_with_peer_id, + rpc_handlers, }; Ok(node) @@ -228,6 +226,8 @@ pub struct PolkadotTestNode { pub handles: FullNodeHandles, /// The `MultiaddrWithPeerId` to this node. This is useful if you want to pass it as "boot node" to other nodes. pub multiaddr_with_peer_id: MultiaddrWithPeerId, + /// RPCHandlers to make RPC queries. + pub rpc_handlers: Arc, } impl PolkadotTestNode @@ -242,6 +242,22 @@ where wait_for_blocks(client.clone(), count) } + + /// Send a transaction through the RPCHandlers. + pub fn send_transaction( + &self, + extrinsic: OpaqueExtrinsic, + ) -> impl Future< + Output = ( + Option, + RpcSession, + futures01::sync::mpsc::Receiver, + ), + > { + let rpc_handlers = self.rpc_handlers.clone(); + + send_transaction(rpc_handlers, extrinsic) + } } /// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks @@ -263,3 +279,33 @@ where } } } + +/// Send a transaction through the RPCHandlers. +pub async fn send_transaction( + rpc_handlers: Arc, + extrinsic: OpaqueExtrinsic, +) -> ( + Option, + RpcSession, + futures01::sync::mpsc::Receiver, +) { + let (tx, rx) = futures01::sync::mpsc::channel(0); + let mem = RpcSession::new(tx.into()); + let res = rpc_handlers + .rpc_query( + &mem, + format!( + r#"{{ + "jsonrpc": "2.0", + "method": "author_submitExtrinsic", + "params": ["0x{}"], + "id": 0 + }}"#, + hex::encode(extrinsic.encode()) + ) + .as_str(), + ) + .await; + + (res, mem, rx) +} diff --git a/service/src/lib.rs b/service/src/lib.rs index f93c06dca868..a6c6481883a6 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -319,7 +319,7 @@ macro_rules! new_full { let ServiceComponents { client, network, select_chain, keystore, transaction_pool, prometheus_registry, - task_manager, telemetry_on_connect_sinks, .. + task_manager, telemetry_on_connect_sinks, rpc_handlers, .. } = builder .with_finality_proof_provider(|client, backend| { let provider = client as Arc>; @@ -556,7 +556,7 @@ macro_rules! new_full { } handles.polkadot_network = Some(polkadot_network_service); - (task_manager, client, handles, network) + (task_manager, client, handles, network, rpc_handlers) }}; ( $config:expr, @@ -730,7 +730,7 @@ pub fn polkadot_new_full( FullNodeHandles, ), ServiceError> { - let (service, client, handles, _) = new_full!( + let (service, client, handles, _, _) = new_full!( config, collating_for, max_block_data_size, @@ -764,7 +764,7 @@ pub fn kusama_new_full( FullNodeHandles ), ServiceError> { - let (service, client, handles, _) = new_full!( + let (service, client, handles, _, _) = new_full!( config, collating_for, max_block_data_size, @@ -798,7 +798,7 @@ pub fn westend_new_full( FullNodeHandles, ), ServiceError> { - let (service, client, handles, _) = new_full!( + let (service, client, handles, _, _) = new_full!( config, collating_for, max_block_data_size, From 74ab47cd20d081ce36eb2255f5500a93be69a2e0 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 1 Jul 2020 10:24:25 +0200 Subject: [PATCH 48/92] Fix indent --- polkadot-test-service/src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index a5121eb1be18..eba4671792c8 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -296,11 +296,11 @@ pub async fn send_transaction( &mem, format!( r#"{{ - "jsonrpc": "2.0", - "method": "author_submitExtrinsic", - "params": ["0x{}"], - "id": 0 - }}"#, + "jsonrpc": "2.0", + "method": "author_submitExtrinsic", + "params": ["0x{}"], + "id": 0 + }}"#, hex::encode(extrinsic.encode()) ) .as_str(), From be3889be19bad2230dbbad4f9ee36f90592d49ce Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 1 Jul 2020 11:42:31 +0200 Subject: [PATCH 49/92] Added test for send-transaction --- Cargo.lock | 7 ++ polkadot-test-service/Cargo.toml | 7 ++ .../tests/send-transaction.rs | 114 ++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 polkadot-test-service/tests/send-transaction.rs diff --git a/Cargo.lock b/Cargo.lock index 5ff274645b75..408b74615c94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4858,15 +4858,19 @@ version = "0.8.2" dependencies = [ "async-std", "frame-benchmarking", + "frame-system", "futures 0.1.29", "futures 0.3.5", "hex", "log 0.4.8", "pallet-staking", + "pallet-sudo", + "pallet-transaction-payment", "polkadot-availability-store", "polkadot-network", "polkadot-primitives", "polkadot-rpc", + "polkadot-runtime-common", "polkadot-service", "polkadot-test-runtime", "polkadot-validation", @@ -4881,6 +4885,9 @@ dependencies = [ "sc-network", "sc-service", "sc-transaction-pool", + "serde_json", + "sp-arithmetic", + "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-core", diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index b7b7c32496a3..237801c64b3f 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -41,3 +41,10 @@ sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master [dev-dependencies] async-std = { version = "1.2.0", features = [ "attributes" ] } +serde_json = "1.0" +polkadot-runtime-common = { path = "../runtime/common" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/polkadot-test-service/tests/send-transaction.rs b/polkadot-test-service/tests/send-transaction.rs new file mode 100644 index 000000000000..f97d096ebfb3 --- /dev/null +++ b/polkadot-test-service/tests/send-transaction.rs @@ -0,0 +1,114 @@ +use async_std::task::sleep; +use futures::{pin_mut, select, FutureExt as _}; +use polkadot_primitives::parachain::{Info, Scheduling}; +use polkadot_runtime_common::{parachains, registrar, BlockHashCount}; +use polkadot_test_runtime::{RestrictFunctionality, Runtime, SignedExtra, SignedPayload, VERSION}; +use polkadot_test_service::*; +use service::TaskExecutor; +use sp_arithmetic::traits::SaturatedConversion; +use sp_blockchain::HeaderBackend; +use sp_keyring::Sr25519Keyring::Alice; +use sp_runtime::{codec::Encode, generic}; +use std::time::Duration; + +static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); + +#[async_std::test] +async fn send_transaction_actually_work() { + let task_executor: TaskExecutor = (|fut, _| { + async_std::task::spawn(fut); + }) + .into(); + let t1 = sleep(Duration::from_secs( + INTEGRATION_TEST_ALLOWED_TIME + .and_then(|x| x.parse().ok()) + .unwrap_or(600), + )) + .fuse(); + let t2 = async { + let mut alice = run_test_node( + task_executor.clone(), + Alice, + || {}, + Vec::new(), + ) + .unwrap(); + + let wasm = vec![0_u8; 32]; + let genesis_state = b"0x0x000000000000000000000000000000000000000000000000000000000000000000eb21415d4113e9bb8c\ + 0c3fa5533d873c439e94960c56f4c1dd1105ddc6b7b2e903170a2e7597b7b7e3d84c05391d139a62b157e78786\ + d8c082f29dcf4c11131400".to_vec(); + let current_block_hash = alice.client.info().best_hash; + let current_block = alice.client.info().best_number.saturated_into(); + let genesis_block = alice.client.hash(0).unwrap().unwrap(); + let nonce = 0; + let period = BlockHashCount::get() + .checked_next_power_of_two() + .map(|c| c / 2) + .unwrap_or(2) as u64; + let tip = 0; + let extra: SignedExtra = ( + RestrictFunctionality, + frame_system::CheckSpecVersion::::new(), + frame_system::CheckTxVersion::::new(), + frame_system::CheckGenesis::::new(), + frame_system::CheckEra::::from(generic::Era::mortal(period, current_block)), + frame_system::CheckNonce::::from(nonce), + frame_system::CheckWeight::::new(), + pallet_transaction_payment::ChargeTransactionPayment::::from(tip), + registrar::LimitParathreadCommits::::new(), + parachains::ValidateDoubleVoteReports::::new(), + ); + let function = polkadot_test_runtime::Call::Sudo(pallet_sudo::Call::sudo(Box::new( + polkadot_test_runtime::Call::Registrar(registrar::Call::register_para( + 100.into(), + Info { + scheduling: Scheduling::Always, + }, + wasm.into(), + genesis_state.into(), + )), + ))); + let raw_payload = SignedPayload::from_raw( + function.clone(), + extra.clone(), + ((), + VERSION.spec_version, + VERSION.transaction_version, + genesis_block, + current_block_hash, + (), (), (), (), ()), + ); + let signature = raw_payload.using_encoded(|e| Alice.sign(e)); + let extrinsic = polkadot_test_runtime::UncheckedExtrinsic::new_signed( + function.clone(), + polkadot_test_runtime::Address::Id(Alice.public().into()), + polkadot_primitives::Signature::Sr25519(signature.clone()), + extra.clone(), + ); + + let (res, _mem, _rx) = alice.send_transaction(extrinsic.into()).await; + + assert!(res.is_some(), "return value expected"); + let json = serde_json::from_str::(res.unwrap().as_str()).expect("valid JSON"); + assert!(json.is_object(), "JSON is an object"); + let object = json.as_object().unwrap(); + assert!(object.contains_key("jsonrpc"), "key jsonrpc exists"); + let result = object.get("result"); + assert!(result.is_some(), "key result exists"); + let result = result.unwrap(); + assert_eq!(result.as_str().map(|x| x.starts_with("0x")), Some(true), "result starts with 0x"); + + alice.task_manager.terminate(); + } + .fuse(); + + pin_mut!(t1, t2); + + select! { + _ = t1 => { + panic!("the test took too long, maybe no blocks have been produced"); + }, + _ = t2 => {}, + } +} From 73ae4732d07f7515c7c6c5d1b995040cbae8d537 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 1 Jul 2020 11:58:41 +0200 Subject: [PATCH 50/92] Ensure task_manager dropped after task finish --- Cargo.lock | 11 --- polkadot-test-service/Cargo.toml | 2 +- polkadot-test-service/tests/build-blocks.rs | 73 ++++++++++--------- .../tests/send-transaction.rs | 45 ++++++------ 4 files changed, 62 insertions(+), 69 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 408b74615c94..23149b920965 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -208,23 +208,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" -[[package]] -name = "async-attributes" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd3d156917d94862e779f356c5acae312b08fd3121e792c857d7928c8088423" -dependencies = [ - "quote 1.0.7", - "syn 1.0.31", -] - [[package]] name = "async-std" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "538ecb01eb64eecd772087e5b6f7540cbc917f047727339a472dafed2185b267" dependencies = [ - "async-attributes", "async-task", "broadcaster", "crossbeam-channel", diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 237801c64b3f..eb2750f19d03 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -40,7 +40,7 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] -async-std = { version = "1.2.0", features = [ "attributes" ] } +async-std = "1.5" serde_json = "1.0" polkadot-runtime-common = { path = "../runtime/common" } sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 85059ddffa44..006dd9e9bbf9 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -1,4 +1,4 @@ -use async_std::task::sleep; +use async_std::task::{block_on, sleep}; use futures::{future, pin_mut, select, FutureExt as _}; use polkadot_test_service::*; use service::TaskExecutor; @@ -7,12 +7,26 @@ use std::time::Duration; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); -#[async_std::test] -async fn ensure_test_service_build_blocks() { +#[test] +fn ensure_test_service_build_blocks() { let task_executor: TaskExecutor = (|fut, _| { async_std::task::spawn(fut); }) .into(); + let mut alice = run_test_node( + task_executor.clone(), + Sr25519Keyring::Alice, + || {}, + Vec::new(), + ) + .unwrap(); + let mut bob = run_test_node( + task_executor.clone(), + Sr25519Keyring::Bob, + || {}, + vec![alice.multiaddr_with_peer_id.clone()], + ) + .unwrap(); let t1 = sleep(Duration::from_secs( INTEGRATION_TEST_ALLOWED_TIME .and_then(|x| x.parse().ok()) @@ -20,42 +34,33 @@ async fn ensure_test_service_build_blocks() { )) .fuse(); let t2 = async { - let mut alice = run_test_node( - task_executor.clone(), - Sr25519Keyring::Alice, - || {}, - Vec::new(), - ) - .unwrap(); + { + let t1 = future::join(alice.wait_for_blocks(3), bob.wait_for_blocks(3)).fuse(); + let t2 = alice.task_manager.future().fuse(); + let t3 = bob.task_manager.future().fuse(); - let mut bob = run_test_node( - task_executor.clone(), - Sr25519Keyring::Bob, - || {}, - vec![alice.multiaddr_with_peer_id.clone()], - ) - .unwrap(); + pin_mut!(t1, t2, t3); - let t1 = future::join(alice.wait_for_blocks(3), bob.wait_for_blocks(3)).fuse(); - let t2 = alice.task_manager.future().fuse(); - let t3 = bob.task_manager.future().fuse(); - - pin_mut!(t1, t2, t3); - - select! { - _ = t1 => {}, - _ = t2 => panic!("service Alice failed"), - _ = t3 => panic!("service Bob failed"), + select! { + _ = t1 => {}, + _ = t2 => panic!("service Alice failed"), + _ = t3 => panic!("service Bob failed"), + } } + + alice.task_manager.terminate(); + bob.task_manager.terminate(); } .fuse(); - pin_mut!(t1, t2); + block_on(async { + pin_mut!(t1, t2); - select! { - _ = t1 => { - panic!("the test took too long, maybe no blocks have been produced"); - }, - _ = t2 => {}, - } + select! { + _ = t1 => { + panic!("the test took too long, maybe no blocks have been produced"); + }, + _ = t2 => {}, + } + }); } diff --git a/polkadot-test-service/tests/send-transaction.rs b/polkadot-test-service/tests/send-transaction.rs index f97d096ebfb3..528bda4d176d 100644 --- a/polkadot-test-service/tests/send-transaction.rs +++ b/polkadot-test-service/tests/send-transaction.rs @@ -1,10 +1,9 @@ -use async_std::task::sleep; +use async_std::task::{block_on, sleep}; use futures::{pin_mut, select, FutureExt as _}; use polkadot_primitives::parachain::{Info, Scheduling}; use polkadot_runtime_common::{parachains, registrar, BlockHashCount}; use polkadot_test_runtime::{RestrictFunctionality, Runtime, SignedExtra, SignedPayload, VERSION}; use polkadot_test_service::*; -use service::TaskExecutor; use sp_arithmetic::traits::SaturatedConversion; use sp_blockchain::HeaderBackend; use sp_keyring::Sr25519Keyring::Alice; @@ -13,12 +12,18 @@ use std::time::Duration; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); -#[async_std::test] -async fn send_transaction_actually_work() { - let task_executor: TaskExecutor = (|fut, _| { - async_std::task::spawn(fut); - }) - .into(); +#[test] +fn send_transaction_actually_work() { + let mut alice = run_test_node( + (|fut, _| { + async_std::task::spawn(fut); + }) + .into(), + Alice, + || {}, + Vec::new(), + ) + .unwrap(); let t1 = sleep(Duration::from_secs( INTEGRATION_TEST_ALLOWED_TIME .and_then(|x| x.parse().ok()) @@ -26,14 +31,6 @@ async fn send_transaction_actually_work() { )) .fuse(); let t2 = async { - let mut alice = run_test_node( - task_executor.clone(), - Alice, - || {}, - Vec::new(), - ) - .unwrap(); - let wasm = vec![0_u8; 32]; let genesis_state = b"0x0x000000000000000000000000000000000000000000000000000000000000000000eb21415d4113e9bb8c\ 0c3fa5533d873c439e94960c56f4c1dd1105ddc6b7b2e903170a2e7597b7b7e3d84c05391d139a62b157e78786\ @@ -103,12 +100,14 @@ async fn send_transaction_actually_work() { } .fuse(); - pin_mut!(t1, t2); + block_on(async move { + pin_mut!(t1, t2); - select! { - _ = t1 => { - panic!("the test took too long, maybe no blocks have been produced"); - }, - _ = t2 => {}, - } + select! { + _ = t1 => { + panic!("the test took too long, maybe no blocks have been produced"); + }, + _ = t2 => {}, + } + }); } From b8ec09d83738a0884357ccaa00e0f946008d0bb0 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 1 Jul 2020 14:54:53 +0200 Subject: [PATCH 51/92] Improve logging by using informant prefix --- Cargo.lock | 1 + polkadot-test-service/Cargo.toml | 1 + polkadot-test-service/src/lib.rs | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 23149b920965..4a1c7bae0d67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4871,6 +4871,7 @@ dependencies = [ "sc-consensus-babe", "sc-executor", "sc-finality-grandpa", + "sc-informant", "sc-network", "sc-service", "sc-transaction-pool", diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index eb2750f19d03..75970f381c45 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -38,6 +38,7 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = " sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-informant = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] async-std = "1.5" diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index eba4671792c8..f47d1ec0295b 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -38,6 +38,7 @@ use polkadot_service::{ use sc_chain_spec::ChainSpec; use sc_client_api::{execution_extensions::ExecutionStrategies, BlockchainEvents}; use sc_executor::native_executor_instance; +use sc_informant::OutputFormat; use sc_network::{ config::{NetworkConfiguration, TransportConfig}, multiaddr, NetworkService, @@ -119,6 +120,10 @@ pub fn node_config( Default::default(), None, ); + let informant_output_format = OutputFormat { + enable_color: false, + prefix: format!("[{}] ", key_seed), + }; network_config.boot_nodes = boot_nodes; @@ -177,7 +182,7 @@ pub fn node_config( max_runtime_instances: 8, announce_block: true, base_path: Some(base_path), - informant_output_format: Default::default(), + informant_output_format, }) } From 36fec81c32a69c07355705394bbc8594a834544c Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 1 Jul 2020 17:07:45 +0200 Subject: [PATCH 52/92] Update polkadot-test-service/src/lib.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bastian Köcher --- polkadot-test-service/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index f47d1ec0295b..f1716f8bc647 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -272,7 +272,7 @@ where C: BlockchainEvents, B: BlockT, { - assert_ne!(count, 0, "'count' argument must be greater than 1"); + assert!(count > 0, "'count' argument must be greater than 0"); let mut import_notification_stream = client.import_notification_stream(); let mut blocks = HashSet::new(); From 178ab7b76e820d0967a3cce94970a41a1196e2f3 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 1 Jul 2020 17:08:57 +0200 Subject: [PATCH 53/92] Update polkadot-test-service/src/lib.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bastian Köcher --- polkadot-test-service/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index f1716f8bc647..ed1cce97befb 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -230,7 +230,7 @@ pub struct PolkadotTestNode { /// Node's handles. pub handles: FullNodeHandles, /// The `MultiaddrWithPeerId` to this node. This is useful if you want to pass it as "boot node" to other nodes. - pub multiaddr_with_peer_id: MultiaddrWithPeerId, + pub addr: MultiaddrWithPeerId, /// RPCHandlers to make RPC queries. pub rpc_handlers: Arc, } From de65c052662c3fbb70b23077a0947a30c3f66d7f Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 1 Jul 2020 17:08:57 +0200 Subject: [PATCH 54/92] Update polkadot-test-service/src/lib.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bastian Köcher --- polkadot-test-service/src/lib.rs | 4 ++-- polkadot-test-service/tests/build-blocks.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index ed1cce97befb..519e0d501c7a 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -208,13 +208,13 @@ pub fn run_test_node( polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000)?; let peer_id = network.local_peer_id().clone(); - let multiaddr_with_peer_id = MultiaddrWithPeerId { multiaddr, peer_id }; + let addr = MultiaddrWithPeerId { multiaddr, peer_id }; let node = PolkadotTestNode { task_manager, client, handles, - multiaddr_with_peer_id, + addr, rpc_handlers, }; diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 006dd9e9bbf9..3d6f45199ced 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -24,7 +24,7 @@ fn ensure_test_service_build_blocks() { task_executor.clone(), Sr25519Keyring::Bob, || {}, - vec![alice.multiaddr_with_peer_id.clone()], + vec![alice.addr.clone()], ) .unwrap(); let t1 = sleep(Duration::from_secs( From abf0f35daabb5f0c5cf9e663b4621df8d82ad913 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 1 Jul 2020 17:23:10 +0200 Subject: [PATCH 55/92] Replace asserts with expects --- polkadot-test-service/tests/send-transaction.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/polkadot-test-service/tests/send-transaction.rs b/polkadot-test-service/tests/send-transaction.rs index 528bda4d176d..887455a11488 100644 --- a/polkadot-test-service/tests/send-transaction.rs +++ b/polkadot-test-service/tests/send-transaction.rs @@ -86,14 +86,12 @@ fn send_transaction_actually_work() { let (res, _mem, _rx) = alice.send_transaction(extrinsic.into()).await; - assert!(res.is_some(), "return value expected"); - let json = serde_json::from_str::(res.unwrap().as_str()).expect("valid JSON"); - assert!(json.is_object(), "JSON is an object"); - let object = json.as_object().unwrap(); + let res = res.expect("return value expected"); + let json = serde_json::from_str::(res.as_str()).expect("valid JSON"); + let object = json.as_object().expect("JSON is an object"); assert!(object.contains_key("jsonrpc"), "key jsonrpc exists"); let result = object.get("result"); - assert!(result.is_some(), "key result exists"); - let result = result.unwrap(); + let result = result.expect("key result exists"); assert_eq!(result.as_str().map(|x| x.starts_with("0x")), Some(true), "result starts with 0x"); alice.task_manager.terminate(); From 6bae98402b7de1f394ad4d060788c9acdff7a403 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 1 Jul 2020 17:25:39 +0200 Subject: [PATCH 56/92] Merged imports --- polkadot-test-service/src/lib.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 519e0d501c7a..2e8f22b72431 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -26,11 +26,9 @@ use futures::{future::Future, StreamExt}; use grandpa::FinalityProofProvider as GrandpaFinalityProofProvider; use log::info; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; -use polkadot_primitives::parachain::CollatorId; -use polkadot_primitives::Block; use polkadot_primitives::{ - parachain::{self}, - BlockId, Hash, + parachain::{self, CollatorId}, + Block, BlockId, Hash, }; use polkadot_service::{ new_full, new_full_start, BlockT, FullNodeHandles, PolkadotClient, ServiceComponents, From 261c552d38d3ccd6d2e053b5395a81dce89a7ac1 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 1 Jul 2020 17:26:54 +0200 Subject: [PATCH 57/92] Revert slot duration change --- runtime/test-runtime/src/constants.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/test-runtime/src/constants.rs b/runtime/test-runtime/src/constants.rs index ccac55d2b6f0..b0431e55f268 100644 --- a/runtime/test-runtime/src/constants.rs +++ b/runtime/test-runtime/src/constants.rs @@ -29,7 +29,7 @@ pub mod time { use primitives::{Moment, BlockNumber}; // Testnet pub const MILLISECS_PER_BLOCK: Moment = 1000; - pub const SLOT_DURATION: Moment = 2000; + pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK; // Testnet pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES; From 4fc1a58b3c2b31f1a08476d6ca6c7d8b278b59f4 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 1 Jul 2020 18:27:36 +0200 Subject: [PATCH 58/92] Helper to call a function --- polkadot-test-service/Cargo.toml | 10 +-- polkadot-test-service/src/lib.rs | 71 ++++++++++++++++++- .../tests/send-transaction.rs | 47 +----------- 3 files changed, 77 insertions(+), 51 deletions(-) diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 75970f381c45..3c5c6c88ebe9 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -18,6 +18,7 @@ polkadot-test-runtime = { path = "../runtime/test-runtime" } polkadot-network = { path = "../network" } polkadot-rpc = { path = "../rpc" } polkadot-service = { path = "../service" } +polkadot-runtime-common = { path = "../runtime/common" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -39,13 +40,12 @@ sc-executor = { git = "https://github.com/paritytech/substrate", branch = "maste frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-informant = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] async-std = "1.5" serde_json = "1.0" -polkadot-runtime-common = { path = "../runtime/common" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 2e8f22b72431..8fe423b5507d 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -30,9 +30,11 @@ use polkadot_primitives::{ parachain::{self, CollatorId}, Block, BlockId, Hash, }; +use polkadot_runtime_common::{parachains, registrar, BlockHashCount}; use polkadot_service::{ new_full, new_full_start, BlockT, FullNodeHandles, PolkadotClient, ServiceComponents, }; +use polkadot_test_runtime::{RestrictFunctionality, Runtime, SignedExtra, SignedPayload, VERSION}; use sc_chain_spec::ChainSpec; use sc_client_api::{execution_extensions::ExecutionStrategies, BlockchainEvents}; use sc_executor::native_executor_instance; @@ -47,8 +49,10 @@ use service::{ RpcHandlers, RpcSession, TaskExecutor, TaskManager, }; use service::{BasePath, Configuration, Role, TFullBackend}; +use sp_arithmetic::traits::SaturatedConversion; +use sp_blockchain::HeaderBackend; use sp_keyring::Sr25519Keyring; -use sp_runtime::{codec::Encode, OpaqueExtrinsic}; +use sp_runtime::{codec::Encode, generic, OpaqueExtrinsic}; use sp_state_machine::BasicExternalities; use std::collections::HashSet; use std::sync::Arc; @@ -245,7 +249,9 @@ where wait_for_blocks(client.clone(), count) } +} +impl PolkadotTestNode { /// Send a transaction through the RPCHandlers. pub fn send_transaction( &self, @@ -263,6 +269,69 @@ where } } +impl PolkadotTestNode +where + C: HeaderBackend, +{ + /// Send a transaction through RPCHandlers to call a function. + pub async fn call_function( + &self, + function: polkadot_test_runtime::Call, + caller: Sr25519Keyring, + ) -> ( + Option, + RpcSession, + futures01::sync::mpsc::Receiver, + ) { + let current_block_hash = self.client.info().best_hash; + let current_block = self.client.info().best_number.saturated_into(); + let genesis_block = self.client.hash(0).unwrap().unwrap(); + let nonce = 0; + let period = BlockHashCount::get() + .checked_next_power_of_two() + .map(|c| c / 2) + .unwrap_or(2) as u64; + let tip = 0; + let extra: SignedExtra = ( + RestrictFunctionality, + frame_system::CheckSpecVersion::::new(), + frame_system::CheckTxVersion::::new(), + frame_system::CheckGenesis::::new(), + frame_system::CheckEra::::from(generic::Era::mortal(period, current_block)), + frame_system::CheckNonce::::from(nonce), + frame_system::CheckWeight::::new(), + pallet_transaction_payment::ChargeTransactionPayment::::from(tip), + registrar::LimitParathreadCommits::::new(), + parachains::ValidateDoubleVoteReports::::new(), + ); + let raw_payload = SignedPayload::from_raw( + function.clone(), + extra.clone(), + ( + (), + VERSION.spec_version, + VERSION.transaction_version, + genesis_block, + current_block_hash, + (), + (), + (), + (), + (), + ), + ); + let signature = raw_payload.using_encoded(|e| caller.sign(e)); + let extrinsic = polkadot_test_runtime::UncheckedExtrinsic::new_signed( + function.clone(), + polkadot_test_runtime::Address::Id(caller.public().into()), + polkadot_primitives::Signature::Sr25519(signature.clone()), + extra.clone(), + ); + + self.send_transaction(extrinsic.into()).await + } +} + /// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks /// are ever created, thus you should restrict the maximum amount of time of the test execution. pub async fn wait_for_blocks(client: Arc, count: usize) diff --git a/polkadot-test-service/tests/send-transaction.rs b/polkadot-test-service/tests/send-transaction.rs index 887455a11488..7f60f12107fc 100644 --- a/polkadot-test-service/tests/send-transaction.rs +++ b/polkadot-test-service/tests/send-transaction.rs @@ -1,13 +1,9 @@ use async_std::task::{block_on, sleep}; use futures::{pin_mut, select, FutureExt as _}; use polkadot_primitives::parachain::{Info, Scheduling}; -use polkadot_runtime_common::{parachains, registrar, BlockHashCount}; -use polkadot_test_runtime::{RestrictFunctionality, Runtime, SignedExtra, SignedPayload, VERSION}; +use polkadot_runtime_common::{registrar}; use polkadot_test_service::*; -use sp_arithmetic::traits::SaturatedConversion; -use sp_blockchain::HeaderBackend; use sp_keyring::Sr25519Keyring::Alice; -use sp_runtime::{codec::Encode, generic}; use std::time::Duration; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); @@ -35,27 +31,6 @@ fn send_transaction_actually_work() { let genesis_state = b"0x0x000000000000000000000000000000000000000000000000000000000000000000eb21415d4113e9bb8c\ 0c3fa5533d873c439e94960c56f4c1dd1105ddc6b7b2e903170a2e7597b7b7e3d84c05391d139a62b157e78786\ d8c082f29dcf4c11131400".to_vec(); - let current_block_hash = alice.client.info().best_hash; - let current_block = alice.client.info().best_number.saturated_into(); - let genesis_block = alice.client.hash(0).unwrap().unwrap(); - let nonce = 0; - let period = BlockHashCount::get() - .checked_next_power_of_two() - .map(|c| c / 2) - .unwrap_or(2) as u64; - let tip = 0; - let extra: SignedExtra = ( - RestrictFunctionality, - frame_system::CheckSpecVersion::::new(), - frame_system::CheckTxVersion::::new(), - frame_system::CheckGenesis::::new(), - frame_system::CheckEra::::from(generic::Era::mortal(period, current_block)), - frame_system::CheckNonce::::from(nonce), - frame_system::CheckWeight::::new(), - pallet_transaction_payment::ChargeTransactionPayment::::from(tip), - registrar::LimitParathreadCommits::::new(), - parachains::ValidateDoubleVoteReports::::new(), - ); let function = polkadot_test_runtime::Call::Sudo(pallet_sudo::Call::sudo(Box::new( polkadot_test_runtime::Call::Registrar(registrar::Call::register_para( 100.into(), @@ -66,25 +41,7 @@ fn send_transaction_actually_work() { genesis_state.into(), )), ))); - let raw_payload = SignedPayload::from_raw( - function.clone(), - extra.clone(), - ((), - VERSION.spec_version, - VERSION.transaction_version, - genesis_block, - current_block_hash, - (), (), (), (), ()), - ); - let signature = raw_payload.using_encoded(|e| Alice.sign(e)); - let extrinsic = polkadot_test_runtime::UncheckedExtrinsic::new_signed( - function.clone(), - polkadot_test_runtime::Address::Id(Alice.public().into()), - polkadot_primitives::Signature::Sr25519(signature.clone()), - extra.clone(), - ); - - let (res, _mem, _rx) = alice.send_transaction(extrinsic.into()).await; + let (res, _mem, _rx) = alice.call_function(function, Alice).await; let res = res.expect("return value expected"); let json = serde_json::from_str::(res.as_str()).expect("valid JSON"); From 5796cd53373a8b0d16cac1e2c3611fa214012c1e Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 2 Jul 2020 13:00:38 +0200 Subject: [PATCH 59/92] Update substrate branch to cecton-testing-helpers --- Cargo.lock | 287 +++++++++--------- 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 +- node/messages/Cargo.toml | 2 +- node/overseer/Cargo.toml | 2 +- node/primitives/Cargo.toml | 2 +- node/service/Cargo.toml | 74 ++--- 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 +- polkadot-test-service/Cargo.toml | 53 ++-- polkadot-test-service/src/lib.rs | 93 +----- polkadot-test-service/tests/build-blocks.rs | 3 +- primitives/Cargo.toml | 22 +- rpc/Cargo.toml | 34 +-- runtime/common/Cargo.toml | 52 ++-- runtime/kusama/Cargo.toml | 108 +++---- runtime/parachains/Cargo.toml | 50 +-- runtime/polkadot/Cargo.toml | 104 +++---- runtime/test-runtime/Cargo.toml | 76 ++--- runtime/test-runtime/client/Cargo.toml | 22 +- runtime/westend/Cargo.toml | 110 +++---- service/Cargo.toml | 72 ++--- statement-table/Cargo.toml | 2 +- validation/Cargo.toml | 36 +-- 30 files changed, 629 insertions(+), 697 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4a1c7bae0d67..87ce7f437e59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1250,7 +1250,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", ] @@ -1258,7 +1258,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -1275,7 +1275,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1293,7 +1293,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -1308,7 +1308,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "serde", @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "bitmask", "frame-metadata", @@ -1344,7 +1344,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1355,7 +1355,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1367,7 +1367,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1377,7 +1377,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1393,7 +1393,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -1407,7 +1407,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-api", @@ -3364,7 +3364,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3380,7 +3380,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3395,7 +3395,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3417,7 +3417,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3431,7 +3431,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3447,7 +3447,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3462,7 +3462,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3477,7 +3477,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3493,7 +3493,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3513,7 +3513,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3529,7 +3529,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3549,7 +3549,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3565,7 +3565,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3579,7 +3579,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3594,7 +3594,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3608,7 +3608,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3623,7 +3623,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3644,7 +3644,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3659,7 +3659,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3672,7 +3672,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "enumflags2", "frame-support", @@ -3687,7 +3687,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3702,7 +3702,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3722,7 +3722,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3736,7 +3736,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3750,7 +3750,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3772,7 +3772,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3783,7 +3783,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3797,7 +3797,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3815,7 +3815,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3830,7 +3830,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3848,7 +3848,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "parity-scale-codec", @@ -3861,7 +3861,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3876,7 +3876,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3892,7 +3892,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4886,6 +4886,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", + "substrate-test-client", "tempfile", ] @@ -5700,7 +5701,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "bytes 0.5.4", "derive_more 0.99.8", @@ -5727,7 +5728,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5751,7 +5752,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5767,7 +5768,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5783,7 +5784,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5794,7 +5795,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5834,7 +5835,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "fnv", @@ -5870,7 +5871,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "blake2-rfc", "hash-db", @@ -5899,7 +5900,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5910,7 +5911,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "fork-tree", @@ -5952,7 +5953,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -5976,7 +5977,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5989,7 +5990,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6011,7 +6012,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6025,7 +6026,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "lazy_static", @@ -6053,7 +6054,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6070,7 +6071,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6085,7 +6086,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6106,7 +6107,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "assert_matches", "derive_more 0.99.8", @@ -6144,7 +6145,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "finality-grandpa", @@ -6161,7 +6162,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6180,7 +6181,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "hex", @@ -6196,7 +6197,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "hash-db", "lazy_static", @@ -6215,7 +6216,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "bitflags", "bs58", @@ -6267,7 +6268,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6282,7 +6283,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "env_logger", "futures 0.3.5", @@ -6309,7 +6310,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "bytes 0.5.4", "fnv", @@ -6336,7 +6337,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "libp2p", @@ -6349,7 +6350,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6358,7 +6359,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "hash-db", @@ -6390,7 +6391,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6414,7 +6415,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6430,7 +6431,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "directories", @@ -6493,7 +6494,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6507,7 +6508,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6528,7 +6529,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "erased-serde", "log 0.4.8", @@ -6545,7 +6546,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6565,7 +6566,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6658,6 +6659,15 @@ dependencies = [ "untrusted", ] +[[package]] +name = "secrecy" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9182278ed645df3477a9c27bfee0621c621aa16f6972635f7f795dae3d81070f" +dependencies = [ + "zeroize", +] + [[package]] name = "security-framework" version = "0.4.4" @@ -6942,7 +6952,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6954,7 +6964,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "hash-db", "parity-scale-codec", @@ -6969,7 +6979,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6981,7 +6991,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "serde", @@ -6993,7 +7003,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7006,7 +7016,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-api", @@ -7018,7 +7028,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7029,7 +7039,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-api", @@ -7041,7 +7051,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7057,7 +7067,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "serde", "serde_json", @@ -7066,7 +7076,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7090,7 +7100,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-api", @@ -7104,7 +7114,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "merlin", "parity-scale-codec", @@ -7122,7 +7132,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7134,7 +7144,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "base58", "blake2-rfc", @@ -7158,6 +7168,7 @@ dependencies = [ "rand 0.7.3", "regex", "schnorrkel", + "secrecy", "serde", "sha2", "sp-debug-derive", @@ -7176,7 +7187,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7185,7 +7196,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7195,7 +7206,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "environmental", "parity-scale-codec", @@ -7206,7 +7217,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7222,7 +7233,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7232,7 +7243,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "parity-scale-codec", @@ -7244,7 +7255,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "hash-db", @@ -7265,7 +7276,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "lazy_static", "sp-core", @@ -7276,7 +7287,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "serde", @@ -7288,7 +7299,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7299,7 +7310,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "sp-api", "sp-core", @@ -7309,7 +7320,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "backtrace", "log 0.4.8", @@ -7318,7 +7329,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "serde", "sp-core", @@ -7327,7 +7338,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "either", "hash256-std-hasher", @@ -7349,7 +7360,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7364,7 +7375,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "Inflector", "proc-macro-crate", @@ -7376,7 +7387,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "serde", "serde_json", @@ -7385,7 +7396,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-api", @@ -7398,7 +7409,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7408,7 +7419,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7429,12 +7440,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7446,7 +7457,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7460,7 +7471,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "log 0.4.8", "rental", @@ -7470,7 +7481,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7486,7 +7497,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "hash-db", "memory-db", @@ -7500,7 +7511,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "futures-core", @@ -7512,7 +7523,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7524,7 +7535,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7664,7 +7675,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "chrono", "clear_on_drop", @@ -7691,7 +7702,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "platforms", ] @@ -7699,7 +7710,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7722,7 +7733,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "async-std", "derive_more 0.99.8", @@ -7736,10 +7747,12 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ + "futures 0.1.29", "futures 0.3.5", "hash-db", + "hex", "parity-scale-codec", "sc-client-api", "sc-client-db", @@ -7758,7 +7771,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "cfg-if", "frame-executive", @@ -7791,14 +7804,14 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate)", + "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers)", "trie-db 0.21.0", ] [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7819,7 +7832,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" [[package]] name = "substrate-wasm-builder-runner" diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index 503e897ceadb..bdd852888132 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 = "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" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } kvdb = "0.6.0" kvdb-memorydb = "0.6.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index b395ccba9dc3..86d09238e362 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -17,26 +17,26 @@ 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-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 = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } service = { package = "polkadot-service", path = "../service", default-features = false, optional = true } service-new = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true } 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 = "cecton-testing-helpers", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", 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 = "cecton-testing-helpers" } [features] default = [ "wasmtime", "db", "cli", "service-old" ] diff --git a/collator/Cargo.toml b/collator/Cargo.toml index 42e733419fef..169f4cea8762 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 = "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" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } polkadot-primitives = { path = "../primitives" } polkadot-cli = { path = "../cli" } polkadot-network = { path = "../network" } @@ -29,7 +29,7 @@ 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 = "cecton-testing-helpers" } [features] default = ["service-old"] diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index 9c49e33f407c..1ad1701a3ce4 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 = "cecton-testing-helpers" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } derive_more = "0.15.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index 0735fec5907f..be6dfbe4b320 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 = "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 = "cecton-testing-helpers" } +sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 = "cecton-testing-helpers" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } diff --git a/network/test/Cargo.toml b/network/test/Cargo.toml index ad8cafe3f453..b273b64191b4 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 = "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" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "cecton-testing-helpers" } +sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" } diff --git a/node/messages/Cargo.toml b/node/messages/Cargo.toml index 9edb5a051987..b36956481fc7 100644 --- a/node/messages/Cargo.toml +++ b/node/messages/Cargo.toml @@ -9,5 +9,5 @@ description = "Message types used by Subsystems" polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } polkadot-node-primitives = { path = "../primitives" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } futures = "0.3.5" diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index 88626e2e05f3..f1d3926740ba 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -10,7 +10,7 @@ log = "0.4.8" futures-timer = "3.0.2" streamunordered = "0.5.1" polkadot-primitives = { path = "../../primitives" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } messages = { package = "polkadot-node-messages", path = "../messages" } [dev-dependencies] diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml index f317565b2e99..03cb17615c38 100644 --- a/node/primitives/Cargo.toml +++ b/node/primitives/Cargo.toml @@ -9,4 +9,4 @@ description = "Primitives types for the Node-side" polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } parity-scale-codec = { version = "1.3.0", default-features = false, features = ["derive"] } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 74069f0233af..f459557e91b6 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -19,47 +19,47 @@ 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-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" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } [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 = "cecton-testing-helpers" } env_logger = "0.7.0" [features] diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index e401e2baa53f..83a881edd640 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 = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", optional = true, default-features = false } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 7f04dc5946a3..1a67b3ff792d 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 = "cecton-testing-helpers", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 3363a908a943..2e7d400037cc 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 = "master" } -client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 4dfcde274a73..721fe1e3f442 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 = "cecton-testing-helpers", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" } diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 3c5c6c88ebe9..d8ed33547e72 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -19,33 +19,34 @@ polkadot-network = { path = "../network" } polkadot-rpc = { path = "../rpc" } polkadot-service = { path = "../service" } polkadot-runtime-common = { path = "../runtime/common" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { 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 } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-informant = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-informant = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } [dev-dependencies] async-std = "1.5" serde_json = "1.0" -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 8fe423b5507d..f0317557b256 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -22,7 +22,6 @@ mod chain_spec; pub use chain_spec::*; use consensus_common::{block_validation::Chain, SelectChain}; -use futures::{future::Future, StreamExt}; use grandpa::FinalityProofProvider as GrandpaFinalityProofProvider; use log::info; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; @@ -32,11 +31,11 @@ use polkadot_primitives::{ }; use polkadot_runtime_common::{parachains, registrar, BlockHashCount}; use polkadot_service::{ - new_full, new_full_start, BlockT, FullNodeHandles, PolkadotClient, ServiceComponents, + new_full, new_full_start, FullNodeHandles, PolkadotClient, ServiceComponents, }; use polkadot_test_runtime::{RestrictFunctionality, Runtime, SignedExtra, SignedPayload, VERSION}; use sc_chain_spec::ChainSpec; -use sc_client_api::{execution_extensions::ExecutionStrategies, BlockchainEvents}; +use sc_client_api::execution_extensions::ExecutionStrategies; use sc_executor::native_executor_instance; use sc_informant::OutputFormat; use sc_network::{ @@ -52,11 +51,11 @@ use service::{BasePath, Configuration, Role, TFullBackend}; use sp_arithmetic::traits::SaturatedConversion; use sp_blockchain::HeaderBackend; use sp_keyring::Sr25519Keyring; -use sp_runtime::{codec::Encode, generic, OpaqueExtrinsic}; +use sp_runtime::{codec::Encode, generic}; use sp_state_machine::BasicExternalities; -use std::collections::HashSet; use std::sync::Arc; use std::time::Duration; +use substrate_test_client::RpcHandlersExt; native_executor_instance!( pub PolkadotTestExecutor, @@ -237,38 +236,6 @@ pub struct PolkadotTestNode { pub rpc_handlers: Arc, } -impl PolkadotTestNode -where - C: BlockchainEvents, -{ - /// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks - /// are ever created, thus you should restrict the maximum amount of time of the test execution. - pub fn wait_for_blocks(&self, count: usize) -> impl Future { - assert_ne!(count, 0, "'count' argument must be greater than 1"); - let client = self.client.clone(); - - wait_for_blocks(client.clone(), count) - } -} - -impl PolkadotTestNode { - /// Send a transaction through the RPCHandlers. - pub fn send_transaction( - &self, - extrinsic: OpaqueExtrinsic, - ) -> impl Future< - Output = ( - Option, - RpcSession, - futures01::sync::mpsc::Receiver, - ), - > { - let rpc_handlers = self.rpc_handlers.clone(); - - send_transaction(rpc_handlers, extrinsic) - } -} - impl PolkadotTestNode where C: HeaderBackend, @@ -328,56 +295,6 @@ where extra.clone(), ); - self.send_transaction(extrinsic.into()).await + self.rpc_handlers.send_transaction(extrinsic.into()).await } } - -/// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks -/// are ever created, thus you should restrict the maximum amount of time of the test execution. -pub async fn wait_for_blocks(client: Arc, count: usize) -where - C: BlockchainEvents, - B: BlockT, -{ - assert!(count > 0, "'count' argument must be greater than 0"); - - let mut import_notification_stream = client.import_notification_stream(); - let mut blocks = HashSet::new(); - - while let Some(notification) = import_notification_stream.next().await { - blocks.insert(notification.hash); - if blocks.len() == count { - break; - } - } -} - -/// Send a transaction through the RPCHandlers. -pub async fn send_transaction( - rpc_handlers: Arc, - extrinsic: OpaqueExtrinsic, -) -> ( - Option, - RpcSession, - futures01::sync::mpsc::Receiver, -) { - let (tx, rx) = futures01::sync::mpsc::channel(0); - let mem = RpcSession::new(tx.into()); - let res = rpc_handlers - .rpc_query( - &mem, - format!( - r#"{{ - "jsonrpc": "2.0", - "method": "author_submitExtrinsic", - "params": ["0x{}"], - "id": 0 - }}"#, - hex::encode(extrinsic.encode()) - ) - .as_str(), - ) - .await; - - (res, mem, rx) -} diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 3d6f45199ced..c8ee2b5cfd98 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -4,6 +4,7 @@ use polkadot_test_service::*; use service::TaskExecutor; use sp_keyring::Sr25519Keyring; use std::time::Duration; +use substrate_test_client::BlockchainEventsExt; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); @@ -35,7 +36,7 @@ fn ensure_test_service_build_blocks() { .fuse(); let t2 = async { { - let t1 = future::join(alice.wait_for_blocks(3), bob.wait_for_blocks(3)).fuse(); + let t1 = future::join(alice.client.wait_for_blocks(3), bob.client.wait_for_blocks(3)).fuse(); let t2 = alice.task_manager.future().fuse(); let t3 = bob.task_manager.future().fuse(); diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index d327429b64e0..49da5fdb997e 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,21 +7,21 @@ 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 } -system = { package = "frame-system", 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 = "cecton-testing-helpers", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", 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 = "cecton-testing-helpers" } pretty_assertions = "0.5.1" [features] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index ce2f6382b468..488b1daad6b7 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -7,21 +7,21 @@ edition = "2018" [dependencies] jsonrpc-core = "14.0.3" polkadot-primitives = { path = "../primitives" } -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" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master"} -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "master"} -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "master"} -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { 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 = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 2b31e989c898..80fda29ccaaf 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -13,39 +13,39 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" -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-session = { 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 = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } -transaction-payment = { package = "pallet-transaction-payment", 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 = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } trie-db = "0.21.0" serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index b5494ab625e4..ce74caad809c 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -15,60 +15,60 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.0" -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 = "cecton-testing-helpers", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } -multisig = { package = "pallet-multisig", 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 } -proxy = { package = "pallet-proxy", 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 } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-system-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 } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -78,8 +78,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 = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index ab4ca5a78309..c4c54145239d 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -12,25 +12,25 @@ 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-session = { 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 = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.3.2", default-features = false, optional = true } @@ -40,13 +40,13 @@ rand_chacha = { version = "0.2.2", default-features = false } [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" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index 471efb0bacf0..56bf388ab8ac 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -15,58 +15,58 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.0" -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 = "cecton-testing-helpers", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } -multisig = { package = "pallet-multisig", 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 } -proxy = { package = "pallet-proxy", 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 } -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 } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-system-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 } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -76,8 +76,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 = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 1e41686e2365..8c46b19ca504 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -14,43 +14,43 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.0" -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 } -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 } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } -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 } -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 } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -60,8 +60,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 = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/test-runtime/client/Cargo.toml b/runtime/test-runtime/client/Cargo.toml index a9439e060968..5c4fd9c05404 100644 --- a/runtime/test-runtime/client/Cargo.toml +++ b/runtime/test-runtime/client/Cargo.toml @@ -6,19 +6,19 @@ edition = "2018" license = "GPL-3.0" [dependencies] -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-light = { 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" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-light = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", features = ["test-helpers"], default-features = false } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } codec = { package = "parity-scale-codec", version = "1.0.0" } -sc-client-api = { 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 = "cecton-testing-helpers" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } futures = "0.3.1" diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index deab7e0109d1..0aa33064e23c 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -15,61 +15,61 @@ serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.0" static_assertions = "1.1.0" -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 = "cecton-testing-helpers", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } -multisig = { package = "pallet-multisig", 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 } -proxy = { package = "pallet-proxy", 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 } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-system-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 } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -80,8 +80,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 = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } serde_json = "1.0.41" [build-dependencies] diff --git a/service/Cargo.toml b/service/Cargo.toml index 5eb47ec8875c..b272647859b9 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 = "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" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 = "cecton-testing-helpers" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } [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 = "cecton-testing-helpers" } env_logger = "0.7.0" [features] diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index 831ae6cd4354..c93a13a2be93 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 = "cecton-testing-helpers" } primitives = { package = "polkadot-primitives", path = "../primitives" } diff --git a/validation/Cargo.toml b/validation/Cargo.toml index 42e417fef6f0..95469bcf21ee 100644 --- a/validation/Cargo.toml +++ b/validation/Cargo.toml @@ -18,24 +18,24 @@ 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 = "cecton-testing-helpers" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } +runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } From 91bf6bbbd12d331d8b9afd3d7209b01349fcd518 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 2 Jul 2020 13:19:52 +0200 Subject: [PATCH 60/92] CLEANUP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- runtime/test-runtime/src/lib.rs | 62 --------------------------------- 1 file changed, 62 deletions(-) diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 1d5a7c40cd1e..7fa0c13ac05e 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -758,65 +758,3 @@ sp_api::impl_runtime_apis! { } } } - -trait Config { - type EpochDuration: Get; - type ExpectedBlockTime: Get; - type IndexDeposit: Get; - type ExistentialDeposit: Get; - type TransactionByteFee: Get; - type MinimumPeriod: Get; - type UncleGenerations: Get; - type Period: Get; - type Offset: Get; - type DisabledValidatorsThreshold: Get; - type SessionsPerEra: Get; - type BondingDuration: Get; - type SlashDeferDuration: Get; - type MaxNominatorRewardedPerValidator: Get; - type ElectionLookahead: Get; - type StakingUnsignedPriority: Get; - type MaxIterations: Get; - type MaxCodeSize: Get; - type MaxHeadDataSize: Get; - type ValidationUpgradeFrequency: Get; - type ValidationUpgradeDelay: Get; - type SlashPeriod: Get; - type OffencesWeightSoftLimit: Get; - type ParathreadDeposit: Get; - type MaxRetries: Get; - type LeasePeriod: Get; - type EndingPeriod: Get; - type MinVestedTransfer: Get; -} - -impl Config for Runtime { - type EpochDuration = EpochDuration; - type ExpectedBlockTime = ExpectedBlockTime; - type IndexDeposit = IndexDeposit; - type ExistentialDeposit = ExistentialDeposit; - type TransactionByteFee = TransactionByteFee; - type MinimumPeriod = MinimumPeriod; - type UncleGenerations = UncleGenerations; - type Period = Period; - type Offset = Offset; - type DisabledValidatorsThreshold = DisabledValidatorsThreshold; - type SessionsPerEra = SessionsPerEra; - type BondingDuration = BondingDuration; - type SlashDeferDuration = SlashDeferDuration; - type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; - type ElectionLookahead = ElectionLookahead; - type StakingUnsignedPriority = StakingUnsignedPriority; - type MaxIterations = MaxIterations; - type MaxCodeSize = MaxCodeSize; - type MaxHeadDataSize = MaxHeadDataSize; - type ValidationUpgradeFrequency = ValidationUpgradeFrequency; - type ValidationUpgradeDelay = ValidationUpgradeDelay; - type SlashPeriod = SlashPeriod; - type OffencesWeightSoftLimit = OffencesWeightSoftLimit; - type ParathreadDeposit = ParathreadDeposit; - type MaxRetries = MaxRetries; - type LeasePeriod = LeasePeriod; - type EndingPeriod = EndingPeriod; - type MinVestedTransfer = MinVestedTransfer; -} From a6a54b554fe4871f3ae8c2d2a1d70c690d9304ad Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 2 Jul 2020 13:20:28 +0200 Subject: [PATCH 61/92] Revert "Update substrate branch to cecton-testing-helpers" This reverts commit 5796cd53373a8b0d16cac1e2c3611fa214012c1e. --- Cargo.lock | 287 +++++++++--------- 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 +- node/messages/Cargo.toml | 2 +- node/overseer/Cargo.toml | 2 +- node/primitives/Cargo.toml | 2 +- node/service/Cargo.toml | 74 ++--- 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 +- polkadot-test-service/Cargo.toml | 53 ++-- polkadot-test-service/src/lib.rs | 93 +++++- polkadot-test-service/tests/build-blocks.rs | 3 +- primitives/Cargo.toml | 22 +- rpc/Cargo.toml | 34 +-- runtime/common/Cargo.toml | 52 ++-- runtime/kusama/Cargo.toml | 108 +++---- runtime/parachains/Cargo.toml | 50 +-- runtime/polkadot/Cargo.toml | 104 +++---- runtime/test-runtime/Cargo.toml | 76 ++--- runtime/test-runtime/client/Cargo.toml | 22 +- runtime/westend/Cargo.toml | 110 +++---- service/Cargo.toml | 72 ++--- statement-table/Cargo.toml | 2 +- validation/Cargo.toml | 36 +-- 30 files changed, 697 insertions(+), 629 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 87ce7f437e59..4a1c7bae0d67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1250,7 +1250,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", ] @@ -1258,7 +1258,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -1275,7 +1275,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1293,7 +1293,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -1308,7 +1308,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "serde", @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "bitmask", "frame-metadata", @@ -1344,7 +1344,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1355,7 +1355,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1367,7 +1367,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1377,7 +1377,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1393,7 +1393,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -1407,7 +1407,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "sp-api", @@ -3364,7 +3364,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3380,7 +3380,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3395,7 +3395,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3417,7 +3417,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3431,7 +3431,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3447,7 +3447,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3462,7 +3462,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3477,7 +3477,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3493,7 +3493,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3513,7 +3513,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3529,7 +3529,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3549,7 +3549,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3565,7 +3565,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3579,7 +3579,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3594,7 +3594,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3608,7 +3608,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3623,7 +3623,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3644,7 +3644,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3659,7 +3659,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3672,7 +3672,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "enumflags2", "frame-support", @@ -3687,7 +3687,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3702,7 +3702,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3722,7 +3722,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3736,7 +3736,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3750,7 +3750,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3772,7 +3772,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3783,7 +3783,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3797,7 +3797,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3815,7 +3815,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "frame-system", @@ -3830,7 +3830,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3848,7 +3848,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-support", "parity-scale-codec", @@ -3861,7 +3861,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3876,7 +3876,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -3892,7 +3892,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4886,7 +4886,6 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", - "substrate-test-client", "tempfile", ] @@ -5701,7 +5700,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "bytes 0.5.4", "derive_more 0.99.8", @@ -5728,7 +5727,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5752,7 +5751,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5768,7 +5767,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5784,7 +5783,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5795,7 +5794,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5835,7 +5834,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "fnv", @@ -5871,7 +5870,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "blake2-rfc", "hash-db", @@ -5900,7 +5899,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5911,7 +5910,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "fork-tree", @@ -5953,7 +5952,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -5977,7 +5976,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5990,7 +5989,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6012,7 +6011,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6026,7 +6025,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "lazy_static", @@ -6054,7 +6053,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6071,7 +6070,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6086,7 +6085,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6107,7 +6106,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "assert_matches", "derive_more 0.99.8", @@ -6145,7 +6144,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "finality-grandpa", @@ -6162,7 +6161,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6181,7 +6180,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "hex", @@ -6197,7 +6196,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "hash-db", "lazy_static", @@ -6216,7 +6215,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "bitflags", "bs58", @@ -6268,7 +6267,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6283,7 +6282,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "env_logger", "futures 0.3.5", @@ -6310,7 +6309,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "bytes 0.5.4", "fnv", @@ -6337,7 +6336,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "futures 0.3.5", "libp2p", @@ -6350,7 +6349,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6359,7 +6358,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "futures 0.3.5", "hash-db", @@ -6391,7 +6390,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6415,7 +6414,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6431,7 +6430,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "directories", @@ -6494,7 +6493,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6508,7 +6507,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6529,7 +6528,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "erased-serde", "log 0.4.8", @@ -6546,7 +6545,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6566,7 +6565,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6659,15 +6658,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "secrecy" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9182278ed645df3477a9c27bfee0621c621aa16f6972635f7f795dae3d81070f" -dependencies = [ - "zeroize", -] - [[package]] name = "security-framework" version = "0.4.4" @@ -6952,7 +6942,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6964,7 +6954,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "hash-db", "parity-scale-codec", @@ -6979,7 +6969,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6991,7 +6981,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "serde", @@ -7003,7 +6993,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7016,7 +7006,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "sp-api", @@ -7028,7 +7018,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7039,7 +7029,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "sp-api", @@ -7051,7 +7041,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7067,7 +7057,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "serde", "serde_json", @@ -7076,7 +7066,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7100,7 +7090,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "sp-api", @@ -7114,7 +7104,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "merlin", "parity-scale-codec", @@ -7132,7 +7122,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7144,7 +7134,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "base58", "blake2-rfc", @@ -7168,7 +7158,6 @@ dependencies = [ "rand 0.7.3", "regex", "schnorrkel", - "secrecy", "serde", "sha2", "sp-debug-derive", @@ -7187,7 +7176,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7196,7 +7185,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7206,7 +7195,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "environmental", "parity-scale-codec", @@ -7217,7 +7206,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7233,7 +7222,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7243,7 +7232,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "parity-scale-codec", @@ -7255,7 +7244,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "futures 0.3.5", "hash-db", @@ -7276,7 +7265,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "lazy_static", "sp-core", @@ -7287,7 +7276,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "serde", @@ -7299,7 +7288,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7310,7 +7299,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "sp-api", "sp-core", @@ -7320,7 +7309,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "backtrace", "log 0.4.8", @@ -7329,7 +7318,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "serde", "sp-core", @@ -7338,7 +7327,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "either", "hash256-std-hasher", @@ -7360,7 +7349,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7375,7 +7364,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "Inflector", "proc-macro-crate", @@ -7387,7 +7376,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "serde", "serde_json", @@ -7396,7 +7385,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "sp-api", @@ -7409,7 +7398,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7419,7 +7408,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7440,12 +7429,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7457,7 +7446,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7471,7 +7460,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "log 0.4.8", "rental", @@ -7481,7 +7470,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7497,7 +7486,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "hash-db", "memory-db", @@ -7511,7 +7500,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "futures 0.3.5", "futures-core", @@ -7523,7 +7512,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7535,7 +7524,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7675,7 +7664,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "chrono", "clear_on_drop", @@ -7702,7 +7691,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "platforms", ] @@ -7710,7 +7699,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7733,7 +7722,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "async-std", "derive_more 0.99.8", @@ -7747,12 +7736,10 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ - "futures 0.1.29", "futures 0.3.5", "hash-db", - "hex", "parity-scale-codec", "sc-client-api", "sc-client-db", @@ -7771,7 +7758,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "cfg-if", "frame-executive", @@ -7804,14 +7791,14 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers)", + "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate)", "trie-db 0.21.0", ] [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7832,7 +7819,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate#ec2ab7978a54e7f20af2f9ac12bde7719bb744fb" [[package]] name = "substrate-wasm-builder-runner" diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index bdd852888132..503e897ceadb 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 = "cecton-testing-helpers" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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.6.0" kvdb-memorydb = "0.6.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 86d09238e362..b395ccba9dc3 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -17,26 +17,26 @@ 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 = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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, optional = true } service-new = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true } tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", 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 = "cecton-testing-helpers" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = [ "wasmtime", "db", "cli", "service-old" ] diff --git a/collator/Cargo.toml b/collator/Cargo.toml index 169f4cea8762..42e733419fef 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 = "cecton-testing-helpers" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } @@ -29,7 +29,7 @@ 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 = "cecton-testing-helpers" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = ["service-old"] diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index 1ad1701a3ce4..9c49e33f407c 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 = "cecton-testing-helpers" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 be6dfbe4b320..0735fec5907f 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 = "cecton-testing-helpers" } -sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 b273b64191b4..ad8cafe3f453 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 = "cecton-testing-helpers" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "cecton-testing-helpers" } -sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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/node/messages/Cargo.toml b/node/messages/Cargo.toml index b36956481fc7..9edb5a051987 100644 --- a/node/messages/Cargo.toml +++ b/node/messages/Cargo.toml @@ -9,5 +9,5 @@ description = "Message types used by Subsystems" polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } polkadot-node-primitives = { path = "../primitives" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } futures = "0.3.5" diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index f1d3926740ba..88626e2e05f3 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -10,7 +10,7 @@ log = "0.4.8" futures-timer = "3.0.2" streamunordered = "0.5.1" polkadot-primitives = { path = "../../primitives" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } messages = { package = "polkadot-node-messages", path = "../messages" } [dev-dependencies] diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml index 03cb17615c38..f317565b2e99 100644 --- a/node/primitives/Cargo.toml +++ b/node/primitives/Cargo.toml @@ -9,4 +9,4 @@ description = "Primitives types for the Node-side" polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } parity-scale-codec = { version = "1.3.0", default-features = false, features = ["derive"] } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index f459557e91b6..74069f0233af 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -19,47 +19,47 @@ 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 = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } +sc-basic-authorship = { 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 = "cecton-testing-helpers" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } env_logger = "0.7.0" [features] diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 83a881edd640..e401e2baa53f 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 = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", optional = true, default-features = false } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 1a67b3ff792d..7f04dc5946a3 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 = "cecton-testing-helpers", 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.6" } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 2e7d400037cc..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 = "cecton-testing-helpers" } -client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 721fe1e3f442..4dfcde274a73 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 = "cecton-testing-helpers", 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.6" } diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index d8ed33547e72..3c5c6c88ebe9 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -19,34 +19,33 @@ polkadot-network = { path = "../network" } polkadot-rpc = { path = "../rpc" } polkadot-service = { path = "../service" } polkadot-runtime-common = { path = "../runtime/common" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-informant = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { 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 } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-informant = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] async-std = "1.5" serde_json = "1.0" -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index f0317557b256..8fe423b5507d 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -22,6 +22,7 @@ mod chain_spec; pub use chain_spec::*; use consensus_common::{block_validation::Chain, SelectChain}; +use futures::{future::Future, StreamExt}; use grandpa::FinalityProofProvider as GrandpaFinalityProofProvider; use log::info; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; @@ -31,11 +32,11 @@ use polkadot_primitives::{ }; use polkadot_runtime_common::{parachains, registrar, BlockHashCount}; use polkadot_service::{ - new_full, new_full_start, FullNodeHandles, PolkadotClient, ServiceComponents, + new_full, new_full_start, BlockT, FullNodeHandles, PolkadotClient, ServiceComponents, }; use polkadot_test_runtime::{RestrictFunctionality, Runtime, SignedExtra, SignedPayload, VERSION}; use sc_chain_spec::ChainSpec; -use sc_client_api::execution_extensions::ExecutionStrategies; +use sc_client_api::{execution_extensions::ExecutionStrategies, BlockchainEvents}; use sc_executor::native_executor_instance; use sc_informant::OutputFormat; use sc_network::{ @@ -51,11 +52,11 @@ use service::{BasePath, Configuration, Role, TFullBackend}; use sp_arithmetic::traits::SaturatedConversion; use sp_blockchain::HeaderBackend; use sp_keyring::Sr25519Keyring; -use sp_runtime::{codec::Encode, generic}; +use sp_runtime::{codec::Encode, generic, OpaqueExtrinsic}; use sp_state_machine::BasicExternalities; +use std::collections::HashSet; use std::sync::Arc; use std::time::Duration; -use substrate_test_client::RpcHandlersExt; native_executor_instance!( pub PolkadotTestExecutor, @@ -236,6 +237,38 @@ pub struct PolkadotTestNode { pub rpc_handlers: Arc, } +impl PolkadotTestNode +where + C: BlockchainEvents, +{ + /// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks + /// are ever created, thus you should restrict the maximum amount of time of the test execution. + pub fn wait_for_blocks(&self, count: usize) -> impl Future { + assert_ne!(count, 0, "'count' argument must be greater than 1"); + let client = self.client.clone(); + + wait_for_blocks(client.clone(), count) + } +} + +impl PolkadotTestNode { + /// Send a transaction through the RPCHandlers. + pub fn send_transaction( + &self, + extrinsic: OpaqueExtrinsic, + ) -> impl Future< + Output = ( + Option, + RpcSession, + futures01::sync::mpsc::Receiver, + ), + > { + let rpc_handlers = self.rpc_handlers.clone(); + + send_transaction(rpc_handlers, extrinsic) + } +} + impl PolkadotTestNode where C: HeaderBackend, @@ -295,6 +328,56 @@ where extra.clone(), ); - self.rpc_handlers.send_transaction(extrinsic.into()).await + self.send_transaction(extrinsic.into()).await } } + +/// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks +/// are ever created, thus you should restrict the maximum amount of time of the test execution. +pub async fn wait_for_blocks(client: Arc, count: usize) +where + C: BlockchainEvents, + B: BlockT, +{ + assert!(count > 0, "'count' argument must be greater than 0"); + + let mut import_notification_stream = client.import_notification_stream(); + let mut blocks = HashSet::new(); + + while let Some(notification) = import_notification_stream.next().await { + blocks.insert(notification.hash); + if blocks.len() == count { + break; + } + } +} + +/// Send a transaction through the RPCHandlers. +pub async fn send_transaction( + rpc_handlers: Arc, + extrinsic: OpaqueExtrinsic, +) -> ( + Option, + RpcSession, + futures01::sync::mpsc::Receiver, +) { + let (tx, rx) = futures01::sync::mpsc::channel(0); + let mem = RpcSession::new(tx.into()); + let res = rpc_handlers + .rpc_query( + &mem, + format!( + r#"{{ + "jsonrpc": "2.0", + "method": "author_submitExtrinsic", + "params": ["0x{}"], + "id": 0 + }}"#, + hex::encode(extrinsic.encode()) + ) + .as_str(), + ) + .await; + + (res, mem, rx) +} diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index c8ee2b5cfd98..3d6f45199ced 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -4,7 +4,6 @@ use polkadot_test_service::*; use service::TaskExecutor; use sp_keyring::Sr25519Keyring; use std::time::Duration; -use substrate_test_client::BlockchainEventsExt; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); @@ -36,7 +35,7 @@ fn ensure_test_service_build_blocks() { .fuse(); let t2 = async { { - let t1 = future::join(alice.client.wait_for_blocks(3), bob.client.wait_for_blocks(3)).fuse(); + let t1 = future::join(alice.wait_for_blocks(3), bob.wait_for_blocks(3)).fuse(); let t2 = alice.task_manager.future().fuse(); let t3 = bob.task_manager.future().fuse(); diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 49da5fdb997e..d327429b64e0 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,21 +7,21 @@ 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 = "cecton-testing-helpers", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +primitives = { package = "sp-core", 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 } +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 = "cecton-testing-helpers", 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 = "cecton-testing-helpers" } +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 488b1daad6b7..ce2f6382b468 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -7,21 +7,21 @@ edition = "2018" [dependencies] jsonrpc-core = "14.0.3" polkadot-primitives = { path = "../primitives" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master"} +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "master"} +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "master"} +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-keystore = { 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 } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 80fda29ccaaf..2b31e989c898 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -13,39 +13,39 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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-session = { 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 = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +transaction-payment = { package = "pallet-transaction-payment", 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 = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } trie-db = "0.21.0" serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index ce74caad809c..b5494ab625e4 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -15,60 +15,60 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +multisig = { package = "pallet-multisig", 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 } +proxy = { package = "pallet-proxy", 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 = "cecton-testing-helpers", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-system-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 } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -78,8 +78,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 = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index c4c54145239d..ab4ca5a78309 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -12,25 +12,25 @@ 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 = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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-session = { 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 = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } @@ -40,13 +40,13 @@ rand_chacha = { version = "0.2.2", default-features = false } [dev-dependencies] hex-literal = "0.2.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index 56bf388ab8ac..471efb0bacf0 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -15,58 +15,58 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +multisig = { package = "pallet-multisig", 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 } +proxy = { package = "pallet-proxy", 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 } +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 = "cecton-testing-helpers", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-system-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 } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -76,8 +76,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 = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 8c46b19ca504..1e41686e2365 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -14,43 +14,43 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +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 } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +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 } +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 } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -60,8 +60,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 = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/test-runtime/client/Cargo.toml b/runtime/test-runtime/client/Cargo.toml index 5c4fd9c05404..a9439e060968 100644 --- a/runtime/test-runtime/client/Cargo.toml +++ b/runtime/test-runtime/client/Cargo.toml @@ -6,19 +6,19 @@ edition = "2018" license = "GPL-3.0" [dependencies] -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-light = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", features = ["test-helpers"], default-features = false } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-light = { 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 = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 0aa33064e23c..deab7e0109d1 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -15,61 +15,61 @@ serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.0" static_assertions = "1.1.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +multisig = { package = "pallet-multisig", 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 } +proxy = { package = "pallet-proxy", 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 = "cecton-testing-helpers", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-system-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 } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -80,8 +80,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 = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" [build-dependencies] diff --git a/service/Cargo.toml b/service/Cargo.toml index b272647859b9..5eb47ec8875c 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 = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } +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 c93a13a2be93..831ae6cd4354 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 = "cecton-testing-helpers" } +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 95469bcf21ee..42e417fef6f0 100644 --- a/validation/Cargo.toml +++ b/validation/Cargo.toml @@ -18,24 +18,24 @@ 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 = "cecton-testing-helpers" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } From 6dce9b12172044622d7cf6f14831eb8af0bbe1e6 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 2 Jul 2020 13:20:52 +0200 Subject: [PATCH 62/92] Update substrate branch to cecton-testing-helpers --- Cargo.lock | 286 +++++++++--------- availability-store/Cargo.toml | 16 +- cli/Cargo.toml | 22 +- collator/Cargo.toml | 22 +- core-primitives/Cargo.toml | 6 +- erasure-coding/Cargo.toml | 4 +- network/Cargo.toml | 16 +- network/test/Cargo.toml | 20 +- node/network/bridge/Cargo.toml | 4 +- node/overseer/Cargo.toml | 2 +- node/primitives/Cargo.toml | 2 +- node/service/Cargo.toml | 74 ++--- node/subsystem/Cargo.toml | 2 +- parachain/Cargo.toml | 12 +- parachain/test-parachains/adder/Cargo.toml | 4 +- .../test-parachains/adder/collator/Cargo.toml | 4 +- .../test-parachains/code-upgrader/Cargo.toml | 4 +- polkadot-test-service/Cargo.toml | 52 ++-- primitives/Cargo.toml | 22 +- rpc/Cargo.toml | 34 +-- runtime/common/Cargo.toml | 52 ++-- runtime/kusama/Cargo.toml | 108 +++---- runtime/parachains/Cargo.toml | 50 +-- runtime/polkadot/Cargo.toml | 104 +++---- runtime/test-runtime/Cargo.toml | 76 ++--- runtime/test-runtime/client/Cargo.toml | 22 +- runtime/westend/Cargo.toml | 110 +++---- service/Cargo.toml | 72 ++--- statement-table/Cargo.toml | 2 +- validation/Cargo.toml | 36 +-- 30 files changed, 626 insertions(+), 614 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 37dd6ed70817..39d12fe37798 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1261,7 +1261,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", ] @@ -1269,7 +1269,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -1286,7 +1286,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1304,7 +1304,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "serde", @@ -1330,7 +1330,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "bitmask", "frame-metadata", @@ -1355,7 +1355,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1366,7 +1366,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1378,7 +1378,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1388,7 +1388,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1404,7 +1404,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -1418,7 +1418,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-api", @@ -3375,7 +3375,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3391,7 +3391,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3406,7 +3406,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3428,7 +3428,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3442,7 +3442,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3458,7 +3458,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3473,7 +3473,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3488,7 +3488,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3504,7 +3504,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3524,7 +3524,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3540,7 +3540,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3560,7 +3560,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3576,7 +3576,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3590,7 +3590,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3605,7 +3605,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3619,7 +3619,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3634,7 +3634,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3655,7 +3655,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3670,7 +3670,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3683,7 +3683,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "enumflags2", "frame-support", @@ -3698,7 +3698,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3713,7 +3713,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3733,7 +3733,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3747,7 +3747,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3761,7 +3761,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3783,7 +3783,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3794,7 +3794,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3808,7 +3808,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3826,7 +3826,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "frame-system", @@ -3841,7 +3841,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3859,7 +3859,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-support", "parity-scale-codec", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3887,7 +3887,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-benchmarking", "frame-support", @@ -3903,7 +3903,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5755,7 +5755,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "bytes 0.5.4", "derive_more 0.99.8", @@ -5782,7 +5782,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5806,7 +5806,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5822,7 +5822,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5838,7 +5838,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5849,7 +5849,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5889,7 +5889,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "fnv", @@ -5925,7 +5925,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "blake2-rfc", "hash-db", @@ -5954,7 +5954,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5965,7 +5965,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "fork-tree", @@ -6007,7 +6007,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6031,7 +6031,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6044,7 +6044,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6066,7 +6066,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6080,7 +6080,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "lazy_static", @@ -6108,7 +6108,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6125,7 +6125,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6140,7 +6140,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6161,7 +6161,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "assert_matches", "derive_more 0.99.8", @@ -6199,7 +6199,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "finality-grandpa", @@ -6216,7 +6216,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6235,7 +6235,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "hex", @@ -6251,7 +6251,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "hash-db", "lazy_static", @@ -6270,7 +6270,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "bitflags", "bs58", @@ -6322,7 +6322,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6337,7 +6337,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "env_logger", "futures 0.3.5", @@ -6364,7 +6364,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "bytes 0.5.4", "fnv", @@ -6391,7 +6391,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "libp2p", @@ -6404,7 +6404,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6413,7 +6413,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "hash-db", @@ -6445,7 +6445,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6469,7 +6469,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6485,7 +6485,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "directories", @@ -6548,7 +6548,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6562,7 +6562,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6583,7 +6583,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "erased-serde", "log 0.4.8", @@ -6600,7 +6600,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6620,7 +6620,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6713,6 +6713,15 @@ dependencies = [ "untrusted", ] +[[package]] +name = "secrecy" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9182278ed645df3477a9c27bfee0621c621aa16f6972635f7f795dae3d81070f" +dependencies = [ + "zeroize", +] + [[package]] name = "security-framework" version = "0.4.4" @@ -6997,7 +7006,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7009,7 +7018,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "hash-db", "parity-scale-codec", @@ -7024,7 +7033,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7036,7 +7045,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "serde", @@ -7048,7 +7057,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7061,7 +7070,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-api", @@ -7073,7 +7082,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7084,7 +7093,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-api", @@ -7096,7 +7105,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7112,7 +7121,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "serde", "serde_json", @@ -7121,7 +7130,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7145,7 +7154,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-api", @@ -7159,7 +7168,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "merlin", "parity-scale-codec", @@ -7177,7 +7186,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7189,7 +7198,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "base58", "blake2-rfc", @@ -7213,6 +7222,7 @@ dependencies = [ "rand 0.7.3", "regex", "schnorrkel", + "secrecy", "serde", "sha2", "sp-debug-derive", @@ -7231,7 +7241,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7240,7 +7250,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7250,7 +7260,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "environmental", "parity-scale-codec", @@ -7261,7 +7271,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7277,7 +7287,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7287,7 +7297,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "parity-scale-codec", @@ -7299,7 +7309,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "hash-db", @@ -7320,7 +7330,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "lazy_static", "sp-core", @@ -7331,7 +7341,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "serde", @@ -7343,7 +7353,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7354,7 +7364,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "sp-api", "sp-core", @@ -7364,7 +7374,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "backtrace", "log 0.4.8", @@ -7373,7 +7383,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "serde", "sp-core", @@ -7382,7 +7392,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "either", "hash256-std-hasher", @@ -7404,7 +7414,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7419,7 +7429,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "Inflector", "proc-macro-crate", @@ -7431,7 +7441,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "serde", "serde_json", @@ -7440,7 +7450,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-api", @@ -7453,7 +7463,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7463,7 +7473,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7484,12 +7494,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7501,7 +7511,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7515,7 +7525,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "log 0.4.8", "rental", @@ -7525,7 +7535,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7541,7 +7551,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "hash-db", "memory-db", @@ -7555,7 +7565,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "futures-core", @@ -7567,7 +7577,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7579,7 +7589,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7719,7 +7729,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "chrono", "clear_on_drop", @@ -7746,7 +7756,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "platforms", ] @@ -7754,7 +7764,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7777,7 +7787,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "async-std", "derive_more 0.99.8", @@ -7791,10 +7801,12 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ + "futures 0.1.29", "futures 0.3.5", "hash-db", + "hex", "parity-scale-codec", "sc-client-api", "sc-client-db", @@ -7813,7 +7825,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "cfg-if", "frame-executive", @@ -7846,14 +7858,14 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate)", + "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers)", "trie-db 0.21.0", ] [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7874,7 +7886,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" [[package]] name = "substrate-wasm-builder-runner" diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index 503e897ceadb..bdd852888132 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 = "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" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } kvdb = "0.6.0" kvdb-memorydb = "0.6.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index b395ccba9dc3..86d09238e362 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -17,26 +17,26 @@ 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-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 = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } service = { package = "polkadot-service", path = "../service", default-features = false, optional = true } service-new = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true } 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 = "cecton-testing-helpers", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", 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 = "cecton-testing-helpers" } [features] default = [ "wasmtime", "db", "cli", "service-old" ] diff --git a/collator/Cargo.toml b/collator/Cargo.toml index 42e733419fef..169f4cea8762 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 = "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" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } polkadot-primitives = { path = "../primitives" } polkadot-cli = { path = "../cli" } polkadot-network = { path = "../network" } @@ -29,7 +29,7 @@ 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 = "cecton-testing-helpers" } [features] default = ["service-old"] diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml index b0f5971e2a59..10dabb24f74b 100644 --- a/core-primitives/Cargo.toml +++ b/core-primitives/Cargo.toml @@ -5,9 +5,9 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -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-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = [ "derive" ] } [features] diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index 9c49e33f407c..1ad1701a3ce4 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 = "cecton-testing-helpers" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } derive_more = "0.15.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index 0735fec5907f..be6dfbe4b320 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 = "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 = "cecton-testing-helpers" } +sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 = "cecton-testing-helpers" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } diff --git a/network/test/Cargo.toml b/network/test/Cargo.toml index ad8cafe3f453..b273b64191b4 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 = "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" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "cecton-testing-helpers" } +sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" } diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml index 4f6c8631e2f9..548293d54ef9 100644 --- a/node/network/bridge/Cargo.toml +++ b/node/network/bridge/Cargo.toml @@ -12,8 +12,8 @@ streamunordered = "0.5.1" polkadot-primitives = { path = "../../../primitives" } node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" } parity-scale-codec = "1.3.0" -sc-network = { 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 = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } [dev-dependencies] diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index 6c6ce304e6d4..a3721e1110bb 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -10,7 +10,7 @@ log = "0.4.8" futures-timer = "3.0.2" streamunordered = "0.5.1" polkadot-primitives = { path = "../../primitives" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem" } async-trait = "0.1" diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml index b2bc9231ae74..52dfdd4302cf 100644 --- a/node/primitives/Cargo.toml +++ b/node/primitives/Cargo.toml @@ -9,5 +9,5 @@ description = "Primitives types for the Node-side" polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } parity-scale-codec = { version = "1.3.0", default-features = false, features = ["derive"] } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } async-trait = "0.1" diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index f1a56acfad95..9606591c6814 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -20,47 +20,47 @@ 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-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" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } [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 = "cecton-testing-helpers" } env_logger = "0.7.0" [features] diff --git a/node/subsystem/Cargo.toml b/node/subsystem/Cargo.toml index 43712319cb71..0417008c3faf 100644 --- a/node/subsystem/Cargo.toml +++ b/node/subsystem/Cargo.toml @@ -9,6 +9,6 @@ description = "Subsystem traits and message definitions" polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } polkadot-node-primitives = { path = "../primitives" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } futures = "0.3.5" async-trait = "0.1" diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index fb1e1ce50351..83d8f239013a 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 = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } polkadot-core-primitives = { path = "../core-primitives", 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-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-externalities = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 2cfb77566db6..154730309871 100644 --- a/parachain/test-parachains/adder/Cargo.toml +++ b/parachain/test-parachains/adder/Cargo.toml @@ -9,12 +9,12 @@ build = "build.rs" [dependencies] parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } 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 = "cecton-testing-helpers", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 3363a908a943..2e7d400037cc 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 = "master" } -client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 6f673adbf82a..d3a68e0de780 100644 --- a/parachain/test-parachains/code-upgrader/Cargo.toml +++ b/parachain/test-parachains/code-upgrader/Cargo.toml @@ -9,12 +9,12 @@ build = "build.rs" [dependencies] parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } 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 = "cecton-testing-helpers", default-features = false, features = [ "disable_allocator" ] } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" } diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 3c5c6c88ebe9..a47d6d2c827a 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -19,33 +19,33 @@ polkadot-network = { path = "../network" } polkadot-rpc = { path = "../rpc" } polkadot-service = { path = "../service" } polkadot-runtime-common = { path = "../runtime/common" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { 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 } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-informant = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-informant = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } [dev-dependencies] async-std = "1.5" serde_json = "1.0" -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index f3bc264c8cb4..71e1578f4bc5 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,22 +7,22 @@ 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 = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } polkadot-parachain = { path = "../parachain", default-features = false } polkadot-core-primitives = { path = "../core-primitives", 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 = "cecton-testing-helpers", default-features = false } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } [dev-dependencies] -sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } pretty_assertions = "0.5.1" [features] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index ce2f6382b468..488b1daad6b7 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -7,21 +7,21 @@ edition = "2018" [dependencies] jsonrpc-core = "14.0.3" polkadot-primitives = { path = "../primitives" } -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" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master"} -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "master"} -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "master"} -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { 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 = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 2b31e989c898..80fda29ccaaf 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -13,39 +13,39 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" -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-session = { 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 = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } -transaction-payment = { package = "pallet-transaction-payment", 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 = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } trie-db = "0.21.0" serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index dbe3934dd3ee..8e9967535a91 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -15,60 +15,60 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.0" -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 = "cecton-testing-helpers", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } -multisig = { package = "pallet-multisig", 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 } -proxy = { package = "pallet-proxy", 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 } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -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 } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -78,8 +78,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 = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index ab4ca5a78309..c4c54145239d 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -12,25 +12,25 @@ 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-session = { 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 = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.3.2", default-features = false, optional = true } @@ -40,13 +40,13 @@ rand_chacha = { version = "0.2.2", default-features = false } [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" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index 96ec48d318e7..ca240e4e38f1 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -15,58 +15,58 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.0" -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 = "cecton-testing-helpers", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } -multisig = { package = "pallet-multisig", 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 } -proxy = { package = "pallet-proxy", 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 } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-system-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 } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -76,8 +76,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 = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 1e41686e2365..8c46b19ca504 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -14,43 +14,43 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.0" -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 } -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 } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } -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 } -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 } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -60,8 +60,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 = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/test-runtime/client/Cargo.toml b/runtime/test-runtime/client/Cargo.toml index a9439e060968..5c4fd9c05404 100644 --- a/runtime/test-runtime/client/Cargo.toml +++ b/runtime/test-runtime/client/Cargo.toml @@ -6,19 +6,19 @@ edition = "2018" license = "GPL-3.0" [dependencies] -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-light = { 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" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-light = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", features = ["test-helpers"], default-features = false } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } codec = { package = "parity-scale-codec", version = "1.0.0" } -sc-client-api = { 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 = "cecton-testing-helpers" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } futures = "0.3.1" diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index 9e6af55afc08..348a4a15adb2 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -15,61 +15,61 @@ serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.0" static_assertions = "1.1.0" -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 = "cecton-testing-helpers", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } -multisig = { package = "pallet-multisig", 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 } -proxy = { package = "pallet-proxy", 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 } +authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-system-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 } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -80,8 +80,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 = "cecton-testing-helpers" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } serde_json = "1.0.41" [build-dependencies] diff --git a/service/Cargo.toml b/service/Cargo.toml index 5eb47ec8875c..b272647859b9 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 = "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" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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 = "cecton-testing-helpers" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } [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 = "cecton-testing-helpers" } env_logger = "0.7.0" [features] diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index 831ae6cd4354..c93a13a2be93 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 = "cecton-testing-helpers" } primitives = { package = "polkadot-primitives", path = "../primitives" } diff --git a/validation/Cargo.toml b/validation/Cargo.toml index 42e417fef6f0..95469bcf21ee 100644 --- a/validation/Cargo.toml +++ b/validation/Cargo.toml @@ -18,24 +18,24 @@ 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 = "cecton-testing-helpers" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } 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" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } +runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } From a8fe1dda98fccd1bda4b4759f8864c5c588e37ae Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 2 Jul 2020 13:29:12 +0200 Subject: [PATCH 63/92] CLEANUP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 1 + polkadot-test-service/Cargo.toml | 1 + polkadot-test-service/src/lib.rs | 95 +++------------------ polkadot-test-service/tests/build-blocks.rs | 1 + 4 files changed, 16 insertions(+), 82 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 39d12fe37798..6e362ea7614d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4941,6 +4941,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", + "substrate-test-client", "tempfile", ] diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index a47d6d2c827a..d8ed33547e72 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -44,6 +44,7 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "cect pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } [dev-dependencies] async-std = "1.5" diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 8fe423b5507d..95c80bda2dac 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -22,7 +22,6 @@ mod chain_spec; pub use chain_spec::*; use consensus_common::{block_validation::Chain, SelectChain}; -use futures::{future::Future, StreamExt}; use grandpa::FinalityProofProvider as GrandpaFinalityProofProvider; use log::info; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; @@ -32,11 +31,11 @@ use polkadot_primitives::{ }; use polkadot_runtime_common::{parachains, registrar, BlockHashCount}; use polkadot_service::{ - new_full, new_full_start, BlockT, FullNodeHandles, PolkadotClient, ServiceComponents, + new_full, new_full_start, FullNodeHandles, PolkadotClient, ServiceComponents, }; use polkadot_test_runtime::{RestrictFunctionality, Runtime, SignedExtra, SignedPayload, VERSION}; use sc_chain_spec::ChainSpec; -use sc_client_api::{execution_extensions::ExecutionStrategies, BlockchainEvents}; +use sc_client_api::execution_extensions::ExecutionStrategies; use sc_executor::native_executor_instance; use sc_informant::OutputFormat; use sc_network::{ @@ -52,11 +51,11 @@ use service::{BasePath, Configuration, Role, TFullBackend}; use sp_arithmetic::traits::SaturatedConversion; use sp_blockchain::HeaderBackend; use sp_keyring::Sr25519Keyring; -use sp_runtime::{codec::Encode, generic, OpaqueExtrinsic}; +use sp_runtime::{codec::Encode, generic}; use sp_state_machine::BasicExternalities; -use std::collections::HashSet; use std::sync::Arc; use std::time::Duration; +use substrate_test_client::RpcHandlersExt; native_executor_instance!( pub PolkadotTestExecutor, @@ -237,38 +236,6 @@ pub struct PolkadotTestNode { pub rpc_handlers: Arc, } -impl PolkadotTestNode -where - C: BlockchainEvents, -{ - /// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks - /// are ever created, thus you should restrict the maximum amount of time of the test execution. - pub fn wait_for_blocks(&self, count: usize) -> impl Future { - assert_ne!(count, 0, "'count' argument must be greater than 1"); - let client = self.client.clone(); - - wait_for_blocks(client.clone(), count) - } -} - -impl PolkadotTestNode { - /// Send a transaction through the RPCHandlers. - pub fn send_transaction( - &self, - extrinsic: OpaqueExtrinsic, - ) -> impl Future< - Output = ( - Option, - RpcSession, - futures01::sync::mpsc::Receiver, - ), - > { - let rpc_handlers = self.rpc_handlers.clone(); - - send_transaction(rpc_handlers, extrinsic) - } -} - impl PolkadotTestNode where C: HeaderBackend, @@ -328,56 +295,20 @@ where extra.clone(), ); - self.send_transaction(extrinsic.into()).await + self.rpc_handlers.send_transaction(extrinsic.into()).await } } -/// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks -/// are ever created, thus you should restrict the maximum amount of time of the test execution. -pub async fn wait_for_blocks(client: Arc, count: usize) +impl PolkadotTestNode where - C: BlockchainEvents, - B: BlockT, + C: BlockchainEvents, { - assert!(count > 0, "'count' argument must be greater than 0"); - - let mut import_notification_stream = client.import_notification_stream(); - let mut blocks = HashSet::new(); + /// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks + /// are ever created, thus you should restrict the maximum amount of time of the test execution. + pub fn wait_for_blocks(&self, count: usize) -> impl Future { + assert_ne!(count, 0, "'count' argument must be greater than 1"); + let client = self.client.clone(); - while let Some(notification) = import_notification_stream.next().await { - blocks.insert(notification.hash); - if blocks.len() == count { - break; - } + wait_for_blocks(client.clone(), count) } } - -/// Send a transaction through the RPCHandlers. -pub async fn send_transaction( - rpc_handlers: Arc, - extrinsic: OpaqueExtrinsic, -) -> ( - Option, - RpcSession, - futures01::sync::mpsc::Receiver, -) { - let (tx, rx) = futures01::sync::mpsc::channel(0); - let mem = RpcSession::new(tx.into()); - let res = rpc_handlers - .rpc_query( - &mem, - format!( - r#"{{ - "jsonrpc": "2.0", - "method": "author_submitExtrinsic", - "params": ["0x{}"], - "id": 0 - }}"#, - hex::encode(extrinsic.encode()) - ) - .as_str(), - ) - .await; - - (res, mem, rx) -} diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 3d6f45199ced..14249ed67e9d 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -4,6 +4,7 @@ use polkadot_test_service::*; use service::TaskExecutor; use sp_keyring::Sr25519Keyring; use std::time::Duration; +use substrate_test_client::BlockchainEventsExt; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); From df63aa1aed2e834fa271fd8984d12e7a129b20dc Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 2 Jul 2020 13:58:19 +0200 Subject: [PATCH 64/92] CLEANUP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- polkadot-test-service/src/lib.rs | 10 ++++------ polkadot-test-service/tests/build-blocks.rs | 1 - runtime/test-runtime/src/lib.rs | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 95c80bda2dac..2d435fc28035 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -22,6 +22,7 @@ mod chain_spec; pub use chain_spec::*; use consensus_common::{block_validation::Chain, SelectChain}; +use futures::future::Future; use grandpa::FinalityProofProvider as GrandpaFinalityProofProvider; use log::info; use polkadot_network::{legacy::gossip::Known, protocol as network_protocol}; @@ -35,7 +36,7 @@ use polkadot_service::{ }; use polkadot_test_runtime::{RestrictFunctionality, Runtime, SignedExtra, SignedPayload, VERSION}; use sc_chain_spec::ChainSpec; -use sc_client_api::execution_extensions::ExecutionStrategies; +use sc_client_api::{execution_extensions::ExecutionStrategies, BlockchainEvents}; use sc_executor::native_executor_instance; use sc_informant::OutputFormat; use sc_network::{ @@ -55,7 +56,7 @@ use sp_runtime::{codec::Encode, generic}; use sp_state_machine::BasicExternalities; use std::sync::Arc; use std::time::Duration; -use substrate_test_client::RpcHandlersExt; +use substrate_test_client::{BlockchainEventsExt, RpcHandlersExt}; native_executor_instance!( pub PolkadotTestExecutor, @@ -306,9 +307,6 @@ where /// Wait for `count` blocks to be imported in the node and then exit. This function will not return if no blocks /// are ever created, thus you should restrict the maximum amount of time of the test execution. pub fn wait_for_blocks(&self, count: usize) -> impl Future { - assert_ne!(count, 0, "'count' argument must be greater than 1"); - let client = self.client.clone(); - - wait_for_blocks(client.clone(), count) + self.client.wait_for_blocks(count) } } diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 14249ed67e9d..3d6f45199ced 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -4,7 +4,6 @@ use polkadot_test_service::*; use service::TaskExecutor; use sp_keyring::Sr25519Keyring; use std::time::Duration; -use substrate_test_client::BlockchainEventsExt; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 36a6ed177fde..cf2d5df75bca 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -52,7 +52,7 @@ use sp_core::OpaqueMetadata; use sp_staking::SessionIndex; use frame_support::{ parameter_types, construct_runtime, debug, - traits::{Get, KeyOwnerProofSystem, Randomness}, + traits::{KeyOwnerProofSystem, Randomness}, weights::Weight, }; use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; From 0cdda371da76344b66761321d90cec801ec7e3bb Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 30 Jun 2020 12:11:04 +0200 Subject: [PATCH 65/92] Add test runtime to command Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 1 + cli/Cargo.toml | 2 ++ cli/src/command.rs | 13 +++++++++++++ 3 files changed, 16 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 6e362ea7614d..a6bb2eb2af5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4275,6 +4275,7 @@ dependencies = [ "log 0.4.8", "polkadot-service", "polkadot-service-new", + "polkadot-test-service", "sc-cli", "sc-client-api", "sc-client-db", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 86d09238e362..2b44ac7b34bf 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -25,6 +25,7 @@ sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cect sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } service = { package = "polkadot-service", path = "../service", default-features = false, optional = true } service-new = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true } +polkadot-test-service = { path = "../polkadot-test-service", default-features = false, optional = true } tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true } frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } @@ -47,6 +48,7 @@ cli = [ "sc-cli", "sc-service", "frame-benchmarking-cli", + "polkadot-test-service", ] service-old = [ "service/full-node" ] browser = [ diff --git a/cli/src/command.rs b/cli/src/command.rs index 7b437a2c352d..c6392aed31c2 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -21,6 +21,7 @@ use service::{IdentifyVariant, self}; use service_new::{IdentifyVariant, self as service}; use sc_cli::{SubstrateCli, Result, RuntimeVersion, Role}; use crate::cli::{Cli, Subcommand}; +use polkadot_test_service::IdentifyVariant as _; fn get_exec_name() -> Option { std::env::current_exe() @@ -65,6 +66,7 @@ impl SubstrateCli for Cli { "westend-dev" => Box::new(service::chain_spec::westend_development_config()), "westend-local" => Box::new(service::chain_spec::westend_local_testnet_config()), "westend-staging" => Box::new(service::chain_spec::westend_staging_testnet_config()), + "test" => Box::new(polkadot_test_service::polkadot_local_testnet_config()), path if self.run.force_kusama => { Box::new(service::KusamaChainSpec::from_json_file(std::path::PathBuf::from(path))?) }, @@ -150,6 +152,17 @@ pub fn run() -> Result<()> { grandpa_pause, ).map(|(components, _, _)| components) }) + } else if chain_spec.is_test() { + runtime.run_node_until_exit(|config| match config.role { + Role::Light => unimplemented!(), + _ => polkadot_test_service::polkadot_test_new_full( + config, + None, + None, + authority_discovery_enabled, + 6000, + ).map(|(components, _, _, _, _)| components) + }) } else { runtime.run_node_until_exit(|config| match config.role { Role::Light => service::polkadot_new_light(config) From 5b4fcfd9d1ab452ff5e66fae2ae7000f753149a5 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 2 Jul 2020 16:56:28 +0200 Subject: [PATCH 66/92] replaced panic with clean error --- cli/src/command.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/command.rs b/cli/src/command.rs index c6392aed31c2..16463ab6584c 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -154,7 +154,7 @@ pub fn run() -> Result<()> { }) } else if chain_spec.is_test() { runtime.run_node_until_exit(|config| match config.role { - Role::Light => unimplemented!(), + Role::Light => Err("Light node for polkadot test runtime is not supported.".into()), _ => polkadot_test_service::polkadot_test_new_full( config, None, From 36c8c654dca5c0ace5f05874841017096c1370a8 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 2 Jul 2020 17:15:26 +0200 Subject: [PATCH 67/92] Simplify test --- Cargo.lock | 2 +- polkadot-test-service/Cargo.toml | 2 +- .../tests/send-transaction.rs | 21 +++---------------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a6bb2eb2af5a..bdf55d61aaba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4908,8 +4908,8 @@ dependencies = [ "futures 0.3.5", "hex", "log 0.4.8", + "pallet-balances", "pallet-staking", - "pallet-sudo", "pallet-transaction-payment", "polkadot-availability-store", "polkadot-network", diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index d8ed33547e72..364c52cd8b48 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -49,4 +49,4 @@ substrate-test-client = { git = "https://github.com/paritytech/substrate", branc [dev-dependencies] async-std = "1.5" serde_json = "1.0" -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } diff --git a/polkadot-test-service/tests/send-transaction.rs b/polkadot-test-service/tests/send-transaction.rs index 7f60f12107fc..9a1290d60156 100644 --- a/polkadot-test-service/tests/send-transaction.rs +++ b/polkadot-test-service/tests/send-transaction.rs @@ -1,9 +1,7 @@ use async_std::task::{block_on, sleep}; use futures::{pin_mut, select, FutureExt as _}; -use polkadot_primitives::parachain::{Info, Scheduling}; -use polkadot_runtime_common::{registrar}; use polkadot_test_service::*; -use sp_keyring::Sr25519Keyring::Alice; +use sp_keyring::Sr25519Keyring::{Alice, Bob}; use std::time::Duration; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); @@ -27,21 +25,8 @@ fn send_transaction_actually_work() { )) .fuse(); let t2 = async { - let wasm = vec![0_u8; 32]; - let genesis_state = b"0x0x000000000000000000000000000000000000000000000000000000000000000000eb21415d4113e9bb8c\ - 0c3fa5533d873c439e94960c56f4c1dd1105ddc6b7b2e903170a2e7597b7b7e3d84c05391d139a62b157e78786\ - d8c082f29dcf4c11131400".to_vec(); - let function = polkadot_test_runtime::Call::Sudo(pallet_sudo::Call::sudo(Box::new( - polkadot_test_runtime::Call::Registrar(registrar::Call::register_para( - 100.into(), - Info { - scheduling: Scheduling::Always, - }, - wasm.into(), - genesis_state.into(), - )), - ))); - let (res, _mem, _rx) = alice.call_function(function, Alice).await; + let function = polkadot_test_runtime::Call::Balances(pallet_balances::Call::transfer(Default::default(), 1)); + let (res, _mem, _rx) = alice.call_function(function, Bob).await; let res = res.expect("return value expected"); let json = serde_json::from_str::(res.as_str()).expect("valid JSON"); From cf3fb7bb7b5d453ec9b37563dc8161ab964985c8 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 2 Jul 2020 17:16:35 +0200 Subject: [PATCH 68/92] rename test --- .../tests/{send-transaction.rs => call-function.rs} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename polkadot-test-service/tests/{send-transaction.rs => call-function.rs} (97%) diff --git a/polkadot-test-service/tests/send-transaction.rs b/polkadot-test-service/tests/call-function.rs similarity index 97% rename from polkadot-test-service/tests/send-transaction.rs rename to polkadot-test-service/tests/call-function.rs index 9a1290d60156..2429c6b14ec1 100644 --- a/polkadot-test-service/tests/send-transaction.rs +++ b/polkadot-test-service/tests/call-function.rs @@ -7,7 +7,7 @@ use std::time::Duration; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); #[test] -fn send_transaction_actually_work() { +fn call_function_actually_work() { let mut alice = run_test_node( (|fut, _| { async_std::task::spawn(fut); From 2bbe1b64b1e352b6cdb31f43edb1465cf9f74cb6 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 3 Jul 2020 09:34:30 +0200 Subject: [PATCH 69/92] Revert "Add test runtime to command" This reverts commit 0cdda371da76344b66761321d90cec801ec7e3bb. --- Cargo.lock | 1 - cli/Cargo.toml | 2 -- cli/src/command.rs | 13 ------------- 3 files changed, 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bdf55d61aaba..dffd57d02264 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4275,7 +4275,6 @@ dependencies = [ "log 0.4.8", "polkadot-service", "polkadot-service-new", - "polkadot-test-service", "sc-cli", "sc-client-api", "sc-client-db", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 2b44ac7b34bf..86d09238e362 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -25,7 +25,6 @@ sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cect sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } service = { package = "polkadot-service", path = "../service", default-features = false, optional = true } service-new = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true } -polkadot-test-service = { path = "../polkadot-test-service", default-features = false, optional = true } tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true } frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } @@ -48,7 +47,6 @@ cli = [ "sc-cli", "sc-service", "frame-benchmarking-cli", - "polkadot-test-service", ] service-old = [ "service/full-node" ] browser = [ diff --git a/cli/src/command.rs b/cli/src/command.rs index 16463ab6584c..7b437a2c352d 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -21,7 +21,6 @@ use service::{IdentifyVariant, self}; use service_new::{IdentifyVariant, self as service}; use sc_cli::{SubstrateCli, Result, RuntimeVersion, Role}; use crate::cli::{Cli, Subcommand}; -use polkadot_test_service::IdentifyVariant as _; fn get_exec_name() -> Option { std::env::current_exe() @@ -66,7 +65,6 @@ impl SubstrateCli for Cli { "westend-dev" => Box::new(service::chain_spec::westend_development_config()), "westend-local" => Box::new(service::chain_spec::westend_local_testnet_config()), "westend-staging" => Box::new(service::chain_spec::westend_staging_testnet_config()), - "test" => Box::new(polkadot_test_service::polkadot_local_testnet_config()), path if self.run.force_kusama => { Box::new(service::KusamaChainSpec::from_json_file(std::path::PathBuf::from(path))?) }, @@ -152,17 +150,6 @@ pub fn run() -> Result<()> { grandpa_pause, ).map(|(components, _, _)| components) }) - } else if chain_spec.is_test() { - runtime.run_node_until_exit(|config| match config.role { - Role::Light => Err("Light node for polkadot test runtime is not supported.".into()), - _ => polkadot_test_service::polkadot_test_new_full( - config, - None, - None, - authority_discovery_enabled, - 6000, - ).map(|(components, _, _, _, _)| components) - }) } else { runtime.run_node_until_exit(|config| match config.role { Role::Light => service::polkadot_new_light(config) From f97dd0cc147dd2dee955cda58efa0f700a758d07 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 3 Jul 2020 09:38:58 +0200 Subject: [PATCH 70/92] increase kusama --- runtime/kusama/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 8e91f8f829e1..17a539375870 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -86,7 +86,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("kusama"), impl_name: create_runtime_str!("parity-kusama"), authoring_version: 2, - spec_version: 2013, + spec_version: 2014, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, From 523366e79f228045309415a3c86bc88ff2fc2621 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 3 Jul 2020 11:31:55 +0200 Subject: [PATCH 71/92] Update substrate --- Cargo.lock | 282 ++++++++++++++++++++++++++--------------------------- 1 file changed, 136 insertions(+), 146 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dffd57d02264..e87ac56af557 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1261,7 +1261,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", ] @@ -1269,7 +1269,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -1286,7 +1286,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1304,7 +1304,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "serde", @@ -1330,7 +1330,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "bitmask", "frame-metadata", @@ -1355,7 +1355,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1366,7 +1366,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1378,7 +1378,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1388,7 +1388,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1404,7 +1404,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -1418,7 +1418,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "sp-api", @@ -3375,7 +3375,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3391,7 +3391,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3406,7 +3406,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3428,7 +3428,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3442,7 +3442,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3458,7 +3458,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3473,7 +3473,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3488,7 +3488,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3504,7 +3504,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3524,7 +3524,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3540,7 +3540,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3560,7 +3560,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3576,7 +3576,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3590,7 +3590,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3605,7 +3605,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3619,7 +3619,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3634,7 +3634,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3655,7 +3655,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3670,7 +3670,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3683,7 +3683,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "enumflags2", "frame-support", @@ -3698,7 +3698,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3713,7 +3713,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3733,7 +3733,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3747,7 +3747,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3761,7 +3761,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3783,7 +3783,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3794,7 +3794,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3808,7 +3808,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3826,7 +3826,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "frame-system", @@ -3841,7 +3841,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3859,7 +3859,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-support", "parity-scale-codec", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3887,7 +3887,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -3903,7 +3903,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5756,7 +5756,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "bytes 0.5.4", "derive_more 0.99.8", @@ -5783,7 +5783,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5807,7 +5807,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5823,7 +5823,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5839,7 +5839,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5850,7 +5850,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5890,7 +5890,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "fnv", @@ -5926,7 +5926,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "blake2-rfc", "hash-db", @@ -5955,7 +5955,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5966,7 +5966,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "fork-tree", @@ -6008,7 +6008,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6032,7 +6032,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6045,7 +6045,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6067,7 +6067,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6081,7 +6081,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "lazy_static", @@ -6109,7 +6109,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6126,7 +6126,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6141,7 +6141,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6162,7 +6162,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "assert_matches", "derive_more 0.99.8", @@ -6200,7 +6200,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "finality-grandpa", @@ -6217,7 +6217,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6236,7 +6236,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "hex", @@ -6252,7 +6252,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "hash-db", "lazy_static", @@ -6271,7 +6271,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "bitflags", "bs58", @@ -6323,7 +6323,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6338,7 +6338,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "env_logger", "futures 0.3.5", @@ -6365,7 +6365,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "bytes 0.5.4", "fnv", @@ -6392,7 +6392,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "futures 0.3.5", "libp2p", @@ -6405,7 +6405,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6414,7 +6414,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "futures 0.3.5", "hash-db", @@ -6446,7 +6446,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6470,7 +6470,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6486,7 +6486,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "directories", @@ -6549,7 +6549,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6563,7 +6563,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6584,7 +6584,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "erased-serde", "log 0.4.8", @@ -6601,7 +6601,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6621,7 +6621,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6714,15 +6714,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "secrecy" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9182278ed645df3477a9c27bfee0621c621aa16f6972635f7f795dae3d81070f" -dependencies = [ - "zeroize", -] - [[package]] name = "security-framework" version = "0.4.4" @@ -7007,7 +6998,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7019,7 +7010,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "hash-db", "parity-scale-codec", @@ -7034,7 +7025,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7046,7 +7037,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "serde", @@ -7058,7 +7049,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7071,7 +7062,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "sp-api", @@ -7083,7 +7074,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7094,7 +7085,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "sp-api", @@ -7106,7 +7097,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7122,7 +7113,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "serde", "serde_json", @@ -7131,7 +7122,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7155,7 +7146,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "sp-api", @@ -7169,7 +7160,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "merlin", "parity-scale-codec", @@ -7187,7 +7178,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7199,7 +7190,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "base58", "blake2-rfc", @@ -7223,7 +7214,6 @@ dependencies = [ "rand 0.7.3", "regex", "schnorrkel", - "secrecy", "serde", "sha2", "sp-debug-derive", @@ -7242,7 +7232,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7251,7 +7241,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7261,7 +7251,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "environmental", "parity-scale-codec", @@ -7272,7 +7262,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7288,7 +7278,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7298,7 +7288,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "parity-scale-codec", @@ -7310,7 +7300,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "futures 0.3.5", "hash-db", @@ -7331,7 +7321,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "lazy_static", "sp-core", @@ -7342,7 +7332,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "serde", @@ -7354,7 +7344,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7365,7 +7355,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "sp-api", "sp-core", @@ -7375,7 +7365,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "backtrace", "log 0.4.8", @@ -7384,7 +7374,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "serde", "sp-core", @@ -7393,7 +7383,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "either", "hash256-std-hasher", @@ -7415,7 +7405,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7430,7 +7420,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "Inflector", "proc-macro-crate", @@ -7442,7 +7432,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "serde", "serde_json", @@ -7451,7 +7441,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "sp-api", @@ -7464,7 +7454,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7474,7 +7464,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7495,12 +7485,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7512,7 +7502,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7526,7 +7516,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "log 0.4.8", "rental", @@ -7536,7 +7526,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7552,7 +7542,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "hash-db", "memory-db", @@ -7566,7 +7556,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "futures 0.3.5", "futures-core", @@ -7578,7 +7568,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7590,7 +7580,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7730,7 +7720,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "chrono", "clear_on_drop", @@ -7757,7 +7747,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "platforms", ] @@ -7765,7 +7755,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7788,7 +7778,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "async-std", "derive_more 0.99.8", @@ -7802,7 +7792,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "futures 0.1.29", "futures 0.3.5", @@ -7826,7 +7816,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "cfg-if", "frame-executive", @@ -7866,7 +7856,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7887,7 +7877,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#c0ab76690bcfbdb6b7472d71c5eede1417fafdec" +source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" [[package]] name = "substrate-wasm-builder-runner" From 6be349ffcf02b588d57c53a1827ffafac235a713 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 3 Jul 2020 12:05:09 +0200 Subject: [PATCH 72/92] Revert to master --- Cargo.lock | 286 +++++++++--------- availability-store/Cargo.toml | 16 +- cli/Cargo.toml | 22 +- collator/Cargo.toml | 22 +- core-primitives/Cargo.toml | 6 +- erasure-coding/Cargo.toml | 4 +- network/Cargo.toml | 16 +- network/test/Cargo.toml | 20 +- node/network/bridge/Cargo.toml | 4 +- node/overseer/Cargo.toml | 2 +- node/primitives/Cargo.toml | 2 +- node/service/Cargo.toml | 74 ++--- node/subsystem/Cargo.toml | 2 +- parachain/Cargo.toml | 12 +- parachain/test-parachains/adder/Cargo.toml | 4 +- .../test-parachains/adder/collator/Cargo.toml | 4 +- .../test-parachains/code-upgrader/Cargo.toml | 4 +- polkadot-test-service/Cargo.toml | 54 ++-- primitives/Cargo.toml | 22 +- rpc/Cargo.toml | 34 +-- runtime/common/Cargo.toml | 52 ++-- runtime/kusama/Cargo.toml | 108 +++---- runtime/parachains/Cargo.toml | 50 +-- runtime/polkadot/Cargo.toml | 104 +++---- runtime/test-runtime/Cargo.toml | 76 ++--- runtime/test-runtime/client/Cargo.toml | 22 +- runtime/westend/Cargo.toml | 110 +++---- service/Cargo.toml | 72 ++--- statement-table/Cargo.toml | 2 +- validation/Cargo.toml | 36 +-- 30 files changed, 627 insertions(+), 615 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e87ac56af557..83e013fc6ce5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1261,7 +1261,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", ] @@ -1269,7 +1269,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -1286,7 +1286,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1304,7 +1304,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "serde", @@ -1330,7 +1330,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "bitmask", "frame-metadata", @@ -1355,7 +1355,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1366,7 +1366,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1378,7 +1378,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1388,7 +1388,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1404,7 +1404,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -1418,7 +1418,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "sp-api", @@ -3375,7 +3375,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3391,7 +3391,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3406,7 +3406,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3428,7 +3428,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3442,7 +3442,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3458,7 +3458,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3473,7 +3473,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3488,7 +3488,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3504,7 +3504,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3524,7 +3524,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3540,7 +3540,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3560,7 +3560,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3576,7 +3576,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3590,7 +3590,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3605,7 +3605,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3619,7 +3619,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3634,7 +3634,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3655,7 +3655,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3670,7 +3670,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3683,7 +3683,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "enumflags2", "frame-support", @@ -3698,7 +3698,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3713,7 +3713,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3733,7 +3733,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3747,7 +3747,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3761,7 +3761,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3783,7 +3783,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3794,7 +3794,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3808,7 +3808,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3826,7 +3826,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "frame-system", @@ -3841,7 +3841,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3859,7 +3859,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-support", "parity-scale-codec", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3887,7 +3887,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3903,7 +3903,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5756,7 +5756,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "bytes 0.5.4", "derive_more 0.99.8", @@ -5783,7 +5783,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5807,7 +5807,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5816,6 +5816,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-inherents", "sp-runtime", "sp-state-machine", ] @@ -5823,7 +5824,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5839,7 +5840,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5850,7 +5851,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5872,6 +5873,7 @@ dependencies = [ "sc-service", "sc-telemetry", "sc-tracing", + "serde", "serde_json", "sp-blockchain", "sp-core", @@ -5890,7 +5892,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "fnv", @@ -5926,7 +5928,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "blake2-rfc", "hash-db", @@ -5955,7 +5957,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5966,7 +5968,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "fork-tree", @@ -6008,7 +6010,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6032,7 +6034,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6045,7 +6047,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6067,7 +6069,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6081,7 +6083,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "lazy_static", @@ -6109,7 +6111,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6126,7 +6128,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6141,7 +6143,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6162,7 +6164,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "assert_matches", "derive_more 0.99.8", @@ -6200,7 +6202,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "finality-grandpa", @@ -6217,7 +6219,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6236,7 +6238,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "hex", @@ -6252,7 +6254,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "hash-db", "lazy_static", @@ -6271,7 +6273,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "bitflags", "bs58", @@ -6323,7 +6325,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6338,7 +6340,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "env_logger", "futures 0.3.5", @@ -6365,7 +6367,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "bytes 0.5.4", "fnv", @@ -6392,7 +6394,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "futures 0.3.5", "libp2p", @@ -6405,7 +6407,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6414,7 +6416,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "futures 0.3.5", "hash-db", @@ -6446,7 +6448,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6470,7 +6472,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6486,7 +6488,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "directories", @@ -6549,7 +6551,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6563,7 +6565,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6584,7 +6586,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "erased-serde", "log 0.4.8", @@ -6601,7 +6603,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6621,7 +6623,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6714,6 +6716,15 @@ dependencies = [ "untrusted", ] +[[package]] +name = "secrecy" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9182278ed645df3477a9c27bfee0621c621aa16f6972635f7f795dae3d81070f" +dependencies = [ + "zeroize", +] + [[package]] name = "security-framework" version = "0.4.4" @@ -6998,7 +7009,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7010,7 +7021,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "hash-db", "parity-scale-codec", @@ -7025,7 +7036,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7037,7 +7048,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "serde", @@ -7049,7 +7060,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7062,7 +7073,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "sp-api", @@ -7074,7 +7085,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7085,7 +7096,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "sp-api", @@ -7097,7 +7108,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7113,7 +7124,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "serde", "serde_json", @@ -7122,7 +7133,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7146,7 +7157,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "sp-api", @@ -7160,7 +7171,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "merlin", "parity-scale-codec", @@ -7178,7 +7189,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7190,7 +7201,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "base58", "blake2-rfc", @@ -7214,6 +7225,7 @@ dependencies = [ "rand 0.7.3", "regex", "schnorrkel", + "secrecy", "serde", "sha2", "sp-debug-derive", @@ -7232,7 +7244,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7241,7 +7253,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7251,7 +7263,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "environmental", "parity-scale-codec", @@ -7262,7 +7274,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7278,7 +7290,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7288,7 +7300,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "parity-scale-codec", @@ -7300,7 +7312,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "futures 0.3.5", "hash-db", @@ -7321,7 +7333,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "lazy_static", "sp-core", @@ -7332,7 +7344,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "serde", @@ -7344,7 +7356,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7355,7 +7367,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "sp-api", "sp-core", @@ -7365,7 +7377,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "backtrace", "log 0.4.8", @@ -7374,7 +7386,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "serde", "sp-core", @@ -7383,7 +7395,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "either", "hash256-std-hasher", @@ -7405,7 +7417,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7420,7 +7432,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "Inflector", "proc-macro-crate", @@ -7432,7 +7444,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "serde", "serde_json", @@ -7441,7 +7453,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "sp-api", @@ -7454,7 +7466,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7464,7 +7476,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7485,12 +7497,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7502,7 +7514,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7516,7 +7528,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "log 0.4.8", "rental", @@ -7526,7 +7538,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7542,7 +7554,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "hash-db", "memory-db", @@ -7556,7 +7568,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "futures 0.3.5", "futures-core", @@ -7568,7 +7580,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7580,7 +7592,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7720,7 +7732,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "chrono", "clear_on_drop", @@ -7747,7 +7759,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "platforms", ] @@ -7755,7 +7767,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7778,7 +7790,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "async-std", "derive_more 0.99.8", @@ -7792,7 +7804,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "futures 0.1.29", "futures 0.3.5", @@ -7816,7 +7828,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "cfg-if", "frame-executive", @@ -7849,14 +7861,14 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers)", + "substrate-wasm-builder-runner 1.0.6 (git+https://github.com/paritytech/substrate)", "trie-db 0.21.0", ] [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7877,7 +7889,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate?branch=cecton-testing-helpers#fd000eff12c869a83170f54d08c69d42939873b3" +source = "git+https://github.com/paritytech/substrate#facc6741400a21fa3b5a3eedfe444f30ab5df8b0" [[package]] name = "substrate-wasm-builder-runner" diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index bdd852888132..503e897ceadb 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 = "cecton-testing-helpers" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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.6.0" kvdb-memorydb = "0.6.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 86d09238e362..b395ccba9dc3 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -17,26 +17,26 @@ 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 = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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, optional = true } service-new = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true } tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", 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 = "cecton-testing-helpers" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = [ "wasmtime", "db", "cli", "service-old" ] diff --git a/collator/Cargo.toml b/collator/Cargo.toml index 169f4cea8762..42e733419fef 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 = "cecton-testing-helpers" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } @@ -29,7 +29,7 @@ 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 = "cecton-testing-helpers" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } [features] default = ["service-old"] diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml index 10dabb24f74b..b0f5971e2a59 100644 --- a/core-primitives/Cargo.toml +++ b/core-primitives/Cargo.toml @@ -5,9 +5,9 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +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 } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = [ "derive" ] } [features] diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index 1ad1701a3ce4..9c49e33f407c 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 = "cecton-testing-helpers" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 be6dfbe4b320..0735fec5907f 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 = "cecton-testing-helpers" } -sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 b273b64191b4..ad8cafe3f453 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 = "cecton-testing-helpers" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "cecton-testing-helpers" } -sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml index 548293d54ef9..4f6c8631e2f9 100644 --- a/node/network/bridge/Cargo.toml +++ b/node/network/bridge/Cargo.toml @@ -12,8 +12,8 @@ streamunordered = "0.5.1" polkadot-primitives = { path = "../../../primitives" } node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" } parity-scale-codec = "1.3.0" -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } [dev-dependencies] diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index a3721e1110bb..6c6ce304e6d4 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -10,7 +10,7 @@ log = "0.4.8" futures-timer = "3.0.2" streamunordered = "0.5.1" polkadot-primitives = { path = "../../primitives" } -client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem" } async-trait = "0.1" diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml index 52dfdd4302cf..b2bc9231ae74 100644 --- a/node/primitives/Cargo.toml +++ b/node/primitives/Cargo.toml @@ -9,5 +9,5 @@ description = "Primitives types for the Node-side" polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } parity-scale-codec = { version = "1.3.0", default-features = false, features = ["derive"] } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } async-trait = "0.1" diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 9606591c6814..f1a56acfad95 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -20,47 +20,47 @@ 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 = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } +sc-basic-authorship = { 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 = "cecton-testing-helpers" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } env_logger = "0.7.0" [features] diff --git a/node/subsystem/Cargo.toml b/node/subsystem/Cargo.toml index 0417008c3faf..43712319cb71 100644 --- a/node/subsystem/Cargo.toml +++ b/node/subsystem/Cargo.toml @@ -9,6 +9,6 @@ description = "Subsystem traits and message definitions" polkadot-primitives = { path = "../../primitives" } polkadot-statement-table = { path = "../../statement-table" } polkadot-node-primitives = { path = "../primitives" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } futures = "0.3.5" async-trait = "0.1" diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 83d8f239013a..fb1e1ce50351 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 = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } polkadot-core-primitives = { path = "../core-primitives", 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-externalities = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", optional = true } +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 154730309871..2cfb77566db6 100644 --- a/parachain/test-parachains/adder/Cargo.toml +++ b/parachain/test-parachains/adder/Cargo.toml @@ -9,12 +9,12 @@ build = "build.rs" [dependencies] parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } 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 = "cecton-testing-helpers", 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.6" } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 2e7d400037cc..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 = "cecton-testing-helpers" } -client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 d3a68e0de780..6f673adbf82a 100644 --- a/parachain/test-parachains/code-upgrader/Cargo.toml +++ b/parachain/test-parachains/code-upgrader/Cargo.toml @@ -9,12 +9,12 @@ build = "build.rs" [dependencies] parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } 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 = "cecton-testing-helpers", 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.6" } diff --git a/polkadot-test-service/Cargo.toml b/polkadot-test-service/Cargo.toml index 364c52cd8b48..ede868b4f169 100644 --- a/polkadot-test-service/Cargo.toml +++ b/polkadot-test-service/Cargo.toml @@ -19,34 +19,34 @@ polkadot-network = { path = "../network" } polkadot-rpc = { path = "../rpc" } polkadot-service = { path = "../service" } polkadot-runtime-common = { path = "../runtime/common" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-informant = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { 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 } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } +authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-informant = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] async-std = "1.5" serde_json = "1.0" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 71e1578f4bc5..f3bc264c8cb4 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,22 +7,22 @@ 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 = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } polkadot-core-primitives = { path = "../core-primitives", default-features = false } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [dev-dependencies] -sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 488b1daad6b7..ce2f6382b468 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -7,21 +7,21 @@ edition = "2018" [dependencies] jsonrpc-core = "14.0.3" polkadot-primitives = { path = "../primitives" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers"} -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master"} +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "master"} +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "master"} +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-keystore = { 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 } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 80fda29ccaaf..2b31e989c898 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -13,39 +13,39 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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-session = { 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 = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +transaction-payment = { package = "pallet-transaction-payment", 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 = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } trie-db = "0.21.0" serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 8e9967535a91..dbe3934dd3ee 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -15,60 +15,60 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +multisig = { package = "pallet-multisig", 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 } +proxy = { package = "pallet-proxy", 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 = "cecton-testing-helpers", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -78,8 +78,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 = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index c4c54145239d..ab4ca5a78309 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -12,25 +12,25 @@ 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 = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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-session = { 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 = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } @@ -40,13 +40,13 @@ rand_chacha = { version = "0.2.2", default-features = false } [dev-dependencies] hex-literal = "0.2.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" libsecp256k1 = "0.3.2" diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index ca240e4e38f1..96ec48d318e7 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -15,58 +15,58 @@ serde_derive = { version = "1.0.102", optional = true } static_assertions = "1.1.0" smallvec = "1.4.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +multisig = { package = "pallet-multisig", 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 } +proxy = { package = "pallet-proxy", 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 } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-system-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 } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -76,8 +76,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 = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 8c46b19ca504..1e41686e2365 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -14,43 +14,43 @@ serde = { version = "1.0.102", default-features = false } serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +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 } -authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +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 } +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 } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -60,8 +60,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 = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/test-runtime/client/Cargo.toml b/runtime/test-runtime/client/Cargo.toml index 5c4fd9c05404..a9439e060968 100644 --- a/runtime/test-runtime/client/Cargo.toml +++ b/runtime/test-runtime/client/Cargo.toml @@ -6,19 +6,19 @@ edition = "2018" license = "GPL-3.0" [dependencies] -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-light = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", features = ["test-helpers"], default-features = false } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-light = { 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 = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 348a4a15adb2..9e6af55afc08 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -15,61 +15,61 @@ serde_derive = { version = "1.0.102", optional = true } smallvec = "1.4.0" static_assertions = "1.1.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -version = { package = "sp-version", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 = "cecton-testing-helpers", default-features = false } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", 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 } +multisig = { package = "pallet-multisig", 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 } +proxy = { package = "pallet-proxy", 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 = "cecton-testing-helpers", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-system-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 } hex-literal = { version = "0.2.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -80,8 +80,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 = "cecton-testing-helpers" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.41" [build-dependencies] diff --git a/service/Cargo.toml b/service/Cargo.toml index b272647859b9..5eb47ec8875c 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 = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers", default-features = false } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } +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 c93a13a2be93..831ae6cd4354 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 = "cecton-testing-helpers" } +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 95469bcf21ee..42e417fef6f0 100644 --- a/validation/Cargo.toml +++ b/validation/Cargo.toml @@ -18,24 +18,24 @@ 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 = "cecton-testing-helpers" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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 = "cecton-testing-helpers" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +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" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cecton-testing-helpers" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } From c4cd5fbb4b120f1455320efacb703ff142d7a5e7 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 3 Jul 2020 20:31:39 +0200 Subject: [PATCH 73/92] Cargo.lock again --- Cargo.lock | 274 +++++++++++++++++++++++++++-------------------------- 1 file changed, 138 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ed2fc4410e0..fe1d52e56b43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1261,7 +1261,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", ] @@ -1269,7 +1269,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -1286,7 +1286,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1304,7 +1304,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "serde", @@ -1330,7 +1330,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "bitmask", "frame-metadata", @@ -1355,7 +1355,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1366,7 +1366,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1378,7 +1378,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1388,7 +1388,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1404,7 +1404,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -1418,7 +1418,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "sp-api", @@ -3375,7 +3375,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3391,7 +3391,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3406,7 +3406,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3428,7 +3428,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3442,7 +3442,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3458,7 +3458,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3473,7 +3473,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3488,7 +3488,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3504,7 +3504,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3524,7 +3524,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3540,7 +3540,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3560,7 +3560,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3576,7 +3576,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3590,7 +3590,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3605,7 +3605,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3619,7 +3619,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3634,7 +3634,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3655,7 +3655,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3670,7 +3670,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3683,7 +3683,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "enumflags2", "frame-support", @@ -3698,7 +3698,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3713,7 +3713,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3733,7 +3733,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3747,7 +3747,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3761,7 +3761,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3783,7 +3783,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3794,7 +3794,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3808,7 +3808,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3826,7 +3826,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "frame-system", @@ -3841,7 +3841,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3859,7 +3859,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-support", "parity-scale-codec", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3887,7 +3887,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-benchmarking", "frame-support", @@ -3903,7 +3903,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5759,7 +5759,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "bytes 0.5.4", "derive_more 0.99.8", @@ -5786,7 +5786,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5810,7 +5810,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5827,7 +5827,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5843,7 +5843,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5854,7 +5854,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5895,7 +5895,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "fnv", @@ -5931,7 +5931,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "blake2-rfc", "hash-db", @@ -5960,7 +5960,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5971,7 +5971,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "fork-tree", @@ -6013,7 +6013,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6037,7 +6037,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6050,7 +6050,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6072,7 +6072,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6086,7 +6086,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "lazy_static", @@ -6114,7 +6114,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6131,7 +6131,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6146,7 +6146,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6167,7 +6167,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "assert_matches", "derive_more 0.99.8", @@ -6205,7 +6205,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "finality-grandpa", @@ -6222,7 +6222,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6241,7 +6241,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "hex", @@ -6257,7 +6257,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "hash-db", "lazy_static", @@ -6276,7 +6276,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "bitflags", "bs58", @@ -6328,7 +6328,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6343,7 +6343,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "env_logger", "futures 0.3.5", @@ -6370,7 +6370,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "bytes 0.5.4", "fnv", @@ -6397,7 +6397,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "futures 0.3.5", "libp2p", @@ -6410,7 +6410,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6419,7 +6419,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "futures 0.3.5", "hash-db", @@ -6451,7 +6451,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6475,7 +6475,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6491,7 +6491,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "directories", @@ -6554,7 +6554,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6568,7 +6568,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6589,7 +6589,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "erased-serde", "log 0.4.8", @@ -6606,7 +6606,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6626,7 +6626,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7012,7 +7012,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7024,7 +7024,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "hash-db", "parity-scale-codec", @@ -7039,7 +7039,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7051,7 +7051,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "serde", @@ -7063,7 +7063,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7076,7 +7076,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "sp-api", @@ -7088,7 +7088,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7099,7 +7099,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "sp-api", @@ -7111,7 +7111,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7127,7 +7127,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "serde", "serde_json", @@ -7136,7 +7136,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7160,7 +7160,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "sp-api", @@ -7174,7 +7174,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "merlin", "parity-scale-codec", @@ -7192,7 +7192,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7204,7 +7204,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "base58", "blake2-rfc", @@ -7247,7 +7247,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7256,7 +7256,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7266,7 +7266,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "environmental", "parity-scale-codec", @@ -7277,7 +7277,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7293,7 +7293,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7303,7 +7303,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "parity-scale-codec", @@ -7315,7 +7315,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "futures 0.3.5", "hash-db", @@ -7336,7 +7336,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "lazy_static", "sp-core", @@ -7347,7 +7347,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "serde", @@ -7359,7 +7359,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7370,7 +7370,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "sp-api", "sp-core", @@ -7380,7 +7380,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "backtrace", "log 0.4.8", @@ -7389,7 +7389,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "serde", "sp-core", @@ -7398,7 +7398,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "either", "hash256-std-hasher", @@ -7420,7 +7420,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7435,7 +7435,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "Inflector", "proc-macro-crate", @@ -7447,7 +7447,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "serde", "serde_json", @@ -7456,7 +7456,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "sp-api", @@ -7469,7 +7469,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7479,7 +7479,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7500,12 +7500,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7517,7 +7517,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7531,7 +7531,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "log 0.4.8", "rental", @@ -7541,7 +7541,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7557,7 +7557,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "hash-db", "memory-db", @@ -7571,7 +7571,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "futures 0.3.5", "futures-core", @@ -7583,7 +7583,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7595,7 +7595,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7735,7 +7735,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "chrono", "clear_on_drop", @@ -7762,7 +7762,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "platforms", ] @@ -7770,7 +7770,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7793,7 +7793,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "async-std", "derive_more 0.99.8", @@ -7807,10 +7807,12 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ + "futures 0.1.29", "futures 0.3.5", "hash-db", + "hex", "parity-scale-codec", "sc-client-api", "sc-client-db", @@ -7829,7 +7831,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "cfg-if", "frame-executive", @@ -7869,7 +7871,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7890,7 +7892,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" +source = "git+https://github.com/paritytech/substrate#65ab6f2e9c3281460c3316dc97e618c5275a4a05" [[package]] name = "substrate-wasm-builder-runner" From a44b1c0afcc8fb7faa548f9dff47ea99428c0c45 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 3 Jul 2020 20:33:52 +0200 Subject: [PATCH 74/92] removed unused id prefix --- polkadot-test-service/src/chain_spec.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-test-service/src/chain_spec.rs b/polkadot-test-service/src/chain_spec.rs index 11512f1666e2..742939f64c32 100644 --- a/polkadot-test-service/src/chain_spec.rs +++ b/polkadot-test-service/src/chain_spec.rs @@ -157,6 +157,6 @@ pub trait IdentifyVariant { impl IdentifyVariant for Box { fn is_test(&self) -> bool { - self.id().starts_with("test") || self.id().starts_with("tst") // TODO not sure why I need a 3 chars variant + self.id().starts_with("test") } } From e8573ae5d8d360553fde59c098f6ecc643fa13b8 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 3 Jul 2020 23:21:25 +0200 Subject: [PATCH 75/92] fix update --- polkadot-test-service/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 2d435fc28035..17e54c15da28 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -138,8 +138,8 @@ pub fn node_config( network_config.transport = TransportConfig::MemoryOnly; Ok(Configuration { - impl_name: "polkadot-test-node", - impl_version: "0.1", + impl_name: "polkadot-test-node".to_string(), + impl_version: "0.1".to_string(), role, task_executor, transaction_pool: Default::default(), From 5916b395eb85e4eabca4d9834834b6c59c36dfa8 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 6 Jul 2020 17:50:51 +0200 Subject: [PATCH 76/92] Update runtime/test-runtime/src/lib.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bastian Köcher --- runtime/test-runtime/src/lib.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index d2f2cbdb098b..5cf534695d4d 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -654,8 +654,6 @@ sp_api::impl_runtime_apis! { impl authority_discovery_primitives::AuthorityDiscoveryApi for Runtime { fn authorities() -> Vec { - // TODO and to fix - //AuthorityDiscovery::authorities() Vec::new() } } From d620fc613e8b2c08bf4acc2dfb11f8e847790514 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 6 Jul 2020 18:04:23 +0200 Subject: [PATCH 77/92] Update polkadot-test-service/src/lib.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bastian Köcher --- polkadot-test-service/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 17e54c15da28..2ea4d9d2f8f2 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2017-2020 Parity Technologies (UK) Ltd. +// Copyright 2020 Parity Technologies (UK) Ltd. // This file is part of Polkadot. // Polkadot is free software: you can redistribute it and/or modify From f108a3f251bb5bbc41494ee9f3cced3505c30e9c Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 6 Jul 2020 18:39:13 +0200 Subject: [PATCH 78/92] apply suggestions --- polkadot-test-service/src/lib.rs | 33 ++++++++++---------- polkadot-test-service/tests/build-blocks.rs | 22 ++++++++++--- polkadot-test-service/tests/call-function.rs | 30 +++++++++++++++--- 3 files changed, 60 insertions(+), 25 deletions(-) diff --git a/polkadot-test-service/src/lib.rs b/polkadot-test-service/src/lib.rs index 2ea4d9d2f8f2..64c7ffae9032 100644 --- a/polkadot-test-service/src/lib.rs +++ b/polkadot-test-service/src/lib.rs @@ -103,15 +103,18 @@ pub fn node_config( task_executor: TaskExecutor, key: Sr25519Keyring, boot_nodes: Vec, -) -> Result { - let base_path = BasePath::new_temp_dir()?; +) -> Configuration { + let base_path = BasePath::new_temp_dir().expect("could not create temporary directory"); let root = base_path.path(); let role = Role::Authority { sentry_nodes: Vec::new(), }; let key_seed = key.to_seed(); let mut spec = polkadot_local_testnet_config(); - let mut storage = spec.as_storage_builder().build_storage()?; + let mut storage = spec + .as_storage_builder() + .build_storage() + .expect("could not build storage"); BasicExternalities::execute_with_storage(&mut storage, storage_update_func); spec.set_storage(storage); @@ -137,7 +140,7 @@ pub fn node_config( network_config.transport = TransportConfig::MemoryOnly; - Ok(Configuration { + Configuration { impl_name: "polkadot-test-node".to_string(), impl_version: "0.1".to_string(), role, @@ -185,7 +188,7 @@ pub fn node_config( announce_block: true, base_path: Some(base_path), informant_output_format, - }) + } } /// Run a Polkadot test node using the Polkadot test runtime. The node will be using an in-memory socket, therefore you @@ -196,31 +199,27 @@ pub fn run_test_node( key: Sr25519Keyring, storage_update_func: impl Fn(), boot_nodes: Vec, -) -> Result< - PolkadotTestNode< - TaskManager, - impl PolkadotClient, polkadot_test_runtime::RuntimeApi>, - >, - ServiceError, +) -> PolkadotTestNode< + TaskManager, + impl PolkadotClient, polkadot_test_runtime::RuntimeApi>, > { - let config = node_config(storage_update_func, task_executor, key, boot_nodes)?; + let config = node_config(storage_update_func, task_executor, key, boot_nodes); let multiaddr = config.network.listen_addresses[0].clone(); let authority_discovery_enabled = false; let (task_manager, client, handles, network, rpc_handlers) = - polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000)?; + polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000) + .expect("could not create Polkadot test service"); let peer_id = network.local_peer_id().clone(); let addr = MultiaddrWithPeerId { multiaddr, peer_id }; - let node = PolkadotTestNode { + PolkadotTestNode { task_manager, client, handles, addr, rpc_handlers, - }; - - Ok(node) + } } /// A Polkadot test node instance used for testing. diff --git a/polkadot-test-service/tests/build-blocks.rs b/polkadot-test-service/tests/build-blocks.rs index 3d6f45199ced..e70332b09432 100644 --- a/polkadot-test-service/tests/build-blocks.rs +++ b/polkadot-test-service/tests/build-blocks.rs @@ -1,3 +1,19 @@ +// Copyright 2020 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. + +// Polkadot is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Polkadot is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . + use async_std::task::{block_on, sleep}; use futures::{future, pin_mut, select, FutureExt as _}; use polkadot_test_service::*; @@ -18,15 +34,13 @@ fn ensure_test_service_build_blocks() { Sr25519Keyring::Alice, || {}, Vec::new(), - ) - .unwrap(); + ); let mut bob = run_test_node( task_executor.clone(), Sr25519Keyring::Bob, || {}, vec![alice.addr.clone()], - ) - .unwrap(); + ); let t1 = sleep(Duration::from_secs( INTEGRATION_TEST_ALLOWED_TIME .and_then(|x| x.parse().ok()) diff --git a/polkadot-test-service/tests/call-function.rs b/polkadot-test-service/tests/call-function.rs index 2429c6b14ec1..eb71a46ec3ab 100644 --- a/polkadot-test-service/tests/call-function.rs +++ b/polkadot-test-service/tests/call-function.rs @@ -1,3 +1,19 @@ +// Copyright 2020 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. + +// Polkadot is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Polkadot is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . + use async_std::task::{block_on, sleep}; use futures::{pin_mut, select, FutureExt as _}; use polkadot_test_service::*; @@ -16,8 +32,7 @@ fn call_function_actually_work() { Alice, || {}, Vec::new(), - ) - .unwrap(); + ); let t1 = sleep(Duration::from_secs( INTEGRATION_TEST_ALLOWED_TIME .and_then(|x| x.parse().ok()) @@ -25,7 +40,10 @@ fn call_function_actually_work() { )) .fuse(); let t2 = async { - let function = polkadot_test_runtime::Call::Balances(pallet_balances::Call::transfer(Default::default(), 1)); + let function = polkadot_test_runtime::Call::Balances(pallet_balances::Call::transfer( + Default::default(), + 1, + )); let (res, _mem, _rx) = alice.call_function(function, Bob).await; let res = res.expect("return value expected"); @@ -34,7 +52,11 @@ fn call_function_actually_work() { assert!(object.contains_key("jsonrpc"), "key jsonrpc exists"); let result = object.get("result"); let result = result.expect("key result exists"); - assert_eq!(result.as_str().map(|x| x.starts_with("0x")), Some(true), "result starts with 0x"); + assert_eq!( + result.as_str().map(|x| x.starts_with("0x")), + Some(true), + "result starts with 0x" + ); alice.task_manager.terminate(); } From 602814a7c48f99d9c61f47bebb14dace563b9795 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 7 Jul 2020 05:05:09 +0200 Subject: [PATCH 79/92] add missing license --- polkadot-test-service/src/chain_spec.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/polkadot-test-service/src/chain_spec.rs b/polkadot-test-service/src/chain_spec.rs index 742939f64c32..8617923d7029 100644 --- a/polkadot-test-service/src/chain_spec.rs +++ b/polkadot-test-service/src/chain_spec.rs @@ -1,3 +1,19 @@ +// Copyright 2020 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. + +// Polkadot is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Polkadot is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . + use babe_primitives::AuthorityId as BabeId; use grandpa::AuthorityId as GrandpaId; use pallet_staking::Forcing; From 42545d5ff8789dedf68a6cce34ec35483637f1f7 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 7 Jul 2020 05:37:21 +0200 Subject: [PATCH 80/92] Move polkadot-test-service to node/test-service --- Cargo.toml | 2 +- .../test-service}/Cargo.toml | 16 ++++++++-------- .../test-service}/src/chain_spec.rs | 0 .../test-service}/src/lib.rs | 0 .../test-service}/tests/build-blocks.rs | 0 .../test-service}/tests/call-function.rs | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename {polkadot-test-service => node/test-service}/Cargo.toml (88%) rename {polkadot-test-service => node/test-service}/src/chain_spec.rs (100%) rename {polkadot-test-service => node/test-service}/src/lib.rs (100%) rename {polkadot-test-service => node/test-service}/tests/build-blocks.rs (100%) rename {polkadot-test-service => node/test-service}/tests/call-function.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 80afad3b5426..b09e129e00ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,6 @@ members = [ "erasure-coding", "network", "network/test", - "polkadot-test-service", "primitives", "runtime/common", "runtime/parachains", @@ -52,6 +51,7 @@ members = [ "node/service", "node/subsystem", "node/test-helpers/subsystem", + "node/test-service", "parachain/test-parachains", "parachain/test-parachains/adder", diff --git a/polkadot-test-service/Cargo.toml b/node/test-service/Cargo.toml similarity index 88% rename from polkadot-test-service/Cargo.toml rename to node/test-service/Cargo.toml index ede868b4f169..f6f61cfdd78b 100644 --- a/polkadot-test-service/Cargo.toml +++ b/node/test-service/Cargo.toml @@ -11,14 +11,14 @@ tempfile = "3.1.0" rand = "0.7.3" hex = "0.4" futures01 = { package = "futures", version = "0.1.29" } -av_store = { package = "polkadot-availability-store", path = "../availability-store" } -consensus = { package = "polkadot-validation", path = "../validation" } -polkadot-primitives = { path = "../primitives" } -polkadot-test-runtime = { path = "../runtime/test-runtime" } -polkadot-network = { path = "../network" } -polkadot-rpc = { path = "../rpc" } -polkadot-service = { path = "../service" } -polkadot-runtime-common = { path = "../runtime/common" } +av_store = { package = "polkadot-availability-store", path = "../../availability-store" } +consensus = { package = "polkadot-validation", path = "../../validation" } +polkadot-primitives = { path = "../../primitives" } +polkadot-test-runtime = { path = "../../runtime/test-runtime" } +polkadot-network = { path = "../../network" } +polkadot-rpc = { path = "../../rpc" } +polkadot-service = { path = "../../service" } +polkadot-runtime-common = { path = "../../runtime/common" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/polkadot-test-service/src/chain_spec.rs b/node/test-service/src/chain_spec.rs similarity index 100% rename from polkadot-test-service/src/chain_spec.rs rename to node/test-service/src/chain_spec.rs diff --git a/polkadot-test-service/src/lib.rs b/node/test-service/src/lib.rs similarity index 100% rename from polkadot-test-service/src/lib.rs rename to node/test-service/src/lib.rs diff --git a/polkadot-test-service/tests/build-blocks.rs b/node/test-service/tests/build-blocks.rs similarity index 100% rename from polkadot-test-service/tests/build-blocks.rs rename to node/test-service/tests/build-blocks.rs diff --git a/polkadot-test-service/tests/call-function.rs b/node/test-service/tests/call-function.rs similarity index 100% rename from polkadot-test-service/tests/call-function.rs rename to node/test-service/tests/call-function.rs From c94459c1de031d315ef5dc7fa4863dfdfa221afe Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 7 Jul 2020 05:39:01 +0200 Subject: [PATCH 81/92] Sort dependencies and group --- node/test-service/Cargo.toml | 54 +++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/node/test-service/Cargo.toml b/node/test-service/Cargo.toml index f6f61cfdd78b..c1e81af033d1 100644 --- a/node/test-service/Cargo.toml +++ b/node/test-service/Cargo.toml @@ -5,48 +5,52 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -log = "0.4.8" futures = "0.3.4" -tempfile = "3.1.0" -rand = "0.7.3" -hex = "0.4" futures01 = { package = "futures", version = "0.1.29" } +hex = "0.4" +log = "0.4.8" +rand = "0.7.3" +tempfile = "3.1.0" + +# Polkadot dependencies av_store = { package = "polkadot-availability-store", path = "../../availability-store" } consensus = { package = "polkadot-validation", path = "../../validation" } -polkadot-primitives = { path = "../../primitives" } -polkadot-test-runtime = { path = "../../runtime/test-runtime" } polkadot-network = { path = "../../network" } +polkadot-primitives = { path = "../../primitives" } polkadot-rpc = { path = "../../rpc" } -polkadot-service = { path = "../../service" } polkadot-runtime-common = { path = "../../runtime/common" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-api = { 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" } +polkadot-service = { path = "../../service" } +polkadot-test-runtime = { path = "../../runtime/test-runtime" } + +# Substrate dependencies +authority-discovery = { package = "sc-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" } consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } +frame-system = { 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 } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-informant = { git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-arithmetic = { 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" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] async-std = "1.5" -serde_json = "1.0" pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +serde_json = "1.0" From 16374556fa2f694256f4ae27d12056bcbfa42741 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 7 Jul 2020 13:03:57 +0200 Subject: [PATCH 82/92] Attempt to remove genesismap --- Cargo.lock | 1 + node/test-service/src/chain_spec.rs | 3 +- runtime/test-runtime/client/Cargo.toml | 25 +++++---- runtime/test-runtime/client/src/lib.rs | 16 ++++-- runtime/test-runtime/src/genesismap.rs | 77 -------------------------- runtime/test-runtime/src/lib.rs | 2 - 6 files changed, 30 insertions(+), 94 deletions(-) delete mode 100644 runtime/test-runtime/src/genesismap.rs diff --git a/Cargo.lock b/Cargo.lock index 50d76afad910..f94f4f787c38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4941,6 +4941,7 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-common", "polkadot-test-runtime", + "polkadot-test-service", "sc-block-builder", "sc-client-api", "sc-consensus", diff --git a/node/test-service/src/chain_spec.rs b/node/test-service/src/chain_spec.rs index 8617923d7029..14ecae6fa7e7 100644 --- a/node/test-service/src/chain_spec.rs +++ b/node/test-service/src/chain_spec.rs @@ -45,7 +45,8 @@ pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { ) } -fn polkadot_local_testnet_genesis() -> polkadot_test_runtime::GenesisConfig { +/// Polkadot local testnet genesis config (multivalidator Alice + Bob) +pub fn polkadot_local_testnet_genesis() -> polkadot_test_runtime::GenesisConfig { polkadot_testnet_genesis( vec![ get_authority_keys_from_seed("Alice"), diff --git a/runtime/test-runtime/client/Cargo.toml b/runtime/test-runtime/client/Cargo.toml index a9439e060968..7dbb7d5ec5a0 100644 --- a/runtime/test-runtime/client/Cargo.toml +++ b/runtime/test-runtime/client/Cargo.toml @@ -6,19 +6,24 @@ edition = "2018" license = "GPL-3.0" [dependencies] +futures = "0.3.1" +codec = { package = "parity-scale-codec", version = "1.0.0" } + +# Polkadot dependencies +polkadot-primitives = { path = "../../../primitives" } +polkadot-runtime-common = { path = "../../common" } +polkadot-test-runtime = { path = ".." } +polkadot-test-service = { path = "../../../node/test-service" } + +# Substrate dependencies +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-light = { 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 = "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 = "master" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } -futures = "0.3.1" +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/runtime/test-runtime/client/src/lib.rs b/runtime/test-runtime/client/src/lib.rs index d1f4466bab78..0931bb93041e 100644 --- a/runtime/test-runtime/client/src/lib.rs +++ b/runtime/test-runtime/client/src/lib.rs @@ -24,10 +24,14 @@ use std::convert::TryFrom; pub use substrate_test_client::*; pub use polkadot_test_runtime as runtime; -use sp_core::{sr25519, ChangesTrieConfiguration, map, twox_128}; +use sp_core::{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 polkadot_test_runtime::GenesisConfig; +use polkadot_test_service::polkadot_local_testnet_genesis; +use sp_runtime::{ + traits::{Block as BlockT, Header as HeaderT, Hash as HashT, HashFor}, + BuildStorage, +}; use sc_consensus::LongestChain; use sc_client_api::light::{RemoteCallRequest, RemoteBodyRequest}; use sc_service::client::{ @@ -90,6 +94,9 @@ pub struct GenesisParameters { impl GenesisParameters { fn genesis_config(&self) -> GenesisConfig { + polkadot_local_testnet_genesis() + // TODO: pass parameters somehow + /* GenesisConfig::new( self.changes_trie_config.clone(), vec![ @@ -100,6 +107,7 @@ impl GenesisParameters { 1000, self.extra_storage.clone(), ) + */ } } @@ -113,7 +121,7 @@ impl substrate_test_client::GenesisInit for GenesisParameters { fn genesis_storage(&self) -> Storage { use codec::Encode; - let mut storage = self.genesis_config().genesis_map(); + let mut storage = self.genesis_config().build_storage().unwrap(); let child_roots = storage.children_default.iter().map(|(sk, child_content)| { let state_root = <<::Header as HeaderT>::Hashing as HashT>::trie_root( diff --git a/runtime/test-runtime/src/genesismap.rs b/runtime/test-runtime/src/genesismap.rs deleted file mode 100644 index 9df3d34eb713..000000000000 --- a/runtime/test-runtime/src/genesismap.rs +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright 2020 Parity Technologies (UK) Ltd. -// This file is part of Substrate. - -// Substrate is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Substrate is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Substrate. If not, see . - -//! Tool for creating the genesis block. - -use std::collections::BTreeMap; -use super::{AccountId, WASM_BINARY, constants::currency}; -use sp_core::ChangesTrieConfiguration; -use sp_core::storage::Storage; -use sp_runtime::BuildStorage; - -/// Configuration of a general Substrate test genesis block. -pub struct GenesisConfig { - changes_trie_config: Option, - balances: Vec<(AccountId, u128)>, - /// Additional storage key pairs that will be added to the genesis map. - extra_storage: Storage, -} - -impl GenesisConfig { - pub fn new( - changes_trie_config: Option, - endowed_accounts: Vec, - balance: u128, - extra_storage: Storage, - ) -> Self { - GenesisConfig { - changes_trie_config, - balances: endowed_accounts.into_iter().map(|a| (a, balance * currency::DOLLARS)).collect(), - extra_storage, - } - } - - pub fn genesis_map(&self) -> Storage { - // Assimilate the system genesis config. - let mut storage = Storage { - top: BTreeMap::new(), - children_default: self.extra_storage.children_default.clone(), - }; - let config = crate::GenesisConfig { - system: Some(system::GenesisConfig { - changes_trie_config: self.changes_trie_config.clone(), - code: WASM_BINARY.to_vec(), - }), - babe: None, - indices: None, - balances: Some(balances::GenesisConfig { - balances: self.balances.clone() - }), - staking: None, - session: None, - grandpa: None, - claims: None, - parachains: None, - registrar: None, - vesting: None, - authority_discovery: None, - sudo: None, - }; - config.assimilate_storage(&mut storage).expect("Adding `system::GensisConfig` to the genesis"); - - storage - } -} diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index e4cff4b0ae4c..0f0b8a649564 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -70,8 +70,6 @@ pub use parachains::Call as ParachainsCall; /// Constant values used within the runtime. pub mod constants; -#[cfg(feature = "std")] -pub mod genesismap; use constants::{time::*, currency::*, fee::*}; // Make the WASM binary available. From 90750a11cfaee6c7347f5afdfe10c692facba236 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 7 Jul 2020 13:27:24 +0200 Subject: [PATCH 83/92] Pass parameters --- node/test-service/src/chain_spec.rs | 18 +++++++++++++----- runtime/test-runtime/client/src/lib.rs | 19 ++++++------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/node/test-service/src/chain_spec.rs b/node/test-service/src/chain_spec.rs index 14ecae6fa7e7..6735b3e0033f 100644 --- a/node/test-service/src/chain_spec.rs +++ b/node/test-service/src/chain_spec.rs @@ -21,7 +21,7 @@ use polkadot_primitives::{parachain::ValidatorId, AccountId}; use polkadot_service::chain_spec::{get_account_id_from_seed, get_from_seed, Extensions}; use polkadot_test_runtime::constants::currency::DOTS; use sc_chain_spec::{ChainSpec, ChainType}; -use sp_core::sr25519; +use sp_core::{sr25519, ChangesTrieConfiguration}; use sp_runtime::Perbill; const DEFAULT_PROTOCOL_ID: &str = "dot"; @@ -36,7 +36,7 @@ pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { "Local Testnet", "local_testnet", ChainType::Local, - polkadot_local_testnet_genesis, + || polkadot_local_testnet_genesis(None, None), vec![], None, Some(DEFAULT_PROTOCOL_ID), @@ -46,14 +46,20 @@ pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { } /// Polkadot local testnet genesis config (multivalidator Alice + Bob) -pub fn polkadot_local_testnet_genesis() -> polkadot_test_runtime::GenesisConfig { +pub fn polkadot_local_testnet_genesis( + changes_trie_config: Option, + endowment: Option, +) -> polkadot_test_runtime::GenesisConfig { polkadot_testnet_genesis( vec![ get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob"), + get_authority_keys_from_seed("Charlie"), ], get_account_id_from_seed::("Alice"), None, + changes_trie_config, + endowment, ) } @@ -92,6 +98,8 @@ fn polkadot_testnet_genesis( initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ValidatorId)>, root_key: AccountId, endowed_accounts: Option>, + changes_trie_config: Option, + endowment: Option, ) -> polkadot_test_runtime::GenesisConfig { use polkadot_test_runtime as polkadot; @@ -103,13 +111,13 @@ fn polkadot_testnet_genesis( polkadot::GenesisConfig { system: Some(polkadot::SystemConfig { code: polkadot::WASM_BINARY.to_vec(), - changes_trie_config: Default::default(), + changes_trie_config: Some(changes_trie_config.unwrap_or_default()), }), indices: Some(polkadot::IndicesConfig { indices: vec![] }), balances: Some(polkadot::BalancesConfig { balances: endowed_accounts .iter() - .map(|k| (k.clone(), ENDOWMENT)) + .map(|k| (k.clone(), endowment.unwrap_or(ENDOWMENT))) .collect(), }), session: Some(polkadot::SessionConfig { diff --git a/runtime/test-runtime/client/src/lib.rs b/runtime/test-runtime/client/src/lib.rs index 0931bb93041e..dd0540913177 100644 --- a/runtime/test-runtime/client/src/lib.rs +++ b/runtime/test-runtime/client/src/lib.rs @@ -94,20 +94,13 @@ pub struct GenesisParameters { impl GenesisParameters { fn genesis_config(&self) -> GenesisConfig { - polkadot_local_testnet_genesis() - // TODO: pass parameters somehow - /* - GenesisConfig::new( + let config = polkadot_local_testnet_genesis( self.changes_trie_config.clone(), - vec![ - sr25519::Public::from(Sr25519Keyring::Alice).into(), - sr25519::Public::from(Sr25519Keyring::Bob).into(), - sr25519::Public::from(Sr25519Keyring::Charlie).into(), - ], - 1000, - self.extra_storage.clone(), - ) - */ + Some(1000), + ); + config.assimilate_storage(&mut self.extra_storage.clone()).expect("Adding `system::GensisConfig` to the genesis"); + + config } } From 5fb41d2066918055abadbc3ff80a4d03a7262f24 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Tue, 7 Jul 2020 17:02:49 +0200 Subject: [PATCH 84/92] another attempt to fix the test --- node/test-service/src/chain_spec.rs | 6 +++--- runtime/test-runtime/client/src/lib.rs | 28 +++++++++++++++++++------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/node/test-service/src/chain_spec.rs b/node/test-service/src/chain_spec.rs index 6735b3e0033f..f820a65a5851 100644 --- a/node/test-service/src/chain_spec.rs +++ b/node/test-service/src/chain_spec.rs @@ -36,7 +36,7 @@ pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { "Local Testnet", "local_testnet", ChainType::Local, - || polkadot_local_testnet_genesis(None, None), + || polkadot_local_testnet_genesis(None, None, None), vec![], None, Some(DEFAULT_PROTOCOL_ID), @@ -48,16 +48,16 @@ pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { /// Polkadot local testnet genesis config (multivalidator Alice + Bob) pub fn polkadot_local_testnet_genesis( changes_trie_config: Option, + endowed_accounts: Option>, endowment: Option, ) -> polkadot_test_runtime::GenesisConfig { polkadot_testnet_genesis( vec![ get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob"), - get_authority_keys_from_seed("Charlie"), ], get_account_id_from_seed::("Alice"), - None, + endowed_accounts, changes_trie_config, endowment, ) diff --git a/runtime/test-runtime/client/src/lib.rs b/runtime/test-runtime/client/src/lib.rs index dd0540913177..7eb63dab8c59 100644 --- a/runtime/test-runtime/client/src/lib.rs +++ b/runtime/test-runtime/client/src/lib.rs @@ -24,7 +24,7 @@ use std::convert::TryFrom; pub use substrate_test_client::*; pub use polkadot_test_runtime as runtime; -use sp_core::{ChangesTrieConfiguration, map, twox_128}; +use sp_core::{sr25519, ChangesTrieConfiguration, map, twox_128}; use sp_core::storage::{ChildInfo, Storage, StorageChild}; use polkadot_test_runtime::GenesisConfig; use polkadot_test_service::polkadot_local_testnet_genesis; @@ -94,13 +94,27 @@ pub struct GenesisParameters { impl GenesisParameters { fn genesis_config(&self) -> GenesisConfig { - let config = polkadot_local_testnet_genesis( + polkadot_local_testnet_genesis( self.changes_trie_config.clone(), - Some(1000), - ); - config.assimilate_storage(&mut self.extra_storage.clone()).expect("Adding `system::GensisConfig` to the genesis"); + Some(vec![ + sr25519::Public::from(Sr25519Keyring::Alice).into(), + sr25519::Public::from(Sr25519Keyring::Bob).into(), + sr25519::Public::from(Sr25519Keyring::Charlie).into(), + ]), + Some(1000 * polkadot_test_runtime::constants::currency::DOLLARS), + ) + } - config + fn genesis_map(&self) -> Storage { + // Assimilate the system genesis config. + let mut storage = Storage { + top: BTreeMap::new(), + children_default: self.extra_storage.children_default.clone(), + }; + let config = self.genesis_config(); + config.assimilate_storage(&mut storage).expect("Adding `system::GenesisConfig` to the genesis"); + + storage } } @@ -114,7 +128,7 @@ impl substrate_test_client::GenesisInit for GenesisParameters { fn genesis_storage(&self) -> Storage { use codec::Encode; - let mut storage = self.genesis_config().build_storage().unwrap(); + let mut storage = self.genesis_map(); let child_roots = storage.children_default.iter().map(|(sk, child_content)| { let state_root = <<::Header as HeaderT>::Hashing as HashT>::trie_root( From 6a65f87ebab430162f15308ebcf1f2ebdb0d94f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 9 Jul 2020 11:23:52 +0200 Subject: [PATCH 85/92] Revert "another attempt to fix the test" This reverts commit 5fb41d2066918055abadbc3ff80a4d03a7262f24. --- node/test-service/src/chain_spec.rs | 6 +++--- runtime/test-runtime/client/src/lib.rs | 28 +++++++------------------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/node/test-service/src/chain_spec.rs b/node/test-service/src/chain_spec.rs index f820a65a5851..6735b3e0033f 100644 --- a/node/test-service/src/chain_spec.rs +++ b/node/test-service/src/chain_spec.rs @@ -36,7 +36,7 @@ pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { "Local Testnet", "local_testnet", ChainType::Local, - || polkadot_local_testnet_genesis(None, None, None), + || polkadot_local_testnet_genesis(None, None), vec![], None, Some(DEFAULT_PROTOCOL_ID), @@ -48,16 +48,16 @@ pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { /// Polkadot local testnet genesis config (multivalidator Alice + Bob) pub fn polkadot_local_testnet_genesis( changes_trie_config: Option, - endowed_accounts: Option>, endowment: Option, ) -> polkadot_test_runtime::GenesisConfig { polkadot_testnet_genesis( vec![ get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob"), + get_authority_keys_from_seed("Charlie"), ], get_account_id_from_seed::("Alice"), - endowed_accounts, + None, changes_trie_config, endowment, ) diff --git a/runtime/test-runtime/client/src/lib.rs b/runtime/test-runtime/client/src/lib.rs index 7eb63dab8c59..dd0540913177 100644 --- a/runtime/test-runtime/client/src/lib.rs +++ b/runtime/test-runtime/client/src/lib.rs @@ -24,7 +24,7 @@ use std::convert::TryFrom; pub use substrate_test_client::*; pub use polkadot_test_runtime as runtime; -use sp_core::{sr25519, ChangesTrieConfiguration, map, twox_128}; +use sp_core::{ChangesTrieConfiguration, map, twox_128}; use sp_core::storage::{ChildInfo, Storage, StorageChild}; use polkadot_test_runtime::GenesisConfig; use polkadot_test_service::polkadot_local_testnet_genesis; @@ -94,27 +94,13 @@ pub struct GenesisParameters { impl GenesisParameters { fn genesis_config(&self) -> GenesisConfig { - polkadot_local_testnet_genesis( + let config = polkadot_local_testnet_genesis( self.changes_trie_config.clone(), - Some(vec![ - sr25519::Public::from(Sr25519Keyring::Alice).into(), - sr25519::Public::from(Sr25519Keyring::Bob).into(), - sr25519::Public::from(Sr25519Keyring::Charlie).into(), - ]), - Some(1000 * polkadot_test_runtime::constants::currency::DOLLARS), - ) - } - - fn genesis_map(&self) -> Storage { - // Assimilate the system genesis config. - let mut storage = Storage { - top: BTreeMap::new(), - children_default: self.extra_storage.children_default.clone(), - }; - let config = self.genesis_config(); - config.assimilate_storage(&mut storage).expect("Adding `system::GenesisConfig` to the genesis"); + Some(1000), + ); + config.assimilate_storage(&mut self.extra_storage.clone()).expect("Adding `system::GensisConfig` to the genesis"); - storage + config } } @@ -128,7 +114,7 @@ impl substrate_test_client::GenesisInit for GenesisParameters { fn genesis_storage(&self) -> Storage { use codec::Encode; - let mut storage = self.genesis_map(); + let mut storage = self.genesis_config().build_storage().unwrap(); let child_roots = storage.children_default.iter().map(|(sk, child_content)| { let state_root = <<::Header as HeaderT>::Hashing as HashT>::trie_root( From c74756a7c04e998091a9183ac7280ef286c38842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 9 Jul 2020 11:43:26 +0200 Subject: [PATCH 86/92] Fix tests --- node/test-service/src/chain_spec.rs | 9 +++------ runtime/test-runtime/client/src/lib.rs | 5 +---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/node/test-service/src/chain_spec.rs b/node/test-service/src/chain_spec.rs index 6735b3e0033f..cbb08c470f07 100644 --- a/node/test-service/src/chain_spec.rs +++ b/node/test-service/src/chain_spec.rs @@ -36,7 +36,7 @@ pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { "Local Testnet", "local_testnet", ChainType::Local, - || polkadot_local_testnet_genesis(None, None), + || polkadot_local_testnet_genesis(None), vec![], None, Some(DEFAULT_PROTOCOL_ID), @@ -48,7 +48,6 @@ pub fn polkadot_local_testnet_config() -> PolkadotChainSpec { /// Polkadot local testnet genesis config (multivalidator Alice + Bob) pub fn polkadot_local_testnet_genesis( changes_trie_config: Option, - endowment: Option, ) -> polkadot_test_runtime::GenesisConfig { polkadot_testnet_genesis( vec![ @@ -59,7 +58,6 @@ pub fn polkadot_local_testnet_genesis( get_account_id_from_seed::("Alice"), None, changes_trie_config, - endowment, ) } @@ -99,7 +97,6 @@ fn polkadot_testnet_genesis( root_key: AccountId, endowed_accounts: Option>, changes_trie_config: Option, - endowment: Option, ) -> polkadot_test_runtime::GenesisConfig { use polkadot_test_runtime as polkadot; @@ -111,13 +108,13 @@ fn polkadot_testnet_genesis( polkadot::GenesisConfig { system: Some(polkadot::SystemConfig { code: polkadot::WASM_BINARY.to_vec(), - changes_trie_config: Some(changes_trie_config.unwrap_or_default()), + changes_trie_config, }), indices: Some(polkadot::IndicesConfig { indices: vec![] }), balances: Some(polkadot::BalancesConfig { balances: endowed_accounts .iter() - .map(|k| (k.clone(), endowment.unwrap_or(ENDOWMENT))) + .map(|k| (k.clone(), ENDOWMENT)) .collect(), }), session: Some(polkadot::SessionConfig { diff --git a/runtime/test-runtime/client/src/lib.rs b/runtime/test-runtime/client/src/lib.rs index dd0540913177..2554f4f1c824 100644 --- a/runtime/test-runtime/client/src/lib.rs +++ b/runtime/test-runtime/client/src/lib.rs @@ -94,10 +94,7 @@ pub struct GenesisParameters { impl GenesisParameters { fn genesis_config(&self) -> GenesisConfig { - let config = polkadot_local_testnet_genesis( - self.changes_trie_config.clone(), - Some(1000), - ); + let config = polkadot_local_testnet_genesis(self.changes_trie_config.clone()); config.assimilate_storage(&mut self.extra_storage.clone()).expect("Adding `system::GensisConfig` to the genesis"); config From f94de169c5b96c75632588bfed41c1337838f93a Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 9 Jul 2020 12:04:04 +0200 Subject: [PATCH 87/92] Update substrate --- Cargo.lock | 276 +++++++++++++++++++++++++++-------------------------- 1 file changed, 139 insertions(+), 137 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90cc87f15307..c544b4ef495f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1285,7 +1285,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", ] @@ -1293,7 +1293,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "Inflector", "frame-benchmarking", @@ -1329,7 +1329,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -1344,7 +1344,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "serde", @@ -1355,7 +1355,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "bitmask", "frame-metadata", @@ -1380,7 +1380,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1391,7 +1391,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1403,7 +1403,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1413,7 +1413,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1429,7 +1429,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -1443,7 +1443,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "sp-api", @@ -3409,7 +3409,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3425,7 +3425,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3440,7 +3440,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3465,7 +3465,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3479,7 +3479,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3495,7 +3495,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3510,7 +3510,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3525,7 +3525,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3541,7 +3541,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3561,7 +3561,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3577,7 +3577,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3597,7 +3597,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3613,7 +3613,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3627,7 +3627,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3642,7 +3642,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3656,7 +3656,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3671,7 +3671,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3692,7 +3692,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3707,7 +3707,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3720,7 +3720,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "enumflags2", "frame-support", @@ -3735,7 +3735,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3750,7 +3750,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3770,7 +3770,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3786,7 +3786,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3800,7 +3800,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3822,7 +3822,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3833,7 +3833,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3847,7 +3847,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3865,7 +3865,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "frame-system", @@ -3880,7 +3880,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3898,7 +3898,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-support", "parity-scale-codec", @@ -3911,7 +3911,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3926,7 +3926,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-benchmarking", "frame-support", @@ -3942,7 +3942,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5874,7 +5874,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "bytes 0.5.4", "derive_more 0.99.8", @@ -5901,7 +5901,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5925,7 +5925,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5942,7 +5942,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5958,7 +5958,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5969,7 +5969,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "ansi_term 0.12.1", "atty", @@ -6010,7 +6010,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "fnv", @@ -6046,7 +6046,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "blake2-rfc", "hash-db", @@ -6075,7 +6075,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6086,7 +6086,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "fork-tree", @@ -6128,7 +6128,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6152,7 +6152,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6165,7 +6165,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6188,7 +6188,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6202,7 +6202,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "lazy_static", @@ -6230,7 +6230,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6247,7 +6247,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6262,7 +6262,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6283,7 +6283,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "assert_matches", "derive_more 0.99.8", @@ -6321,7 +6321,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "finality-grandpa", @@ -6338,7 +6338,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6356,7 +6356,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "hex", @@ -6372,7 +6372,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "hash-db", "lazy_static", @@ -6391,7 +6391,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "bitflags", "bs58", @@ -6443,7 +6443,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6458,7 +6458,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "env_logger", "futures 0.3.5", @@ -6485,7 +6485,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "bytes 0.5.4", "fnv", @@ -6512,7 +6512,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "futures 0.3.5", "libp2p", @@ -6525,7 +6525,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6534,7 +6534,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "futures 0.3.5", "hash-db", @@ -6566,7 +6566,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6590,7 +6590,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6606,7 +6606,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "directories", @@ -6669,7 +6669,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6683,7 +6683,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6704,7 +6704,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "erased-serde", "log 0.4.8", @@ -6721,7 +6721,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6741,7 +6741,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7148,7 +7148,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7160,7 +7160,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "hash-db", "parity-scale-codec", @@ -7175,7 +7175,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7187,7 +7187,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "serde", @@ -7199,7 +7199,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7212,7 +7212,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "sp-api", @@ -7224,7 +7224,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7235,7 +7235,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "sp-api", @@ -7247,7 +7247,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7263,7 +7263,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "serde", "serde_json", @@ -7272,7 +7272,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7296,7 +7296,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "sp-api", @@ -7310,7 +7310,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "merlin", "parity-scale-codec", @@ -7329,7 +7329,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7338,7 +7338,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7350,7 +7350,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "base58", "blake2-rfc", @@ -7393,7 +7393,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7402,7 +7402,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7412,7 +7412,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "environmental", "parity-scale-codec", @@ -7423,7 +7423,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7439,7 +7439,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7449,7 +7449,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "parity-scale-codec", @@ -7461,7 +7461,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "futures 0.3.5", "hash-db", @@ -7482,7 +7482,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "lazy_static", "sp-core", @@ -7493,7 +7493,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "serde", @@ -7505,7 +7505,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7516,7 +7516,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "sp-api", "sp-core", @@ -7526,7 +7526,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "backtrace", "log 0.4.8", @@ -7535,7 +7535,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "serde", "sp-core", @@ -7544,7 +7544,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "either", "hash256-std-hasher", @@ -7566,7 +7566,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7581,7 +7581,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "Inflector", "proc-macro-crate", @@ -7593,7 +7593,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "serde", "serde_json", @@ -7602,7 +7602,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "sp-api", @@ -7615,7 +7615,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7625,7 +7625,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7646,12 +7646,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7663,7 +7663,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7677,7 +7677,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "log 0.4.8", "rental", @@ -7687,7 +7687,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7703,7 +7703,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "hash-db", "memory-db", @@ -7717,7 +7717,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "futures 0.3.5", "futures-core", @@ -7729,7 +7729,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7741,7 +7741,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7881,7 +7881,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "chrono", "clear_on_drop", @@ -7908,7 +7908,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "platforms", ] @@ -7916,7 +7916,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7939,7 +7939,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "async-std", "derive_more 0.99.8", @@ -7953,7 +7953,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "futures 0.1.29", "futures 0.3.5", @@ -7966,6 +7966,8 @@ dependencies = [ "sc-executor", "sc-light", "sc-service", + "serde", + "serde_json", "sp-blockchain", "sp-consensus", "sp-core", @@ -7977,7 +7979,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "cfg-if", "frame-executive", @@ -8017,7 +8019,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -8038,7 +8040,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#e824e8ab0fadec9949ebb8b9e14d98703d6b8d44" +source = "git+https://github.com/paritytech/substrate#b9d96fabd2462cb42862fd0a117ed42bb98401aa" [[package]] name = "substrate-wasm-builder-runner" From e606833a9082debc2742ce2ed4db29f2b8a18e29 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 9 Jul 2020 12:08:09 +0200 Subject: [PATCH 88/92] adapt code --- node/test-service/src/lib.rs | 8 ++------ node/test-service/tests/call-function.rs | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/node/test-service/src/lib.rs b/node/test-service/src/lib.rs index 64c7ffae9032..fcb1d4c716d3 100644 --- a/node/test-service/src/lib.rs +++ b/node/test-service/src/lib.rs @@ -56,7 +56,7 @@ use sp_runtime::{codec::Encode, generic}; use sp_state_machine::BasicExternalities; use std::sync::Arc; use std::time::Duration; -use substrate_test_client::{BlockchainEventsExt, RpcHandlersExt}; +use substrate_test_client::{BlockchainEventsExt, RpcHandlersExt, RpcTransactionOutput, RpcTransactionError}; native_executor_instance!( pub PolkadotTestExecutor, @@ -245,11 +245,7 @@ where &self, function: polkadot_test_runtime::Call, caller: Sr25519Keyring, - ) -> ( - Option, - RpcSession, - futures01::sync::mpsc::Receiver, - ) { + ) -> Result { let current_block_hash = self.client.info().best_hash; let current_block = self.client.info().best_number.saturated_into(); let genesis_block = self.client.hash(0).unwrap().unwrap(); diff --git a/node/test-service/tests/call-function.rs b/node/test-service/tests/call-function.rs index eb71a46ec3ab..ae0b2fabfb70 100644 --- a/node/test-service/tests/call-function.rs +++ b/node/test-service/tests/call-function.rs @@ -44,7 +44,7 @@ fn call_function_actually_work() { Default::default(), 1, )); - let (res, _mem, _rx) = alice.call_function(function, Bob).await; + let (res, _mem, _rx) = alice.call_function(function, Bob).await.unwrap(); let res = res.expect("return value expected"); let json = serde_json::from_str::(res.as_str()).expect("valid JSON"); From 4e654126ce7a6a157025196bb9c1299b4e41130d Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 9 Jul 2020 12:12:15 +0200 Subject: [PATCH 89/92] fix --- node/test-service/tests/call-function.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/test-service/tests/call-function.rs b/node/test-service/tests/call-function.rs index ae0b2fabfb70..bbdbf29834d1 100644 --- a/node/test-service/tests/call-function.rs +++ b/node/test-service/tests/call-function.rs @@ -44,9 +44,9 @@ fn call_function_actually_work() { Default::default(), 1, )); - let (res, _mem, _rx) = alice.call_function(function, Bob).await.unwrap(); + let output = alice.call_function(function, Bob).await.unwrap(); - let res = res.expect("return value expected"); + let res = output.result.expect("return value expected"); let json = serde_json::from_str::(res.as_str()).expect("valid JSON"); let object = json.as_object().expect("JSON is an object"); assert!(object.contains_key("jsonrpc"), "key jsonrpc exists"); From b44f3024dc24c660e18599cfbae9b8b7e9c7ac33 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 9 Jul 2020 12:40:38 +0200 Subject: [PATCH 90/92] unused import --- node/test-service/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/test-service/src/lib.rs b/node/test-service/src/lib.rs index fcb1d4c716d3..7fc75d9f3719 100644 --- a/node/test-service/src/lib.rs +++ b/node/test-service/src/lib.rs @@ -46,7 +46,7 @@ use sc_network::{ use service::{ config::{DatabaseConfig, KeystoreConfig, MultiaddrWithPeerId, WasmExecutionMethod}, error::Error as ServiceError, - RpcHandlers, RpcSession, TaskExecutor, TaskManager, + RpcHandlers, TaskExecutor, TaskManager, }; use service::{BasePath, Configuration, Role, TFullBackend}; use sp_arithmetic::traits::SaturatedConversion; From f3b314235da46798b88b370e9302cba755e17a84 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 9 Jul 2020 14:28:39 +0200 Subject: [PATCH 91/92] WIP Forked at: 4234dee5b7f67bc912de39a02c09511d12b02ff4 Parent branch: origin/master --- Cargo.lock | 15 ++++++++++++++- node/test-service/Cargo.toml | 3 ++- node/test-service/tests/build-blocks.rs | 15 +++++++++------ node/test-service/tests/call-function.rs | 15 +++++++++------ 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c544b4ef495f..cf0dbd83218f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5017,7 +5017,6 @@ dependencies = [ name = "polkadot-test-service" version = "0.8.2" dependencies = [ - "async-std", "frame-benchmarking", "frame-system", "futures 0.1.29", @@ -5060,6 +5059,7 @@ dependencies = [ "sp-state-machine", "substrate-test-client", "tempfile", + "tokio 0.2.21", ] [[package]] @@ -8470,11 +8470,13 @@ dependencies = [ "libc", "memchr", "mio", + "mio-named-pipes", "mio-uds", "num_cpus", "pin-project-lite", "signal-hook-registry", "slab", + "tokio-macros", "winapi 0.3.8", ] @@ -8553,6 +8555,17 @@ dependencies = [ "log 0.4.8", ] +[[package]] +name = "tokio-macros" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" +dependencies = [ + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", +] + [[package]] name = "tokio-named-pipes" version = "0.1.0" diff --git a/node/test-service/Cargo.toml b/node/test-service/Cargo.toml index c1e81af033d1..696d669680e6 100644 --- a/node/test-service/Cargo.toml +++ b/node/test-service/Cargo.toml @@ -51,6 +51,7 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = " substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] -async-std = "1.5" +#async-std = "1.5" pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } serde_json = "1.0" +tokio = { version = "0.2", features = ["full"] } diff --git a/node/test-service/tests/build-blocks.rs b/node/test-service/tests/build-blocks.rs index e70332b09432..c4b789483546 100644 --- a/node/test-service/tests/build-blocks.rs +++ b/node/test-service/tests/build-blocks.rs @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . -use async_std::task::{block_on, sleep}; +//use async_std::task::{block_on, sleep}; +use tokio::{runtime::Runtime, time::delay_for as sleep}; use futures::{future, pin_mut, select, FutureExt as _}; use polkadot_test_service::*; use service::TaskExecutor; @@ -25,8 +26,10 @@ static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TE #[test] fn ensure_test_service_build_blocks() { - let task_executor: TaskExecutor = (|fut, _| { - async_std::task::spawn(fut); + let mut r = Runtime::new().unwrap(); + let handle = r.handle().clone(); + let task_executor: TaskExecutor = (move |fut, _| { + handle.spawn(fut); }) .into(); let mut alice = run_test_node( @@ -41,11 +44,11 @@ fn ensure_test_service_build_blocks() { || {}, vec![alice.addr.clone()], ); - let t1 = sleep(Duration::from_secs( + let t1 = r.block_on(async { sleep(Duration::from_secs( INTEGRATION_TEST_ALLOWED_TIME .and_then(|x| x.parse().ok()) .unwrap_or(600), - )) + )) }) .fuse(); let t2 = async { { @@ -67,7 +70,7 @@ fn ensure_test_service_build_blocks() { } .fuse(); - block_on(async { + r.block_on(async { pin_mut!(t1, t2); select! { diff --git a/node/test-service/tests/call-function.rs b/node/test-service/tests/call-function.rs index bbdbf29834d1..866b9b55ac13 100644 --- a/node/test-service/tests/call-function.rs +++ b/node/test-service/tests/call-function.rs @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . -use async_std::task::{block_on, sleep}; +//use async_std::task::{block_on, sleep}; +use tokio::{runtime::Runtime, time::delay_for as sleep}; use futures::{pin_mut, select, FutureExt as _}; use polkadot_test_service::*; use sp_keyring::Sr25519Keyring::{Alice, Bob}; @@ -24,20 +25,22 @@ static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TE #[test] fn call_function_actually_work() { + let mut r = Runtime::new().unwrap(); + let handle = r.handle().clone(); let mut alice = run_test_node( - (|fut, _| { - async_std::task::spawn(fut); + (move |fut, _| { + handle.spawn(fut); }) .into(), Alice, || {}, Vec::new(), ); - let t1 = sleep(Duration::from_secs( + let t1 = r.block_on(async { sleep(Duration::from_secs( INTEGRATION_TEST_ALLOWED_TIME .and_then(|x| x.parse().ok()) .unwrap_or(600), - )) + )) }) .fuse(); let t2 = async { let function = polkadot_test_runtime::Call::Balances(pallet_balances::Call::transfer( @@ -62,7 +65,7 @@ fn call_function_actually_work() { } .fuse(); - block_on(async move { + r.block_on(async move { pin_mut!(t1, t2); select! { From d32f8119303fbc6ef5081c5d6644a8aca5a008f6 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 9 Jul 2020 14:37:30 +0200 Subject: [PATCH 92/92] replace async_std with tokio --- Cargo.lock | 1 - node/test-service/Cargo.toml | 3 +-- node/test-service/tests/build-blocks.rs | 31 ++++++++++-------------- node/test-service/tests/call-function.rs | 31 ++++++++++-------------- 4 files changed, 27 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cf0dbd83218f..894eeab6f4c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8470,7 +8470,6 @@ dependencies = [ "libc", "memchr", "mio", - "mio-named-pipes", "mio-uds", "num_cpus", "pin-project-lite", diff --git a/node/test-service/Cargo.toml b/node/test-service/Cargo.toml index 696d669680e6..db6328a9aac2 100644 --- a/node/test-service/Cargo.toml +++ b/node/test-service/Cargo.toml @@ -51,7 +51,6 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = " substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] -#async-std = "1.5" pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } serde_json = "1.0" -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "0.2", features = ["macros"] } diff --git a/node/test-service/tests/build-blocks.rs b/node/test-service/tests/build-blocks.rs index c4b789483546..65771dda0525 100644 --- a/node/test-service/tests/build-blocks.rs +++ b/node/test-service/tests/build-blocks.rs @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . -//use async_std::task::{block_on, sleep}; -use tokio::{runtime::Runtime, time::delay_for as sleep}; +use tokio::{time::delay_for as sleep, task::spawn}; use futures::{future, pin_mut, select, FutureExt as _}; use polkadot_test_service::*; use service::TaskExecutor; @@ -24,12 +23,10 @@ use std::time::Duration; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); -#[test] -fn ensure_test_service_build_blocks() { - let mut r = Runtime::new().unwrap(); - let handle = r.handle().clone(); +#[tokio::test] +async fn ensure_test_service_build_blocks() { let task_executor: TaskExecutor = (move |fut, _| { - handle.spawn(fut); + spawn(fut); }) .into(); let mut alice = run_test_node( @@ -44,11 +41,11 @@ fn ensure_test_service_build_blocks() { || {}, vec![alice.addr.clone()], ); - let t1 = r.block_on(async { sleep(Duration::from_secs( + let t1 = sleep(Duration::from_secs( INTEGRATION_TEST_ALLOWED_TIME .and_then(|x| x.parse().ok()) .unwrap_or(600), - )) }) + )) .fuse(); let t2 = async { { @@ -70,14 +67,12 @@ fn ensure_test_service_build_blocks() { } .fuse(); - r.block_on(async { - pin_mut!(t1, t2); + pin_mut!(t1, t2); - select! { - _ = t1 => { - panic!("the test took too long, maybe no blocks have been produced"); - }, - _ = t2 => {}, - } - }); + select! { + _ = t1 => { + panic!("the test took too long, maybe no blocks have been produced"); + }, + _ = t2 => {}, + } } diff --git a/node/test-service/tests/call-function.rs b/node/test-service/tests/call-function.rs index 866b9b55ac13..b7b191fdab96 100644 --- a/node/test-service/tests/call-function.rs +++ b/node/test-service/tests/call-function.rs @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . -//use async_std::task::{block_on, sleep}; -use tokio::{runtime::Runtime, time::delay_for as sleep}; +use tokio::{time::delay_for as sleep, task::spawn}; use futures::{pin_mut, select, FutureExt as _}; use polkadot_test_service::*; use sp_keyring::Sr25519Keyring::{Alice, Bob}; @@ -23,24 +22,22 @@ use std::time::Duration; static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); -#[test] -fn call_function_actually_work() { - let mut r = Runtime::new().unwrap(); - let handle = r.handle().clone(); +#[tokio::test] +async fn call_function_actually_work() { let mut alice = run_test_node( (move |fut, _| { - handle.spawn(fut); + spawn(fut); }) .into(), Alice, || {}, Vec::new(), ); - let t1 = r.block_on(async { sleep(Duration::from_secs( + let t1 = sleep(Duration::from_secs( INTEGRATION_TEST_ALLOWED_TIME .and_then(|x| x.parse().ok()) .unwrap_or(600), - )) }) + )) .fuse(); let t2 = async { let function = polkadot_test_runtime::Call::Balances(pallet_balances::Call::transfer( @@ -65,14 +62,12 @@ fn call_function_actually_work() { } .fuse(); - r.block_on(async move { - pin_mut!(t1, t2); + pin_mut!(t1, t2); - select! { - _ = t1 => { - panic!("the test took too long, maybe no blocks have been produced"); - }, - _ = t2 => {}, - } - }); + select! { + _ = t1 => { + panic!("the test took too long, maybe no blocks have been produced"); + }, + _ = t2 => {}, + } }