From c84b68efa8d93ebc33fb09551fa3c37b7fa78a16 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 26 Jan 2022 18:54:39 +0300 Subject: [PATCH 1/9] bump refs: Substrate: 31d90c202d6df9ce3837ee55587b604619a912ba Polkadot: 60df3c55c711c2872872d6220f98b2611340e051 Cumulus: a9630551c2cd877952ab769c862af4c81b0ccd3c --- Cargo.lock | 1696 ++++++++++------- bin/millau/node/Cargo.toml | 1 + bin/millau/node/src/chain_spec.rs | 4 +- bin/millau/node/src/cli.rs | 7 +- bin/millau/node/src/service.rs | 42 +- bin/millau/runtime/src/lib.rs | 6 +- bin/rialto-parachain/node/Cargo.toml | 3 + bin/rialto-parachain/node/src/chain_spec.rs | 4 +- bin/rialto-parachain/node/src/cli.rs | 50 +- bin/rialto-parachain/node/src/command.rs | 30 +- bin/rialto-parachain/node/src/service.rs | 71 +- bin/rialto-parachain/runtime/src/lib.rs | 17 +- bin/rialto/node/Cargo.toml | 1 + bin/rialto/node/src/chain_spec.rs | 6 +- bin/rialto/node/src/cli.rs | 13 +- bin/rialto/runtime/src/lib.rs | 56 +- bin/rialto/runtime/src/parachains.rs | 20 +- fuzz/storage-proof/Cargo.toml | 1 + fuzz/storage-proof/src/main.rs | 5 +- modules/dispatch/src/lib.rs | 4 +- modules/grandpa/src/lib.rs | 1 + modules/grandpa/src/mock.rs | 1 + modules/messages/src/instant_payments.rs | 2 +- modules/messages/src/lib.rs | 1 + modules/messages/src/mock.rs | 1 + modules/shift-session-manager/src/lib.rs | 2 + modules/token-swap/src/lib.rs | 1 + modules/token-swap/src/mock.rs | 1 + primitives/chain-kusama/src/lib.rs | 1 + primitives/chain-millau/src/lib.rs | 22 +- primitives/chain-polkadot/src/lib.rs | 1 + primitives/chain-rialto/src/lib.rs | 4 +- primitives/chain-rococo/src/lib.rs | 1 + primitives/chain-westend/src/lib.rs | 1 + .../header-chain/tests/justification.rs | 2 +- primitives/polkadot-core/src/lib.rs | 15 +- primitives/runtime/src/chain.rs | 3 +- primitives/runtime/src/storage_proof.rs | 26 +- primitives/test-utils/src/keyring.rs | 3 +- .../src/messages_target.rs | 4 +- 40 files changed, 1306 insertions(+), 824 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b442088d98..d9f19f73e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,22 +12,13 @@ dependencies = [ "regex", ] -[[package]] -name = "addr2line" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" -dependencies = [ - "gimli 0.25.0", -] - [[package]] name = "addr2line" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "gimli 0.26.1", + "gimli", ] [[package]] @@ -337,9 +328,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" dependencies = [ "proc-macro2", "quote", @@ -420,7 +411,7 @@ version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" dependencies = [ - "addr2line 0.17.0", + "addr2line", "cc", "cfg-if 1.0.0", "libc", @@ -435,7 +426,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec107f431ee3d8a8e45e6dd117adab769556ef463959e77bf6a4888d5fd500cf" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro-error 0.4.12", "proc-macro2", "quote", @@ -472,14 +463,15 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "beefy-primitives", "fnv", - "futures 0.3.18", + "futures 0.3.19", "log", "parity-scale-codec", "parking_lot 0.11.2", + "sc-chain-spec", "sc-client-api", "sc-keystore", "sc-network", @@ -500,32 +492,36 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "beefy-gadget", "beefy-primitives", - "futures 0.3.18", + "derive_more", + "futures 0.3.19", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-pubsub", "log", "parity-scale-codec", + "parking_lot 0.11.2", "sc-rpc", + "sc-utils", "serde", "sp-core", "sp-runtime", + "thiserror", ] [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -668,6 +664,15 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "block-buffer" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -699,9 +704,9 @@ dependencies = [ [[package]] name = "bounded-vec" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdd1dffefe5fc66262a524b91087c43b16e478b2e3dc49eb11b0e2fd6b6ec90" +checksum = "b47cca82fca99417fe405f09d93bb8fff90bdd03d13c631f18096ee123b4281c" dependencies = [ "thiserror", ] @@ -1202,12 +1207,42 @@ dependencies = [ "ansi_term 0.11.0", "atty", "bitflags", - "strsim", - "textwrap", + "strsim 0.8.0", + "textwrap 0.11.0", "unicode-width", "vec_map", ] +[[package]] +name = "clap" +version = "3.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2afefa54b5c7dd40918dc1e09f213a171ab5937aadccab45e804780b238f9f43" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "indexmap", + "lazy_static", + "os_str_bytes", + "strsim 0.10.0", + "termcolor", + "textwrap 0.14.2", +] + +[[package]] +name = "clap_derive" +version = "3.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fd2078197a22f338bd4fbf7d6387eb6f0d6a3c69e6cbc09f5c93e97321fd92a" +dependencies = [ + "heck 0.4.0", + "proc-macro-error 1.0.4", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "cloudabi" version = "0.0.3" @@ -1289,24 +1324,24 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0cb7df82c8cf8f2e6a8dd394a0932a71369c160cc9b027dca414fced242513" +checksum = "9516ba6b2ba47b4cbf63b713f75b432fafa0a0e0464ec8381ec76e6efe931ab3" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4463c15fa42eee909e61e5eac4866b7c6d22d0d8c621e57a0c5380753bfa8c" +checksum = "489e5d0081f7edff6be12d71282a8bf387b5df64d5592454b75d662397f2d642" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli 0.25.0", + "gimli", "log", "regalloc", "smallvec", @@ -1315,34 +1350,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793f6a94a053a55404ea16e1700202a88101672b8cd6b4df63e13cde950852bf" +checksum = "d36ee1140371bb0f69100e734b30400157a4adf7b86148dee8b0a438763ead48" dependencies = [ "cranelift-codegen-shared", - "cranelift-entity", ] [[package]] name = "cranelift-codegen-shared" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44aa1846df275bce5eb30379d65964c7afc63c05a117076e62a119c25fe174be" +checksum = "981da52d8f746af1feb96290c83977ff8d41071a7499e991d8abae0d4869f564" [[package]] name = "cranelift-entity" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a45d8d6318bf8fc518154d9298eab2a8154ec068a8885ff113f6db8d69bb3a" +checksum = "a2906740053dd3bcf95ce53df0fd9b5649c68ae4bd9adada92b406f059eae461" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e07339bd461766deb7605169de039e01954768ff730fa1254e149001884a8525" +checksum = "b7cb156de1097f567d46bf57a0cd720a72c3e15e1a2bd8b1041ba2fc894471b7" dependencies = [ "cranelift-codegen", "log", @@ -1352,9 +1386,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e2fca76ff57e0532936a71e3fc267eae6a19a86656716479c66e7f912e3d7b" +checksum = "166028ca0343a6ee7bddac0e70084e142b23f99c701bd6f6ea9123afac1a7a46" dependencies = [ "cranelift-codegen", "libc", @@ -1363,9 +1397,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f46fec547a1f8a32c54ea61c28be4f4ad234ad95342b718a9a9adcaadb0c778" +checksum = "5012a1cde0c8b3898770b711490d803018ae9bec2d60674ba0e5b2058a874f80" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1436,6 +1470,15 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "crypto-mac" version = "0.8.0" @@ -1498,22 +1541,23 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ + "clap 3.0.12", "sc-cli", "sc-service", - "structopt", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", - "futures 0.3.18", + "cumulus-relay-chain-interface", + "futures 0.3.19", "parity-scale-codec", "parking_lot 0.10.2", "polkadot-node-primitives", @@ -1531,14 +1575,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", - "futures 0.3.18", + "futures 0.3.19", "parity-scale-codec", - "polkadot-client", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -1561,11 +1604,12 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "async-trait", + "cumulus-relay-chain-interface", "dyn-clone", - "futures 0.3.18", + "futures 0.3.19", "parity-scale-codec", "polkadot-primitives", "sc-client-api", @@ -1581,14 +1625,15 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ + "async-trait", + "cumulus-relay-chain-interface", "derive_more", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "parity-scale-codec", - "parking_lot 0.10.2", - "polkadot-client", + "parking_lot 0.11.2", "polkadot-node-primitives", "polkadot-parachain", "polkadot-primitives", @@ -1598,17 +1643,19 @@ dependencies = [ "sp-consensus", "sp-core", "sp-runtime", + "sp-state-machine", "tracing", ] [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "cumulus-primitives-core", - "futures 0.3.18", - "futures-timer 3.0.2", + "cumulus-relay-chain-interface", + "futures 0.3.19", + "futures-timer", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -1627,17 +1674,17 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", "cumulus-primitives-core", + "cumulus-relay-chain-interface", "parity-scale-codec", "parking_lot 0.10.2", "polkadot-overseer", "polkadot-primitives", - "polkadot-service", "sc-chain-spec", "sc-client-api", "sc-consensus", @@ -1656,7 +1703,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "frame-executive", "frame-support", @@ -1674,7 +1721,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1692,7 +1739,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -1700,6 +1747,7 @@ dependencies = [ "environmental", "frame-support", "frame-system", + "impl-trait-for-tuples", "log", "pallet-balances", "parity-scale-codec", @@ -1721,7 +1769,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -1732,7 +1780,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1749,7 +1797,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1767,10 +1815,9 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "frame-support", - "impl-trait-for-tuples", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", @@ -1784,13 +1831,13 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "async-trait", "cumulus-primitives-core", + "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", "parity-scale-codec", - "polkadot-client", "sc-client-api", "scale-info", "sp-api", @@ -1799,6 +1846,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-std", + "sp-storage", "sp-trie", "tracing", ] @@ -1806,7 +1854,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "cumulus-primitives-core", "sp-inherents", @@ -1817,7 +1865,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1831,10 +1879,59 @@ dependencies = [ "xcm", ] +[[package]] +name = "cumulus-relay-chain-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "derive_more", + "futures 0.3.19", + "parking_lot 0.11.2", + "polkadot-overseer", + "sc-client-api", + "sc-service", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "sp-state-machine", + "thiserror", +] + +[[package]] +name = "cumulus-relay-chain-local" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures 0.3.19", + "futures-timer", + "parking_lot 0.11.2", + "polkadot-client", + "polkadot-service", + "sc-client-api", + "sc-consensus-babe", + "sc-network", + "sc-service", + "sc-telemetry", + "sc-tracing", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-state-machine", + "tracing", +] + [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -1969,6 +2066,17 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "digest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +dependencies = [ + "block-buffer 0.10.0", + "crypto-common", + "generic-array 0.14.4", +] + [[package]] name = "directories" version = "4.0.1" @@ -2115,7 +2223,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2", "quote", "syn", @@ -2257,7 +2365,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", ] [[package]] @@ -2307,8 +2415,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" dependencies = [ "either", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "log", "num-traits", "parity-scale-codec", @@ -2324,7 +2432,7 @@ dependencies = [ "async-trait", "backoff", "bp-header-chain", - "futures 0.3.18", + "futures 0.3.19", "log", "num-traits", "parking_lot 0.11.2", @@ -2371,7 +2479,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", ] @@ -2389,7 +2497,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -2399,6 +2507,7 @@ dependencies = [ "paste", "scale-info", "sp-api", + "sp-application-crypto", "sp-io", "sp-runtime", "sp-runtime-interface", @@ -2409,10 +2518,11 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "Inflector", "chrono", + "clap 3.0.12", "frame-benchmarking", "frame-support", "handlebars", @@ -2429,13 +2539,12 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-state-machine", - "structopt", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -2449,7 +2558,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -2477,7 +2586,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "bitflags", "frame-metadata", @@ -2506,7 +2615,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2518,7 +2627,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -2530,7 +2639,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "proc-macro2", "quote", @@ -2540,7 +2649,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "log", @@ -2557,7 +2666,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -2572,7 +2681,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "sp-api", @@ -2581,7 +2690,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "sp-api", @@ -2647,9 +2756,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e" +checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" dependencies = [ "futures-channel", "futures-core", @@ -2662,9 +2771,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27" +checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" dependencies = [ "futures-core", "futures-sink", @@ -2672,15 +2781,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445" +checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" [[package]] name = "futures-executor" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97" +checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" dependencies = [ "futures-core", "futures-task", @@ -2690,9 +2799,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11" +checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" [[package]] name = "futures-lite" @@ -2711,9 +2820,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd" +checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" dependencies = [ "proc-macro2", "quote", @@ -2733,21 +2842,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af" +checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" [[package]] name = "futures-task" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12" - -[[package]] -name = "futures-timer" -version = "2.0.2" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6" +checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" [[package]] name = "futures-timer" @@ -2757,9 +2860,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e" +checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2829,21 +2932,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" dependencies = [ "fallible-iterator", "indexmap", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" - [[package]] name = "glob" version = "0.3.0" @@ -2878,9 +2975,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.7" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" +checksum = "0c9de88456263e249e241fcd211d3954e2c9b0ef7ccfc235a444eb367cae3689" dependencies = [ "bytes 1.1.0", "fnv", @@ -2897,9 +2994,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.1.5" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad84da8f63da982543fc85fcabaee2ad1fdd809d99d64a48887e2e942ddfe46" +checksum = "25546a65e5cf1f471f3438796fc634650b31d7fcde01d444c309aeb28b92e3a8" dependencies = [ "log", "pest", @@ -2942,6 +3039,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -3030,7 +3133,7 @@ checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" dependencies = [ "bytes 1.1.0", "fnv", - "itoa", + "itoa 0.4.8", ] [[package]] @@ -3073,9 +3176,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.15" +version = "0.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c" +checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" dependencies = [ "bytes 1.1.0", "futures-channel", @@ -3086,7 +3189,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa", + "itoa 0.4.8", "pin-project-lite 0.2.7", "socket2 0.4.2", "tokio", @@ -3162,7 +3265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179" dependencies = [ "async-io", - "futures 0.3.18", + "futures 0.3.19", "futures-lite", "if-addrs", "ipnet", @@ -3231,9 +3334,9 @@ dependencies = [ [[package]] name = "integer-encoding" -version = "1.1.7" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" +checksum = "90c11140ffea82edce8dcd74137ce9324ec24b3cf0175fc9d7e29164da9915b8" [[package]] name = "integer-sqrt" @@ -3244,23 +3347,12 @@ dependencies = [ "num-traits", ] -[[package]] -name = "intervalier" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" -dependencies = [ - "futures 0.3.18", - "futures-timer 2.0.2", -] - [[package]] name = "io-lifetimes" -version = "0.3.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278e90d6f8a6c76a8334b336e306efa3c5f2b604048cbfd486d6f49878e3af14" +checksum = "f6ef6787e7f0faedc040f95716bdd0e62bcfcf4ba93da053b62dea2691c13864" dependencies = [ - "rustc_version 0.4.0", "winapi 0.3.9", ] @@ -3339,6 +3431,12 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + [[package]] name = "jobserver" version = "0.1.24" @@ -3377,7 +3475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" dependencies = [ "derive_more", - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core", "jsonrpc-pubsub", "log", @@ -3392,7 +3490,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "futures-executor", "futures-util", "log", @@ -3407,7 +3505,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-client-transports", ] @@ -3429,7 +3527,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "hyper", "jsonrpc-core", "jsonrpc-server-utils", @@ -3445,7 +3543,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core", "jsonrpc-server-utils", "log", @@ -3460,7 +3558,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core", "lazy_static", "log", @@ -3476,7 +3574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" dependencies = [ "bytes 1.1.0", - "futures 0.3.18", + "futures 0.3.19", "globset", "jsonrpc-core", "lazy_static", @@ -3493,7 +3591,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core", "jsonrpc-server-utils", "log", @@ -3597,10 +3695,10 @@ checksum = "9841352dbecf4c2ed5dc71698df9f1660262ae4e0b610e968602529bdbcf7b30" dependencies = [ "async-trait", "fnv", - "futures 0.3.18", + "futures 0.3.19", "jsonrpsee-types 0.3.1", "log", - "pin-project 1.0.8", + "pin-project 1.0.10", "rustls", "rustls-native-certs", "serde", @@ -3622,11 +3720,11 @@ dependencies = [ "arrayvec 0.7.2", "async-trait", "fnv", - "futures 0.3.18", + "futures 0.3.19", "http", "jsonrpsee-types 0.4.1", "log", - "pin-project 1.0.8", + "pin-project 1.0.10", "rustls-native-certs", "serde", "serde_json", @@ -3653,6 +3751,101 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "kusama-runtime" +version = "0.9.13" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" +dependencies = [ + "beefy-primitives", + "bitvec", + "frame-election-provider-support", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "kusama-runtime-constants", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-bounties", + "pallet-collective", + "pallet-democracy", + "pallet-election-provider-multi-phase", + "pallet-elections-phragmen", + "pallet-gilt", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-membership", + "pallet-mmr-primitives", + "pallet-multisig", + "pallet-nicks", + "pallet-offences", + "pallet-preimage", + "pallet-proxy", + "pallet-recovery", + "pallet-scheduler", + "pallet-session", + "pallet-society", + "pallet-staking", + "pallet-staking-reward-fn", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", + "pallet-utility", + "pallet-vesting", + "pallet-xcm", + "parity-scale-codec", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "smallvec", + "sp-api", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-core", + "sp-inherents", + "sp-io", + "sp-npos-elections", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-transaction-pool", + "sp-version", + "static_assertions", + "substrate-wasm-builder", + "xcm", + "xcm-builder", + "xcm-executor", +] + +[[package]] +name = "kusama-runtime-constants" +version = "0.9.13" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" +dependencies = [ + "frame-support", + "polkadot-primitives", + "polkadot-runtime-common", + "smallvec", + "sp-runtime", +] + [[package]] name = "kv-log-macro" version = "1.0.7" @@ -3733,9 +3926,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.108" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" +checksum = "b0005d08a8f7b65fb8073cb697aa0b12b631ed251ce73d862ce50eeb52ce3b50" [[package]] name = "libloading" @@ -3781,7 +3974,7 @@ checksum = "3bec54343492ba5940a6c555e512c6721139835d28c59bc22febece72dfd0d9d" dependencies = [ "atomic", "bytes 1.1.0", - "futures 0.3.18", + "futures 0.3.19", "lazy_static", "libp2p-core", "libp2p-deflate", @@ -3809,7 +4002,7 @@ dependencies = [ "libp2p-yamux", "multiaddr", "parking_lot 0.11.2", - "pin-project 1.0.8", + "pin-project 1.0.10", "smallvec", "wasm-timer", ] @@ -3825,8 +4018,8 @@ dependencies = [ "ed25519-dalek", "either", "fnv", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "lazy_static", "libsecp256k1", "log", @@ -3834,7 +4027,7 @@ dependencies = [ "multihash 0.14.0", "multistream-select", "parking_lot 0.11.2", - "pin-project 1.0.8", + "pin-project 1.0.10", "prost", "prost-build", "rand 0.8.4", @@ -3855,7 +4048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51a800adb195f33de63f4b17b63fe64cfc23bf2c6a0d3d0d5321328664e65197" dependencies = [ "flate2", - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", ] @@ -3866,7 +4059,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498" dependencies = [ "async-std-resolver", - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "log", "smallvec", @@ -3881,7 +4074,7 @@ checksum = "aab3d7210901ea51b7bae2b581aa34521797af8c4ec738c980bda4a06434067f" dependencies = [ "cuckoofilter", "fnv", - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "libp2p-swarm", "log", @@ -3902,7 +4095,7 @@ dependencies = [ "byteorder", "bytes 1.1.0", "fnv", - "futures 0.3.18", + "futures 0.3.19", "hex_fmt", "libp2p-core", "libp2p-swarm", @@ -3923,7 +4116,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cca1275574183f288ff8b72d535d5ffa5ea9292ef7829af8b47dcb197c7b0dcd" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "libp2p-swarm", "log", @@ -3945,7 +4138,7 @@ dependencies = [ "bytes 1.1.0", "either", "fnv", - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "libp2p-swarm", "log", @@ -3969,7 +4162,7 @@ dependencies = [ "async-io", "data-encoding", "dns-parser", - "futures 0.3.18", + "futures 0.3.19", "if-watch", "lazy_static", "libp2p-core", @@ -4003,7 +4196,7 @@ checksum = "7f2cd64ef597f40e14bfce0497f50ecb63dd6d201c61796daeb4227078834fbf" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.1.0", - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "log", "nohash-hasher", @@ -4021,7 +4214,7 @@ checksum = "a8772c7a99088221bb7ca9c5c0574bf55046a7ab4c319f3619b275f28c8fb87a" dependencies = [ "bytes 1.1.0", "curve25519-dalek 3.2.0", - "futures 0.3.18", + "futures 0.3.19", "lazy_static", "libp2p-core", "log", @@ -4041,7 +4234,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80ef7b0ec5cf06530d9eb6cf59ae49d46a2c45663bde31c25a12f682664adbcf" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "libp2p-swarm", "log", @@ -4058,7 +4251,7 @@ checksum = "5fba1a6ff33e4a274c89a3b1d78b9f34f32af13265cc5c46c16938262d4e945a" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.1.0", - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "log", "prost", @@ -4073,9 +4266,9 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "log", - "pin-project 1.0.8", + "pin-project 1.0.10", "rand 0.7.3", "salsa20", "sha3", @@ -4089,12 +4282,12 @@ checksum = "2852b61c90fa8ce3c8fcc2aba76e6cefc20d648f9df29157d6b3a916278ef3e3" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.1.0", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "libp2p-core", "libp2p-swarm", "log", - "pin-project 1.0.8", + "pin-project 1.0.10", "prost", "prost-build", "rand 0.7.3", @@ -4112,7 +4305,7 @@ checksum = "14a6d2b9e7677eff61dc3d2854876aaf3976d84a01ef6664b610c77a0c9407c5" dependencies = [ "asynchronous-codec 0.6.0", "bimap", - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "libp2p-swarm", "log", @@ -4134,11 +4327,11 @@ checksum = "a877a4ced6d46bf84677e1974e8cf61fb434af73b2e96fb48d6cb6223a4634d8" dependencies = [ "async-trait", "bytes 1.1.0", - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "libp2p-swarm", "log", - "lru 0.7.0", + "lru 0.7.2", "rand 0.7.3", "smallvec", "unsigned-varint 0.7.1", @@ -4152,7 +4345,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f5184a508f223bc100a12665517773fb8730e9f36fc09eefb670bf01b107ae9" dependencies = [ "either", - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "log", "rand 0.7.3", @@ -4178,8 +4371,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" dependencies = [ "async-io", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "if-watch", "ipnet", "libc", @@ -4195,7 +4388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8b7563e46218165dfd60f64b96f7ce84590d75f53ecbdc74a7dd01450dc5973" dependencies = [ "async-std", - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "log", ] @@ -4206,7 +4399,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1008a302b73c5020251f9708c653f5ed08368e530e247cc9cd2f109ff30042cf" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -4221,7 +4414,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22e12df82d1ed64969371a9e65ea92b91064658604cc2576c2757f18ead9a1cf" dependencies = [ "either", - "futures 0.3.18", + "futures 0.3.19", "futures-rustls", "libp2p-core", "log", @@ -4238,7 +4431,7 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "libp2p-core", "parking_lot 0.11.2", "thiserror", @@ -4344,9 +4537,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.28" +version = "0.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687387ff42ec7ea4f2149035a5675fedb675d26f98db90a1846ac63d3addb5f5" +checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca" [[package]] name = "lock_api" @@ -4387,9 +4580,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c748cfe47cb8da225c37595b3108bea1c198c84aaae8ea0ba76d01dda9fc803" +checksum = "274353858935c992b13c0ca408752e2121da852d07dec7ce5f108c77dfa14d1f" dependencies = [ "hashbrown", ] @@ -4513,9 +4706,9 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5" +checksum = "d505169b746dacf02f7d14d8c80b34edfd8212159c63d23c977739a0d960c626" dependencies = [ "hash-db", "hashbrown", @@ -4557,7 +4750,7 @@ dependencies = [ "async-trait", "bp-messages", "bp-runtime", - "futures 0.3.18", + "futures 0.3.19", "hex", "log", "num-traits", @@ -4569,23 +4762,23 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "derive_more", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "thiserror", "tracing", ] [[package]] name = "mick-jaeger" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa77fad8461bb1e0d01be11299e24c6e544007715ed442bfec29f165dc487ae" +checksum = "fd2c2cc134e57461f0898b0e921f0a7819b5e3f3a4335b9aa390ce81a5f36fb9" dependencies = [ - "futures 0.3.18", - "rand 0.7.3", + "futures 0.3.19", + "rand 0.8.4", "thrift", ] @@ -4598,6 +4791,7 @@ dependencies = [ "beefy-primitives", "bp-millau", "bp-runtime", + "clap 3.0.12", "frame-benchmarking", "frame-benchmarking-cli", "jsonrpc-core", @@ -4867,9 +5061,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56a336acba8bc87c8876f6425407dbbe6c417bf478b22015f8fb0994ef3bc0ab" dependencies = [ "bytes 1.1.0", - "futures 0.3.18", + "futures 0.3.19", "log", - "pin-project 1.0.8", + "pin-project 1.0.10", "smallvec", "unsigned-varint 0.7.1", ] @@ -4926,8 +5120,9 @@ dependencies = [ [[package]] name = "node-inspect" version = "0.9.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ + "clap 3.0.12", "derive_more", "parity-scale-codec", "sc-cli", @@ -4937,7 +5132,6 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-runtime", - "structopt", ] [[package]] @@ -4999,7 +5193,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465" dependencies = [ "arrayvec 0.4.12", - "itoa", + "itoa 0.4.8", ] [[package]] @@ -5091,7 +5285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7337d80c23c2d8b1349563981bc4fb531220733743ba8115454a67b181173f0d" dependencies = [ "dtoa", - "itoa", + "itoa 0.4.8", "open-metrics-client-derive-text-encode", "owning_ref", ] @@ -5135,6 +5329,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "os_str_bytes" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +dependencies = [ + "memchr", +] + [[package]] name = "owning_ref" version = "0.4.1" @@ -5147,7 +5350,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5163,7 +5366,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5179,7 +5382,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5194,7 +5397,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -5218,7 +5421,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-election-provider-support", "frame-support", @@ -5233,7 +5436,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -5248,7 +5451,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "beefy-primitives", "frame-support", @@ -5264,7 +5467,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5289,7 +5492,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5394,7 +5597,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -5411,7 +5614,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -5427,7 +5630,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-election-provider-support", "frame-support", @@ -5447,16 +5650,31 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-npos-elections", + "sp-core", + "sp-io", + "sp-npos-elections", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-gilt" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", "sp-runtime", "sp-std", ] @@ -5464,7 +5682,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -5487,7 +5705,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5503,7 +5721,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5522,7 +5740,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5538,7 +5756,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -5555,7 +5773,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5573,7 +5791,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5589,7 +5807,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5606,7 +5824,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5620,7 +5838,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5634,7 +5852,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5648,10 +5866,26 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-preimage" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5665,7 +5899,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5676,10 +5910,24 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-recovery" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -5695,7 +5943,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5728,10 +5976,24 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-society" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "rand_chacha 0.2.2", + "scale-info", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-election-provider-support", "frame-support", @@ -5752,7 +6014,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -5760,10 +6022,19 @@ dependencies = [ "syn", ] +[[package]] +name = "pallet-staking-reward-fn" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" +dependencies = [ + "log", + "sp-arithmetic", +] + [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5777,7 +6048,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-benchmarking", "frame-support", @@ -5795,7 +6066,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5813,7 +6084,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5830,7 +6101,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5847,7 +6118,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5858,7 +6129,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5874,7 +6145,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5889,7 +6160,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-support", "frame-system", @@ -5903,7 +6174,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "frame-support", "frame-system", @@ -5921,7 +6192,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=master#5b245a21eb84ff7b1da6b47ad4386bda3dfb5880" +source = "git+https://github.com/paritytech/cumulus?branch=master#a9630551c2cd877952ab769c862af4c81b0ccd3c" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -5988,7 +6259,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "libc", "log", "rand 0.7.3", @@ -6210,27 +6481,27 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" +checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" dependencies = [ - "pin-project-internal 0.4.28", + "pin-project-internal 0.4.29", ] [[package]] name = "pin-project" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ - "pin-project-internal 1.0.8", + "pin-project-internal 1.0.10", ] [[package]] name = "pin-project-internal" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" dependencies = [ "proc-macro2", "quote", @@ -6239,9 +6510,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", @@ -6281,9 +6552,9 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "polkadot-approval-distribution" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6295,9 +6566,9 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -6308,11 +6579,11 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "derive_more", - "futures 0.3.18", - "lru 0.7.0", + "futures 0.3.19", + "lru 0.7.2", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6330,10 +6601,10 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ - "futures 0.3.18", - "lru 0.7.0", + "futures 0.3.19", + "lru 0.7.2", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6350,18 +6621,21 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ + "clap 3.0.12", "frame-benchmarking-cli", - "futures 0.3.18", + "futures 0.3.19", "log", "polkadot-node-core-pvf", + "polkadot-node-metrics", + "polkadot-performance-test", "polkadot-service", "sc-cli", "sc-service", + "sc-tracing", "sp-core", "sp-trie", - "structopt", "substrate-build-script-utils", "thiserror", "try-runtime-cli", @@ -6370,7 +6644,7 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6400,12 +6674,12 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "always-assert", "derive_more", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6421,7 +6695,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -6434,11 +6708,11 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "derive_more", - "futures 0.3.18", - "lru 0.7.0", + "futures 0.3.19", + "lru 0.7.2", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6456,7 +6730,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6470,10 +6744,10 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -6490,10 +6764,10 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "async-trait", - "futures 0.3.18", + "futures 0.3.19", "parity-scale-codec", "parking_lot 0.11.2", "polkadot-node-network-protocol", @@ -6509,9 +6783,9 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -6527,14 +6801,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "bitvec", "derive_more", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "kvdb", - "lru 0.7.0", + "lru 0.7.2", "merlin", "parity-scale-codec", "polkadot-node-jaeger", @@ -6555,11 +6829,11 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "bitvec", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "kvdb", "parity-scale-codec", "polkadot-erasure-coding", @@ -6575,10 +6849,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "bitvec", - "futures 0.3.18", + "futures 0.3.19", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6593,9 +6867,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", @@ -6608,10 +6882,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "async-trait", - "futures 0.3.18", + "futures 0.3.19", "parity-scale-codec", "polkadot-node-core-pvf", "polkadot-node-primitives", @@ -6626,9 +6900,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", @@ -6641,10 +6915,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "kvdb", "parity-scale-codec", "polkadot-node-primitives", @@ -6658,12 +6932,11 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ - "bitvec", - "derive_more", - "futures 0.3.18", + "futures 0.3.19", "kvdb", + "lru 0.7.2", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6677,11 +6950,11 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "async-trait", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "polkadot-node-subsystem", "polkadot-primitives", "sp-blockchain", @@ -6694,13 +6967,16 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "bitvec", + "futures 0.3.19", + "futures-timer", + "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", + "rand 0.8.4", "thiserror", "tracing", ] @@ -6708,17 +6984,16 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "always-assert", "assert_matches", "async-process", "async-std", - "futures 0.3.18", - "futures-timer 3.0.2", - "libc", + "futures 0.3.19", + "futures-timer", "parity-scale-codec", - "pin-project 1.0.8", + "pin-project 1.0.10", "polkadot-core-primitives", "polkadot-node-subsystem-util", "polkadot-parachain", @@ -6736,12 +7011,28 @@ dependencies = [ "tracing", ] +[[package]] +name = "polkadot-node-core-pvf-checker" +version = "0.9.13" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" +dependencies = [ + "futures 0.3.19", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-primitives", + "sp-keystore", + "thiserror", + "tracing", +] + [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "memory-lru", "parity-util-mem", "polkadot-node-subsystem", @@ -6757,7 +7048,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "async-std", "lazy_static", @@ -6775,22 +7066,30 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "bs58", + "futures 0.3.19", + "futures-timer", + "log", "metered-channel", + "parity-scale-codec", + "polkadot-primitives", + "sc-cli", + "sc-service", + "sc-tracing", "substrate-prometheus-endpoint", + "tracing", ] [[package]] name = "polkadot-node-network-protocol" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "async-trait", "derive_more", - "futures 0.3.18", + "futures 0.3.19", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", @@ -6804,10 +7103,10 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "bounded-vec", - "futures 0.3.18", + "futures 0.3.19", "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", @@ -6826,7 +7125,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -6836,10 +7135,10 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "derive_more", - "futures 0.3.18", + "futures 0.3.19", "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -6855,16 +7154,16 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "async-trait", "derive_more", - "futures 0.3.18", + "futures 0.3.19", "itertools", - "lru 0.7.0", + "lru 0.7.2", "metered-channel", "parity-scale-codec", - "pin-project 1.0.8", + "pin-project 1.0.10", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -6883,11 +7182,11 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", - "lru 0.7.0", + "futures 0.3.19", + "futures-timer", + "lru 0.7.2", "parity-util-mem", "parking_lot 0.11.2", "polkadot-node-metrics", @@ -6904,13 +7203,13 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "async-trait", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "metered-channel", - "pin-project 1.0.8", + "pin-project 1.0.10", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-overseer-gen-proc-macro", @@ -6921,7 +7220,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -6932,7 +7231,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "derive_more", "frame-support", @@ -6946,10 +7245,25 @@ dependencies = [ "sp-std", ] +[[package]] +name = "polkadot-performance-test" +version = "0.9.13" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" +dependencies = [ + "env_logger 0.9.0", + "kusama-runtime", + "log", + "polkadot-erasure-coding", + "polkadot-node-core-pvf", + "polkadot-node-primitives", + "quote", + "thiserror", +] + [[package]] name = "polkadot-primitives" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "bitvec", "frame-system", @@ -6979,7 +7293,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7010,7 +7324,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "beefy-primitives", "bitvec", @@ -7040,6 +7354,7 @@ dependencies = [ "pallet-multisig", "pallet-nicks", "pallet-offences", + "pallet-preimage", "pallet-proxy", "pallet-scheduler", "pallet-session", @@ -7056,6 +7371,7 @@ dependencies = [ "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", + "polkadot-runtime-constants", "polkadot-runtime-parachains", "rustc-hex", "scale-info", @@ -7087,7 +7403,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "beefy-primitives", "bitvec", @@ -7129,10 +7445,34 @@ dependencies = [ "xcm", ] +[[package]] +name = "polkadot-runtime-constants" +version = "0.9.13" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" +dependencies = [ + "frame-support", + "polkadot-primitives", + "polkadot-runtime-common", + "smallvec", + "sp-runtime", +] + +[[package]] +name = "polkadot-runtime-metrics" +version = "0.9.13" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" +dependencies = [ + "bs58", + "parity-scale-codec", + "polkadot-primitives", + "sp-std", + "sp-tracing", +] + [[package]] name = "polkadot-runtime-parachains" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "bitflags", "bitvec", @@ -7150,6 +7490,7 @@ dependencies = [ "pallet-vesting", "parity-scale-codec", "polkadot-primitives", + "polkadot-runtime-metrics", "rand 0.8.4", "rand_chacha 0.3.1", "rustc-hex", @@ -7171,17 +7512,17 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "async-trait", "beefy-gadget", "beefy-primitives", "frame-system-rpc-runtime-api", - "futures 0.3.18", + "futures 0.3.19", "hex-literal", "kvdb", "kvdb-rocksdb 0.14.0", - "lru 0.7.0", + "lru 0.7.2", "pallet-babe", "pallet-im-online", "pallet-mmr-primitives", @@ -7207,6 +7548,7 @@ dependencies = [ "polkadot-node-core-dispute-coordinator", "polkadot-node-core-parachains-inherent", "polkadot-node-core-provisioner", + "polkadot-node-core-pvf-checker", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7217,6 +7559,7 @@ dependencies = [ "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", + "polkadot-runtime-constants", "polkadot-runtime-parachains", "polkadot-statement-distribution", "sc-authority-discovery", @@ -7266,11 +7609,11 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "arrayvec 0.5.2", "derive_more", - "futures 0.3.18", + "futures 0.3.19", "indexmap", "parity-scale-codec", "polkadot-node-network-protocol", @@ -7287,7 +7630,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7297,7 +7640,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "beefy-primitives", "bitvec", @@ -7350,6 +7693,7 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", + "test-runtime-constants", "xcm", "xcm-builder", "xcm-executor", @@ -7358,12 +7702,12 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "frame-benchmarking", "frame-system", "futures 0.1.31", - "futures 0.3.18", + "futures 0.3.19", "hex", "pallet-balances", "pallet-staking", @@ -7404,6 +7748,7 @@ dependencies = [ "sp-state-machine", "substrate-test-client", "tempfile", + "test-runtime-constants", "tokio", "tracing", ] @@ -7541,9 +7886,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.32" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid", ] @@ -7579,7 +7924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes 1.1.0", - "heck", + "heck 0.3.3", "itertools", "lazy_static", "log", @@ -7624,17 +7969,6 @@ dependencies = [ "cc", ] -[[package]] -name = "pwasm-utils" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "880b3384fb00b8f6ecccd5d358b93bd2201900ae3daad213791d1864f6441f5c" -dependencies = [ - "byteorder", - "log", - "parity-wasm 0.42.2", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -7660,9 +7994,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.10" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" dependencies = [ "proc-macro2", ] @@ -7865,9 +8199,9 @@ dependencies = [ [[package]] name = "regalloc" -version = "0.0.32" +version = "0.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6304468554ed921da3d32c355ea107b8d13d7b8996c3adfb7aab48d3bc321f4" +checksum = "7d808cff91dfca7b239d40b972ba628add94892b1d9e19a842aedc5cfae8ab1a" dependencies = [ "log", "rustc-hash", @@ -8038,7 +8372,7 @@ dependencies = [ "finality-relay", "frame-support", "frame-system", - "futures 0.3.18", + "futures 0.3.19", "jsonrpsee-proc-macros 0.3.1", "jsonrpsee-ws-client 0.3.1", "log", @@ -8075,7 +8409,7 @@ dependencies = [ "backoff", "bp-runtime", "env_logger 0.8.4", - "futures 0.3.18", + "futures 0.3.19", "isahc", "jsonpath_lib", "log", @@ -8126,7 +8460,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8174,14 +8508,15 @@ dependencies = [ "beefy-primitives", "bp-rialto", "bp-runtime", + "clap 3.0.12", "frame-benchmarking", "frame-benchmarking-cli", "frame-system-rpc-runtime-api", - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core", "kvdb", "kvdb-rocksdb 0.12.1", - "lru 0.7.0", + "lru 0.7.2", "node-inspect", "pallet-bridge-messages", "pallet-mmr-primitives", @@ -8237,6 +8572,7 @@ dependencies = [ name = "rialto-parachain-collator" version = "0.1.0" dependencies = [ + "clap 3.0.12", "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-aura", @@ -8245,6 +8581,8 @@ dependencies = [ "cumulus-client-service", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-local", "derive_more", "frame-benchmarking", "frame-benchmarking-cli", @@ -8450,23 +8788,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rsix" -version = "0.23.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f64c5788d5aab8b75441499d99576a24eb09f76fb267b36fec7e3d970c66431" -dependencies = [ - "bitflags", - "cc", - "errno", - "io-lifetimes", - "itoa", - "libc", - "linux-raw-sys", - "once_cell", - "rustc_version 0.4.0", -] - [[package]] name = "rustc-demangle" version = "0.1.21" @@ -8512,6 +8833,20 @@ dependencies = [ "semver 1.0.4", ] +[[package]] +name = "rustix" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2dcfc2778a90e38f56a708bfc90572422e11d6c7ee233d053d1f782cf9df6d2" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "winapi 0.3.9", +] + [[package]] name = "rustls" version = "0.19.1" @@ -8549,8 +8884,8 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ - "futures 0.3.18", - "pin-project 0.4.28", + "futures 0.3.19", + "pin-project 0.4.29", "static_assertions", ] @@ -8590,7 +8925,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "log", "sp-core", @@ -8601,12 +8936,12 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "derive_more", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "ip_network", "libp2p", "log", @@ -8628,10 +8963,10 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "log", "parity-scale-codec", "sc-block-builder", @@ -8651,7 +8986,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8667,7 +9002,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8684,7 +9019,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8695,11 +9030,12 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "chrono", + "clap 3.0.12", "fdlimit", - "futures 0.3.18", + "futures 0.3.19", "hex", "libp2p", "log", @@ -8724,7 +9060,6 @@ dependencies = [ "sp-panic-handler", "sp-runtime", "sp-version", - "structopt", "thiserror", "tiny-bip39", "tokio", @@ -8733,10 +9068,10 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "fnv", - "futures 0.3.18", + "futures 0.3.19", "hash-db", "log", "parity-scale-codec", @@ -8761,7 +9096,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "hash-db", "kvdb", @@ -8786,11 +9121,11 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "libp2p", "log", "parking_lot 0.11.2", @@ -8810,11 +9145,11 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "derive_more", - "futures 0.3.18", + "futures 0.3.19", "log", "parity-scale-codec", "sc-block-builder", @@ -8839,12 +9174,12 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "derive_more", "fork-tree", - "futures 0.3.18", + "futures 0.3.19", "log", "merlin", "num-bigint", @@ -8882,10 +9217,10 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "derive_more", - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -8906,7 +9241,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8919,17 +9254,16 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "log", "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-api", "sp-arithmetic", "sp-blockchain", "sp-consensus", @@ -8945,7 +9279,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "sc-client-api", "sp-authorship", @@ -8956,11 +9290,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "lazy_static", "libsecp256k1", "log", + "lru 0.6.6", "parity-scale-codec", "parking_lot 0.11.2", "sc-executor-common", @@ -8983,25 +9318,25 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "derive_more", "environmental", "parity-scale-codec", - "pwasm-utils", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", "sp-serializer", "sp-wasm-interface", "thiserror", + "wasm-instrument", "wasmi", ] [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "log", "parity-scale-codec", @@ -9017,7 +9352,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9035,20 +9370,21 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "derive_more", "dyn-clone", "finality-grandpa", "fork-tree", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "log", "parity-scale-codec", "parking_lot 0.11.2", "rand 0.8.4", "sc-block-builder", + "sc-chain-spec", "sc-client-api", "sc-consensus", "sc-keystore", @@ -9072,11 +9408,11 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "derive_more", "finality-grandpa", - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -9096,11 +9432,11 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "ansi_term 0.12.1", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "log", "parity-util-mem", "sc-client-api", @@ -9113,7 +9449,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "derive_more", @@ -9128,7 +9464,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-std", "async-trait", @@ -9140,18 +9476,18 @@ dependencies = [ "either", "fnv", "fork-tree", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "hex", "ip_network", "libp2p", "linked-hash-map", "linked_hash_set", "log", - "lru 0.7.0", + "lru 0.7.2", "parity-scale-codec", "parking_lot 0.11.2", - "pin-project 1.0.8", + "pin-project 1.0.10", "prost", "prost-build", "rand 0.7.3", @@ -9179,13 +9515,13 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "libp2p", "log", - "lru 0.7.0", + "lru 0.7.2", "sc-network", "sp-runtime", "substrate-prometheus-endpoint", @@ -9195,12 +9531,12 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "bytes 1.1.0", "fnv", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "hex", "hyper", "hyper-rustls", @@ -9223,9 +9559,9 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "libp2p", "log", "sc-utils", @@ -9236,7 +9572,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9245,9 +9581,9 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", @@ -9276,9 +9612,9 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -9301,9 +9637,9 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core", "jsonrpc-http-server", "jsonrpc-ipc-server", @@ -9318,13 +9654,13 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", @@ -9332,7 +9668,7 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.2", - "pin-project 1.0.8", + "pin-project 1.0.10", "rand 0.7.3", "sc-block-builder", "sc-chain-spec", @@ -9382,7 +9718,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "log", "parity-scale-codec", @@ -9396,7 +9732,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9418,14 +9754,14 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "chrono", - "futures 0.3.18", + "futures 0.3.19", "libp2p", "log", "parking_lot 0.11.2", - "pin-project 1.0.8", + "pin-project 1.0.10", "rand 0.7.3", "serde", "serde_json", @@ -9436,7 +9772,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9467,7 +9803,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9478,10 +9814,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ - "futures 0.3.18", - "intervalier", + "futures 0.3.19", + "futures-timer", "linked-hash-map", "log", "parity-scale-codec", @@ -9505,10 +9841,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "derive_more", - "futures 0.3.18", + "futures 0.3.19", "log", "serde", "sp-blockchain", @@ -9519,11 +9855,12 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "lazy_static", + "parking_lot 0.11.2", "prometheus", ] @@ -9688,18 +10025,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.130" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -9708,12 +10045,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.72" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" +checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" dependencies = [ "indexmap", - "itoa", + "itoa 1.0.1", "ryu", "serde", ] @@ -9774,6 +10111,17 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha2" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures 0.2.1", + "digest 0.10.1", +] + [[package]] name = "sha3" version = "0.9.1" @@ -9847,7 +10195,7 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slot-range-helper" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "enumn", "parity-scale-codec", @@ -9935,7 +10283,7 @@ checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f" dependencies = [ "base64", "bytes 1.1.0", - "futures 0.3.18", + "futures 0.3.19", "httparse", "log", "rand 0.8.4", @@ -9951,7 +10299,7 @@ dependencies = [ "base64", "bytes 1.1.0", "flate2", - "futures 0.3.18", + "futures 0.3.19", "httparse", "log", "rand 0.8.4", @@ -9961,7 +10309,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "hash-db", "log", @@ -9978,7 +10326,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -9989,8 +10337,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -10002,8 +10350,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "integer-sqrt", "num-traits", @@ -10018,7 +10366,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -10031,7 +10379,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "parity-scale-codec", @@ -10043,7 +10391,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "sp-api", @@ -10055,11 +10403,11 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "log", - "lru 0.7.0", + "lru 0.7.2", "parity-scale-codec", "parking_lot 0.11.2", "sp-api", @@ -10073,11 +10421,11 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.19", + "futures-timer", "log", "parity-scale-codec", "sp-core", @@ -10092,7 +10440,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "parity-scale-codec", @@ -10110,7 +10458,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "merlin", @@ -10133,7 +10481,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -10145,7 +10493,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -10156,8 +10504,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "base58", "bitflags", @@ -10165,7 +10513,7 @@ dependencies = [ "byteorder", "dyn-clonable", "ed25519-dalek", - "futures 0.3.18", + "futures 0.3.19", "hash-db", "hash256-std-hasher", "hex", @@ -10185,7 +10533,7 @@ dependencies = [ "schnorrkel", "secrecy", "serde", - "sha2 0.9.8", + "sha2 0.10.1", "sp-core-hashing", "sp-debug-derive", "sp-externalities", @@ -10204,12 +10552,12 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "blake2-rfc", "byteorder", - "sha2 0.9.8", + "sha2 0.10.1", "sp-std", "tiny-keccak", "twox-hash", @@ -10218,7 +10566,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "proc-macro2", "quote", @@ -10229,7 +10577,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "kvdb", "parking_lot 0.11.2", @@ -10237,8 +10585,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "proc-macro2", "quote", @@ -10247,8 +10595,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "0.10.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "environmental", "parity-scale-codec", @@ -10259,7 +10607,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "finality-grandpa", "log", @@ -10277,7 +10625,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10290,10 +10638,10 @@ dependencies = [ [[package]] name = "sp-io" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "hash-db", "libsecp256k1", "log", @@ -10314,8 +10662,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "lazy_static", "sp-core", @@ -10325,12 +10673,12 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "0.10.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "derive_more", - "futures 0.3.18", + "futures 0.3.19", "merlin", "parity-scale-codec", "parking_lot 0.11.2", @@ -10343,7 +10691,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "zstd", ] @@ -10351,7 +10699,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -10366,7 +10714,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -10377,7 +10725,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "sp-api", "sp-core", @@ -10386,8 +10734,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "backtrace", "lazy_static", @@ -10397,7 +10745,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "rustc-hash", "serde", @@ -10406,8 +10754,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "either", "hash256-std-hasher", @@ -10428,8 +10776,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10445,8 +10793,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -10458,7 +10806,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "serde", "serde_json", @@ -10467,7 +10815,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -10481,7 +10829,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "scale-info", @@ -10491,8 +10839,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "0.10.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "hash-db", "log", @@ -10514,13 +10862,13 @@ dependencies = [ [[package]] name = "sp-std" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" [[package]] name = "sp-storage" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10533,7 +10881,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "log", "sp-core", @@ -10546,10 +10894,10 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sp-api", @@ -10561,8 +10909,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "sp-std", @@ -10574,7 +10922,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "sp-api", "sp-runtime", @@ -10583,7 +10931,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", "log", @@ -10598,8 +10946,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "hash-db", "memory-db", @@ -10614,13 +10962,14 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm 0.42.2", "scale-info", "serde", + "sp-core-hashing-proc-macro", "sp-runtime", "sp-std", "sp-version-proc-macro", @@ -10630,7 +10979,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10640,13 +10989,15 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "impl-trait-for-tuples", + "log", "parity-scale-codec", "sp-std", "wasmi", + "wasmtime", ] [[package]] @@ -10657,9 +11008,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "ss58-registry" -version = "1.8.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78abb01d308934b82e34e9cf1f45846d31539246501745b129539176f4f3368d" +checksum = "8319f44e20b42e5c11b88b1ad4130c35fe2974665a007b08b02322070177136a" dependencies = [ "Inflector", "proc-macro2", @@ -10786,6 +11137,7 @@ dependencies = [ "honggfuzz", "log", "sp-core", + "sp-runtime", "sp-state-machine", "sp-std", "sp-trie", @@ -10797,13 +11149,19 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "structopt" version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c" dependencies = [ - "clap", + "clap 2.33.3", "lazy_static", "structopt-derive", ] @@ -10814,7 +11172,7 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro-error 1.0.4", "proc-macro2", "quote", @@ -10854,7 +11212,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2", "quote", "syn", @@ -10866,7 +11224,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2", "quote", "syn", @@ -10878,7 +11236,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2", "quote", "rustversion", @@ -10901,7 +11259,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "platforms", ] @@ -10909,10 +11267,10 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -10931,7 +11289,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-std", "derive_more", @@ -10966,7 +11324,7 @@ dependencies = [ "finality-grandpa", "finality-relay", "frame-support", - "futures 0.3.18", + "futures 0.3.19", "hex", "hex-literal", "log", @@ -11028,7 +11386,7 @@ dependencies = [ "finality-relay", "frame-support", "frame-system", - "futures 0.3.18", + "futures 0.3.19", "log", "messages-relay", "num-traits", @@ -11050,10 +11408,10 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "async-trait", - "futures 0.3.18", + "futures 0.3.19", "hex", "parity-scale-codec", "sc-client-api", @@ -11076,7 +11434,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -11096,9 +11454,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", @@ -11180,6 +11538,18 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "test-runtime-constants" +version = "0.9.13" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" +dependencies = [ + "frame-support", + "polkadot-primitives", + "polkadot-runtime-common", + "smallvec", + "sp-runtime", +] + [[package]] name = "textwrap" version = "0.11.0" @@ -11189,6 +11559,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "textwrap" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" + [[package]] name = "thiserror" version = "1.0.30" @@ -11229,9 +11605,9 @@ dependencies = [ [[package]] name = "thrift" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6d965454947cc7266d22716ebfd07b18d84ebaf35eec558586bbb2a8cb6b5b" +checksum = "b82ca8f46f95b3ce96081fe3dd89160fdea970c254bb72925255d1b62aae692e" dependencies = [ "byteorder", "integer-encoding", @@ -11334,11 +11710,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144" +checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" dependencies = [ - "autocfg", "bytes 1.1.0", "libc", "memchr", @@ -11353,9 +11728,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ "proc-macro2", "quote", @@ -11453,7 +11828,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.8", + "pin-project 1.0.10", "tracing", ] @@ -11503,9 +11878,9 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.22.6" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa" +checksum = "e3ddae50680c12ef75bfbf58416ca6622fa43d879553f6cb2ed1a817346e1ffe" dependencies = [ "hash-db", "hashbrown", @@ -11516,9 +11891,9 @@ dependencies = [ [[package]] name = "trie-root" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "652931506d2c1244d7217a70b99f56718a7b4161b37f04e7cd868072a99f68cd" +checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891" dependencies = [ "hash-db", ] @@ -11575,8 +11950,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#3fdb445b3b14880017680a3af85e89fb591666a0" +source = "git+https://github.com/paritytech/substrate?branch=master#31d90c202d6df9ce3837ee55587b604619a912ba" dependencies = [ + "clap 3.0.12", "jsonrpsee", "log", "parity-scale-codec", @@ -11593,7 +11969,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-version", - "structopt", + "zstd", ] [[package]] @@ -11604,9 +11980,9 @@ checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" [[package]] name = "twox-hash" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e" +checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ "cfg-if 1.0.0", "rand 0.8.4", @@ -11898,13 +12274,22 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "wasm-instrument" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +dependencies = [ + "parity-wasm 0.42.2", +] + [[package]] name = "wasm-timer" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -11945,9 +12330,9 @@ checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc" [[package]] name = "wasmtime" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311d06b0c49346d1fbf48a17052e844036b95a7753c1afb34e8c0af3f6b5bb13" +checksum = "414be1bc5ca12e755ffd3ff7acc3a6d1979922f8237fc34068b2156cebcc3270" dependencies = [ "anyhow", "backtrace", @@ -11977,9 +12362,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147930a4995137dc096e5b17a573b446799be2bbaea433e821ce6a80abe2c5" +checksum = "8b9b4cd1949206fda9241faf8c460a7d797aa1692594d3dd6bc1cbfa57ee20d0" dependencies = [ "anyhow", "base64", @@ -11987,7 +12372,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rsix", + "rustix", "serde", "sha2 0.9.8", "toml", @@ -11997,9 +12382,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3083a47e1ede38aac06a1d9831640d673f9aeda0b82a64e4ce002f3432e2e7" +checksum = "a4693d33725773615a4c9957e4aa731af57b27dca579702d1d8ed5750760f1a9" dependencies = [ "anyhow", "cranelift-codegen", @@ -12007,7 +12392,7 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.25.0", + "gimli", "log", "more-asserts", "object", @@ -12019,14 +12404,13 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c2d194b655321053bc4111a1aa4ead552655c8a17d17264bc97766e70073510" +checksum = "5b17e47116a078b9770e6fb86cff8b9a660826623cebcfff251b047c8d8993ef" dependencies = [ "anyhow", - "cfg-if 1.0.0", "cranelift-entity", - "gimli 0.25.0", + "gimli", "indexmap", "log", "more-asserts", @@ -12040,24 +12424,21 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864ac8dfe4ce310ac59f16fdbd560c257389cb009ee5d030ac6e30523b023d11" +checksum = "60ea5b380bdf92e32911400375aeefb900ac9d3f8e350bb6ba555a39315f2ee7" dependencies = [ - "addr2line 0.16.0", + "addr2line", "anyhow", "bincode", "cfg-if 1.0.0", - "gimli 0.25.0", - "log", - "more-asserts", + "gimli", "object", "region", - "rsix", + "rustix", "serde", "target-lexicon", "thiserror", - "wasmparser", "wasmtime-environ", "wasmtime-runtime", "winapi 0.3.9", @@ -12065,9 +12446,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab97da813a26b98c9abfd3b0c2d99e42f6b78b749c0646344e2e262d212d8c8b" +checksum = "abc7cd79937edd6e238b337608ebbcaf9c086a8457f01dfd598324f7fa56d81a" dependencies = [ "anyhow", "backtrace", @@ -12082,7 +12463,7 @@ dependencies = [ "more-asserts", "rand 0.8.4", "region", - "rsix", + "rustix", "thiserror", "wasmtime-environ", "winapi 0.3.9", @@ -12090,9 +12471,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff94409cc3557bfbbcce6b14520ccd6bd3727e965c0fe68d63ef2c185bf379c6" +checksum = "d9e5e51a461a2cf2b69e1fc48f325b17d78a8582816e18479e8ead58844b23f8" dependencies = [ "cranelift-entity", "serde", @@ -12237,7 +12618,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -12250,7 +12631,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "frame-support", "frame-system", @@ -12270,7 +12651,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -12287,8 +12668,9 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#bd69f54b6853e9a2f5e0869e5e76213259d4573d" +source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" dependencies = [ + "Inflector", "proc-macro2", "quote", "syn", @@ -12300,7 +12682,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "log", "nohash-hasher", "parking_lot 0.11.2", @@ -12331,18 +12713,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.9.0+zstd.1.5.0" +version = "0.9.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd" +checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.1+zstd.1.5.0" +version = "4.1.3+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079" +checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" dependencies = [ "libc", "zstd-sys", @@ -12350,9 +12732,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.1+zstd.1.5.0" +version = "1.6.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" +checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" dependencies = [ "cc", "libc", diff --git a/bin/millau/node/Cargo.toml b/bin/millau/node/Cargo.toml index c4438d0cef..2edfa612d6 100644 --- a/bin/millau/node/Cargo.toml +++ b/bin/millau/node/Cargo.toml @@ -10,6 +10,7 @@ repository = "https://github.com/paritytech/parity-bridges-common/" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] +clap = { version = "3.0", features = ["derive"] } jsonrpc-core = "18.0" structopt = "0.3.21" serde_json = "1.0.59" diff --git a/bin/millau/node/src/chain_spec.rs b/bin/millau/node/src/chain_spec.rs index ad424ba463..a7e3c7c877 100644 --- a/bin/millau/node/src/chain_spec.rs +++ b/bin/millau/node/src/chain_spec.rs @@ -95,6 +95,7 @@ impl Alternative { vec![], None, None, + None, properties, None, ), @@ -119,6 +120,7 @@ impl Alternative { vec![], None, None, + None, properties, None, ), @@ -195,7 +197,7 @@ fn testnet_genesis( aura: AuraConfig { authorities: Vec::new() }, beefy: BeefyConfig { authorities: Vec::new() }, grandpa: GrandpaConfig { authorities: Vec::new() }, - sudo: SudoConfig { key: root_key }, + sudo: SudoConfig { key: Some(root_key) }, session: SessionConfig { keys: initial_authorities .iter() diff --git a/bin/millau/node/src/cli.rs b/bin/millau/node/src/cli.rs index 086def633c..c3c3d134e3 100644 --- a/bin/millau/node/src/cli.rs +++ b/bin/millau/node/src/cli.rs @@ -14,10 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Parity Bridges Common. If not, see . +use clap::Parser; use sc_cli::RunCmd; -use structopt::StructOpt; -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct Cli { #[structopt(subcommand)] pub subcommand: Option, @@ -27,9 +27,10 @@ pub struct Cli { } /// Possible subcommands of the main binary. -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub enum Subcommand { /// Key management CLI utilities + #[clap(subcommand)] Key(sc_cli::KeySubcommand), /// Verify a signature for a message, provided on `STDIN`, with a given (public or secret) key. diff --git a/bin/millau/node/src/service.rs b/bin/millau/node/src/service.rs index 36e1b94875..6ec6b74e9e 100644 --- a/bin/millau/node/src/service.rs +++ b/bin/millau/node/src/service.rs @@ -30,7 +30,7 @@ // ===================================================================================== use millau_runtime::{self, opaque::Block, RuntimeApi}; -use sc_client_api::ExecutorProvider; +use sc_client_api::{BlockBackend, ExecutorProvider}; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; pub use sc_executor::NativeElseWasmExecutor; use sc_finality_grandpa::SharedVoterState; @@ -108,6 +108,7 @@ pub fn new_partial( config.wasm_method, config.default_heap_pages, config.max_runtime_instances, + config.runtime_cache_size, ); let (client, backend, keystore_container, task_manager) = @@ -210,8 +211,21 @@ pub fn new_full(mut config: Configuration) -> Result }; } - config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config()); - config.network.extra_sets.push(beefy_gadget::beefy_peers_set_config()); + // Note: GrandPa is pushed before the Polkadot-specific protocols. This doesn't change + // anything in terms of behaviour, but makes the logs more consistent with the other + // Substrate nodes. + let grandpa_protocol_name = sc_finality_grandpa::protocol_standard_name( + &client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"), + &config.chain_spec, + ); + config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone())); + + let beefy_protocol_name = beefy_gadget::protocol_standard_name( + &client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"), + &config.chain_spec, + ); + config.network.extra_sets.push(beefy_gadget::beefy_peers_set_config(beefy_protocol_name.clone())); + let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new( backend.clone(), grandpa_link.shared_authority_set().clone(), @@ -245,8 +259,10 @@ pub fn new_full(mut config: Configuration) -> Result let enable_grandpa = !config.disable_grandpa; let prometheus_registry = config.prometheus_registry().cloned(); let shared_voter_state = SharedVoterState::empty(); - let (signed_commitment_sender, signed_commitment_stream) = - beefy_gadget::notification::BeefySignedCommitmentStream::channel(); + let (beefy_commitment_link, beefy_commitment_stream) = + beefy_gadget::notification::BeefySignedCommitmentStream::::channel(); + let (beefy_best_block_link, beefy_best_block_stream) = + beefy_gadget::notification::BeefyBestBlockStream::::channel(); let rpc_extensions_builder = { use sc_finality_grandpa::FinalityProofProvider as GrandpaFinalityProofProvider; @@ -286,12 +302,11 @@ pub fn new_full(mut config: Configuration) -> Result subscription_executor.clone(), finality_proof_provider.clone(), ))); - io.extend_with(beefy_gadget_rpc::BeefyApi::to_delegate( - beefy_gadget_rpc::BeefyRpcHandler::new( - signed_commitment_stream.clone(), - subscription_executor, - ), - )); + io.extend_with(beefy_gadget_rpc::BeefyApi::to_delegate(beefy_gadget_rpc::BeefyRpcHandler::::new( + beefy_commitment_stream.clone(), + beefy_best_block_stream.clone(), + subscription_executor, + ).map_err(|e| sc_service::Error::Other(format!("{}", e)))?)); io.extend_with(pallet_mmr_rpc::MmrApi::to_delegate(pallet_mmr_rpc::Mmr::new( client.clone(), ))); @@ -374,9 +389,11 @@ pub fn new_full(mut config: Configuration) -> Result backend, key_store: keystore.clone(), network: network.clone(), - signed_commitment_sender, + signed_commitment_sender: beefy_commitment_link, + beefy_best_block_sender: beefy_best_block_link, min_block_delta: 4, prometheus_registry: prometheus_registry.clone(), + protocol_name: beefy_protocol_name, }; // Start the BEEFY bridge gadget. @@ -395,6 +412,7 @@ pub fn new_full(mut config: Configuration) -> Result keystore, local_role: role, telemetry: telemetry.as_ref().map(|x| x.handle()), + protocol_name: grandpa_protocol_name, }; if enable_grandpa { diff --git a/bin/millau/runtime/src/lib.rs b/bin/millau/runtime/src/lib.rs index 33839614e7..77049f8958 100644 --- a/bin/millau/runtime/src/lib.rs +++ b/bin/millau/runtime/src/lib.rs @@ -138,6 +138,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 0, }; /// The version information used to identify this runtime when compiled natively. @@ -204,6 +205,7 @@ impl frame_system::Config for Runtime { type SS58Prefix = SS58Prefix; /// The set code logic, just the default since we're not a parachain. type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } impl pallet_randomness_collective_flip::Config for Runtime {} @@ -562,7 +564,7 @@ pub type Executive = frame_executive::Executive< Block, frame_system::ChainContext, Runtime, - AllPallets, + AllPalletsWithSystem, >; impl_runtime_apis! { @@ -664,7 +666,7 @@ impl_runtime_apis! { } impl beefy_primitives::BeefyApi for Runtime { - fn validator_set() -> ValidatorSet { + fn validator_set() -> Option> { Beefy::validator_set() } } diff --git a/bin/rialto-parachain/node/Cargo.toml b/bin/rialto-parachain/node/Cargo.toml index 8adc998e47..3e1cac7887 100644 --- a/bin/rialto-parachain/node/Cargo.toml +++ b/bin/rialto-parachain/node/Cargo.toml @@ -18,6 +18,7 @@ default = [] runtime-benchmarks = ['rialto-parachain-runtime/runtime-benchmarks'] [dependencies] +clap = { version = "3.0", features = ["derive"] } derive_more = '0.99.2' log = '0.4.14' codec = { package = 'parity-scale-codec', version = '2.0.0' } @@ -80,6 +81,8 @@ cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "master" } cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "master" } cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "master" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "master" } +cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "master" } # Polkadot dependencies polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" } diff --git a/bin/rialto-parachain/node/src/chain_spec.rs b/bin/rialto-parachain/node/src/chain_spec.rs index 52012423fb..6a8e751677 100644 --- a/bin/rialto-parachain/node/src/chain_spec.rs +++ b/bin/rialto-parachain/node/src/chain_spec.rs @@ -89,6 +89,7 @@ pub fn development_config(id: ParaId) -> ChainSpec { None, None, None, + None, Extensions { relay_chain: "rococo-local".into(), // You MUST set this to the correct network! para_id: id.into(), @@ -133,6 +134,7 @@ pub fn local_testnet_config(id: ParaId) -> ChainSpec { None, None, None, + None, Extensions { relay_chain: "rococo-local".into(), // You MUST set this to the correct network! para_id: id.into(), @@ -155,7 +157,7 @@ fn testnet_genesis( balances: rialto_parachain_runtime::BalancesConfig { balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(), }, - sudo: rialto_parachain_runtime::SudoConfig { key: root_key }, + sudo: rialto_parachain_runtime::SudoConfig { key: Some(root_key) }, parachain_info: rialto_parachain_runtime::ParachainInfoConfig { parachain_id: id }, aura: rialto_parachain_runtime::AuraConfig { authorities: initial_authorities }, aura_ext: Default::default(), diff --git a/bin/rialto-parachain/node/src/cli.rs b/bin/rialto-parachain/node/src/cli.rs index 78c05f90c8..7abb72cb87 100644 --- a/bin/rialto-parachain/node/src/cli.rs +++ b/bin/rialto-parachain/node/src/cli.rs @@ -15,18 +15,18 @@ // along with Parity Bridges Common. If not, see . use crate::chain_spec; +use clap::{AppSettings, Parser}; use std::path::PathBuf; -use structopt::StructOpt; /// Sub-commands supported by the collator. -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub enum Subcommand { /// Export the genesis state of the parachain. - #[structopt(name = "export-genesis-state")] + #[clap(name = "export-genesis-state")] ExportGenesisState(ExportGenesisStateCommand), /// Export the genesis wasm of the parachain. - #[structopt(name = "export-genesis-wasm")] + #[clap(name = "export-genesis-wasm")] ExportGenesisWasm(ExportGenesisWasmCommand), /// Build a chain specification. @@ -51,66 +51,66 @@ pub enum Subcommand { Revert(sc_cli::RevertCmd), /// The custom benchmark subcommmand benchmarking runtime pallets. - #[structopt(name = "benchmark", about = "Benchmark runtime pallets.")] + #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] Benchmark(frame_benchmarking_cli::BenchmarkCmd), } /// Command for exporting the genesis state of the parachain -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct ExportGenesisStateCommand { /// Output file name or stdout if unspecified. - #[structopt(parse(from_os_str))] + #[clap(parse(from_os_str))] pub output: Option, /// Id of the parachain this state is for. /// /// Default: 100 - #[structopt(long, conflicts_with = "chain")] + #[clap(long, conflicts_with = "chain")] pub parachain_id: Option, /// Write output in binary. Default is to write in hex. - #[structopt(short, long)] + #[clap(short, long)] pub raw: bool, /// The name of the chain for that the genesis state should be exported. - #[structopt(long, conflicts_with = "parachain-id")] + #[clap(long, conflicts_with = "parachain-id")] pub chain: Option, } /// Command for exporting the genesis wasm file. -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct ExportGenesisWasmCommand { /// Output file name or stdout if unspecified. - #[structopt(parse(from_os_str))] + #[clap(parse(from_os_str))] pub output: Option, /// Write output in binary. Default is to write in hex. - #[structopt(short, long)] + #[clap(short, long)] pub raw: bool, /// The name of the chain for that the genesis wasm file should be exported. - #[structopt(long)] + #[clap(long)] pub chain: Option, } -#[derive(Debug, StructOpt)] -#[structopt(settings = &[ - structopt::clap::AppSettings::GlobalVersion, - structopt::clap::AppSettings::ArgsNegateSubcommands, - structopt::clap::AppSettings::SubcommandsNegateReqs, -])] +#[derive(Debug, Parser)] +#[clap(setting( + AppSettings::PropagateVersion | + AppSettings::ArgsNegateSubcommands | + AppSettings::SubcommandsNegateReqs, +))] pub struct Cli { - #[structopt(subcommand)] + #[clap(subcommand)] pub subcommand: Option, - #[structopt(long)] + #[clap(long)] pub parachain_id: Option, - #[structopt(flatten)] + #[clap(flatten)] pub run: cumulus_client_cli::RunCmd, /// Relaychain arguments - #[structopt(raw = true)] + #[clap(raw = true)] pub relaychain_args: Vec, } @@ -135,6 +135,6 @@ impl RelayChainCli { let extension = chain_spec::Extensions::try_get(&*para_config.chain_spec); let chain_id = extension.map(|e| e.relay_chain.clone()); let base_path = para_config.base_path.as_ref().map(|x| x.path().join("rialto-bridge-node")); - Self { base_path, chain_id, base: polkadot_cli::RunCmd::from_iter(relay_chain_args) } + Self { base_path, chain_id, base: polkadot_cli::RunCmd::parse_from(relay_chain_args) } } } diff --git a/bin/rialto-parachain/node/src/command.rs b/bin/rialto-parachain/node/src/command.rs index e4f52cc026..efb4d5b412 100644 --- a/bin/rialto-parachain/node/src/command.rs +++ b/bin/rialto-parachain/node/src/command.rs @@ -211,10 +211,9 @@ pub fn run() -> Result<()> { builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); let _ = builder.init(); - let block: Block = generate_genesis_block(&load_spec( - ¶ms.chain.clone().unwrap_or_default(), - params.parachain_id.expect("Missing ParaId").into(), - )?)?; + let spec = load_spec(¶ms.chain.clone().unwrap_or_default(), params.parachain_id.expect("Missing ParaId").into(),)?; + let state_version = Cli::native_runtime_version(&spec).state_version(); + let block: Block = generate_genesis_block(&spec, state_version)?; let raw_header = block.header().encode(); let output_buf = if params.raw { raw_header @@ -278,8 +277,10 @@ pub fn run() -> Result<()> { let parachain_account = AccountIdConversion::::into_account(&id); + let state_version = + RelayChainCli::native_runtime_version(&config.chain_spec).state_version(); let block: Block = - generate_genesis_block(&config.chain_spec).map_err(|e| format!("{:?}", e))?; + generate_genesis_block(&config.chain_spec, state_version).map_err(|e| format!("{:?}", e))?; let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); let polkadot_config = SubstrateCli::create_configuration( @@ -357,11 +358,24 @@ impl CliConfiguration for RelayChainCli { self.base.base.rpc_ws(default_listen_port) } - fn prometheus_config(&self, default_listen_port: u16) -> Result> { - self.base.base.prometheus_config(default_listen_port) + fn prometheus_config( + &self, + default_listen_port: u16, + chain_spec: &Box, + ) -> Result> { + self.base.base.prometheus_config(default_listen_port, chain_spec) } - fn init(&self) -> Result<()> { + fn init( + &self, + _support_url: &String, + _impl_version: &String, + _logger_hook: F, + _config: &sc_service::Configuration, + ) -> Result<()> + where + F: FnOnce(&mut sc_cli::LoggerBuilder, &sc_service::Configuration), + { unreachable!("PolkadotCli is never initialized; qed"); } diff --git a/bin/rialto-parachain/node/src/service.rs b/bin/rialto-parachain/node/src/service.rs index 54e626e0ea..c3098c06c8 100644 --- a/bin/rialto-parachain/node/src/service.rs +++ b/bin/rialto-parachain/node/src/service.rs @@ -22,21 +22,24 @@ //! `substrate_frame_rpc_system::SystemApi`. // std -use std::sync::Arc; +use std::{sync::Arc, time::Duration}; // Local Runtime Types use rialto_parachain_runtime::RuntimeApi; // Cumulus Imports use cumulus_client_consensus_aura::{ - build_aura_consensus, BuildAuraConsensusParams, SlotProportion, + BuildAuraConsensusParams, SlotProportion, }; use cumulus_client_consensus_common::ParachainConsensus; -use cumulus_client_network::build_block_announce_validator; +use cumulus_client_network::BlockAnnounceValidator; use cumulus_client_service::{ prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; +use cumulus_client_consensus_aura::AuraConsensus; use cumulus_primitives_core::ParaId; +use cumulus_relay_chain_interface::RelayChainInterface; +use cumulus_relay_chain_local::build_relay_chain_interface; // Substrate Imports use sc_client_api::ExecutorProvider; @@ -141,6 +144,7 @@ where config.wasm_method, config.default_heap_pages, config.max_runtime_instances, + config.runtime_cache_size, ); let (client, backend, keystore_container, task_manager) = @@ -247,7 +251,7 @@ where Option<&Registry>, Option, &TaskManager, - &polkadot_service::NewFull, + Arc, Arc< sc_transaction_pool::FullPool< Block, @@ -268,8 +272,9 @@ where let params = new_partial::(¶chain_config, build_import_queue)?; let (mut telemetry, telemetry_worker_handle) = params.other; - let relay_chain_full_node = - cumulus_client_service::build_polkadot_full_node(polkadot_config, telemetry_worker_handle) + let mut task_manager = params.task_manager; + let (relay_chain_interface, collator_key) = + build_relay_chain_interface(polkadot_config, telemetry_worker_handle, &mut task_manager) .map_err(|e| match e { polkadot_service::Error::Sub(x) => x, s => format!("{}", s).into(), @@ -277,18 +282,15 @@ where let client = params.client.clone(); let backend = params.backend.clone(); - let block_announce_validator = build_block_announce_validator( - relay_chain_full_node.client.clone(), + let block_announce_validator = BlockAnnounceValidator::new( + relay_chain_interface.clone(), id, - Box::new(relay_chain_full_node.network.clone()), - relay_chain_full_node.backend.clone(), ); let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); - let mut task_manager = params.task_manager; let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); let (network, system_rpc_tx, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { @@ -297,7 +299,9 @@ where transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), import_queue: import_queue.clone(), - block_announce_validator_builder: Some(Box::new(|_| block_announce_validator)), + block_announce_validator_builder: Some(Box::new(|_| { + Box::new(block_announce_validator) + })), warp_sync: None, })?; @@ -325,13 +329,15 @@ where Arc::new(move |hash, data| network.announce_block(hash, data)) }; + let relay_chain_slot_duration = Duration::from_secs(6); + if validator { let parachain_consensus = build_consensus( client.clone(), prometheus_registry.as_ref(), telemetry.as_ref().map(|t| t.handle()), &task_manager, - &relay_chain_full_node, + relay_chain_interface.clone(), transaction_pool, network, params.keystore_container.sync_keystore(), @@ -346,10 +352,12 @@ where announce_block, client: client.clone(), task_manager: &mut task_manager, - relay_chain_full_node, + relay_chain_interface, spawner, parachain_consensus, import_queue, + collator_key, + relay_chain_slot_duration, }; start_collator(params).await?; @@ -359,7 +367,9 @@ where announce_block, task_manager: &mut task_manager, para_id: id, - relay_chain_full_node, + relay_chain_interface, + relay_chain_slot_duration, + import_queue, }; start_full_node(params)?; @@ -447,7 +457,7 @@ pub async fn start_node( prometheus_registry, telemetry, task_manager, - relay_chain_node, + relay_chain_interface, transaction_pool, sync_oracle, keystore, @@ -462,31 +472,18 @@ pub async fn start_node( telemetry.clone(), ); - let relay_chain_backend = relay_chain_node.backend.clone(); - let relay_chain_client = relay_chain_node.client.clone(); - Ok(build_aura_consensus::< - sp_consensus_aura::sr25519::AuthorityPair, - _, - _, - _, - _, - _, - _, - _, - _, - _, - >(BuildAuraConsensusParams { + Ok(AuraConsensus::build::(BuildAuraConsensusParams { proposer_factory, create_inherent_data_providers: move |_, (relay_parent, validation_data)| { - let parachain_inherent = - cumulus_primitives_parachain_inherent::ParachainInherentData::create_at_with_client( + let relay_chain_interface = relay_chain_interface.clone(); + async move { + let parachain_inherent = + cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( relay_parent, - &relay_chain_client, - &*relay_chain_backend, + &relay_chain_interface, &validation_data, id, - ); - async move { + ).await; let time = sp_timestamp::InherentDataProvider::from_system_time(); let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( @@ -503,8 +500,6 @@ pub async fn start_node( } }, block_import: client.clone(), - relay_chain_client: relay_chain_node.client.clone(), - relay_chain_backend: relay_chain_node.backend.clone(), para_client: client, backoff_authoring_blocks: Option::<()>::None, sync_oracle, diff --git a/bin/rialto-parachain/runtime/src/lib.rs b/bin/rialto-parachain/runtime/src/lib.rs index 5b71674b7f..e499c89f13 100644 --- a/bin/rialto-parachain/runtime/src/lib.rs +++ b/bin/rialto-parachain/runtime/src/lib.rs @@ -50,7 +50,7 @@ pub use frame_support::{ }, StorageValue, }; -pub use frame_system::Call as SystemCall; +pub use frame_system::{Call as SystemCall, EnsureRoot}; pub use pallet_balances::Call as BalancesCall; pub use pallet_timestamp::Call as TimestampCall; pub use sp_consensus_aura::sr25519::AuthorityId as AuraId; @@ -70,7 +70,7 @@ use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset, - ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, + ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, }; @@ -103,7 +103,7 @@ pub type Executive = frame_executive::Executive< Block, frame_system::ChainContext, Runtime, - AllPallets, + AllPalletsWithSystem, >; impl_opaque_keys! { @@ -122,6 +122,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 0, }; /// This determines the average expected block time that we are targeting. @@ -209,6 +210,7 @@ impl frame_system::Config for Runtime { type SS58Prefix = SS58Prefix; /// The action to take on a Runtime Upgrade type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode; + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { @@ -267,7 +269,7 @@ parameter_types! { impl cumulus_pallet_parachain_system::Config for Runtime { type Event = Event; - type OnValidationData = (); + type OnSystemEvent = (); type SelfParaId = parachain_info::Pallet; type OutboundXcmpMessageSource = XcmpQueue; type DmpMessageHandler = DmpQueue; @@ -294,7 +296,7 @@ parameter_types! { /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. @@ -420,6 +422,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; type VersionWrapper = (); + type ExecuteOverweightOrigin = EnsureRoot; } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -554,8 +557,8 @@ impl_runtime_apis! { } impl cumulus_primitives_core::CollectCollationInfo for Runtime { - fn collect_collation_info() -> cumulus_primitives_core::CollationInfo { - ParachainSystem::collect_collation_info() + fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo { + ParachainSystem::collect_collation_info(header) } } diff --git a/bin/rialto/node/Cargo.toml b/bin/rialto/node/Cargo.toml index 77694e552a..b688527380 100644 --- a/bin/rialto/node/Cargo.toml +++ b/bin/rialto/node/Cargo.toml @@ -10,6 +10,7 @@ repository = "https://github.com/paritytech/parity-bridges-common/" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] +clap = { version = "3.0", features = ["derive"] } futures = "0.3" jsonrpc-core = "18.0" kvdb = "0.10" diff --git a/bin/rialto/node/src/chain_spec.rs b/bin/rialto/node/src/chain_spec.rs index 7e08e63531..49ccd309d6 100644 --- a/bin/rialto/node/src/chain_spec.rs +++ b/bin/rialto/node/src/chain_spec.rs @@ -104,6 +104,7 @@ impl Alternative { vec![], None, None, + None, properties, Default::default(), ), @@ -128,6 +129,7 @@ impl Alternative { vec![], None, None, + None, properties, Default::default(), ), @@ -222,7 +224,7 @@ fn testnet_genesis( }, beefy: BeefyConfig { authorities: Vec::new() }, grandpa: GrandpaConfig { authorities: Vec::new() }, - sudo: SudoConfig { key: root_key }, + sudo: SudoConfig { key: Some(root_key) }, session: SessionConfig { keys: initial_authorities .iter() @@ -248,7 +250,7 @@ fn testnet_genesis( // (see /node/service/src/chain_spec.rs:default_parachains_host_configuration) configuration: ConfigurationConfig { config: polkadot_runtime_parachains::configuration::HostConfiguration { - validation_upgrade_frequency: 1u32, + validation_upgrade_cooldown: 2u32, validation_upgrade_delay: 1, code_retention_period: 1200, max_code_size: polkadot_primitives::v1::MAX_CODE_SIZE, diff --git a/bin/rialto/node/src/cli.rs b/bin/rialto/node/src/cli.rs index 3f85a69a71..20155a1469 100644 --- a/bin/rialto/node/src/cli.rs +++ b/bin/rialto/node/src/cli.rs @@ -14,10 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Parity Bridges Common. If not, see . +use clap::{AppSettings, Parser}; use sc_cli::RunCmd; -use structopt::StructOpt; -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct Cli { #[structopt(subcommand)] pub subcommand: Option, @@ -27,9 +27,10 @@ pub struct Cli { } /// Possible subcommands of the main binary. -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub enum Subcommand { /// Key management CLI utilities + #[clap(subcommand)] Key(sc_cli::KeySubcommand), /// Verify a signature for a message, provided on `STDIN`, with a given (public or secret) key. @@ -69,16 +70,16 @@ pub enum Subcommand { Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// FOR INTERNAL USE: analog of the "prepare-worker" command of the polkadot binary. - #[structopt(name = "prepare-worker", setting = structopt::clap::AppSettings::Hidden)] + #[clap(name = "prepare-worker", setting = AppSettings::Hidden)] PvfPrepareWorker(ValidationWorkerCommand), /// FOR INTERNAL USE: analog of the "execute-worker" command of the polkadot binary. - #[structopt(name = "execute-worker", setting = structopt::clap::AppSettings::Hidden)] + #[clap(name = "execute-worker", setting = AppSettings::Hidden)] PvfExecuteWorker(ValidationWorkerCommand), } /// Validation worker command. -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct ValidationWorkerCommand { /// The path to the validation host's socket. pub socket_path: String, diff --git a/bin/rialto/runtime/src/lib.rs b/bin/rialto/runtime/src/lib.rs index 5f940bb58e..42d2d880e0 100644 --- a/bin/rialto/runtime/src/lib.rs +++ b/bin/rialto/runtime/src/lib.rs @@ -142,6 +142,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 1, }; /// The version information used to identify this runtime when compiled natively. @@ -208,6 +209,7 @@ impl frame_system::Config for Runtime { type SS58Prefix = SS58Prefix; /// The set code logic, just the default since we're not a parachain. type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } /// The BABE epoch configuration at genesis. @@ -553,7 +555,7 @@ pub type Executive = frame_executive::Executive< Block, frame_system::ChainContext, Runtime, - AllPallets, + AllPalletsWithSystem, >; impl_runtime_apis! { @@ -605,7 +607,7 @@ impl_runtime_apis! { } impl beefy_primitives::BeefyApi for Runtime { - fn validator_set() -> ValidatorSet { + fn validator_set() -> Option> { Beefy::validator_set() } } @@ -715,15 +717,12 @@ impl_runtime_apis! { } } - impl polkadot_primitives::v1::ParachainHost for Runtime { + impl polkadot_primitives::v2::ParachainHost for Runtime { fn validators() -> Vec { polkadot_runtime_parachains::runtime_api_impl::v1::validators::() } - fn validator_groups() -> ( - Vec>, - polkadot_primitives::v1::GroupRotationInfo, - ) { + fn validator_groups() -> (Vec>, polkadot_primitives::v1::GroupRotationInfo) { polkadot_runtime_parachains::runtime_api_impl::v1::validator_groups::() } @@ -731,10 +730,7 @@ impl_runtime_apis! { polkadot_runtime_parachains::runtime_api_impl::v1::availability_cores::() } - fn persisted_validation_data( - para_id: polkadot_primitives::v1::Id, - assumption: polkadot_primitives::v1::OccupiedCoreAssumption, - ) + fn persisted_validation_data(para_id: polkadot_primitives::v1::Id, assumption: polkadot_primitives::v1::OccupiedCoreAssumption) -> Option> { polkadot_runtime_parachains::runtime_api_impl::v1::persisted_validation_data::(para_id, assumption) } @@ -743,7 +739,10 @@ impl_runtime_apis! { para_id: polkadot_primitives::v1::Id, expected_persisted_validation_data_hash: Hash, ) -> Option<(polkadot_primitives::v1::PersistedValidationData, polkadot_primitives::v1::ValidationCodeHash)> { - polkadot_runtime_parachains::runtime_api_impl::v1::assumed_validation_data::(para_id, expected_persisted_validation_data_hash) + polkadot_runtime_parachains::runtime_api_impl::v1::assumed_validation_data::( + para_id, + expected_persisted_validation_data_hash, + ) } fn check_validation_outputs( @@ -757,17 +756,12 @@ impl_runtime_apis! { polkadot_runtime_parachains::runtime_api_impl::v1::session_index_for_child::() } - fn validation_code( - para_id: polkadot_primitives::v1::Id, - assumption: polkadot_primitives::v1::OccupiedCoreAssumption, - ) + fn validation_code(para_id: polkadot_primitives::v1::Id, assumption: polkadot_primitives::v1::OccupiedCoreAssumption) -> Option { polkadot_runtime_parachains::runtime_api_impl::v1::validation_code::(para_id, assumption) } - fn candidate_pending_availability( - para_id: polkadot_primitives::v1::Id, - ) -> Option> { + fn candidate_pending_availability(para_id: polkadot_primitives::v1::Id) -> Option> { polkadot_runtime_parachains::runtime_api_impl::v1::candidate_pending_availability::(para_id) } @@ -782,13 +776,11 @@ impl_runtime_apis! { }) } - fn session_info(index: polkadot_primitives::v1::SessionIndex) -> Option { + fn session_info(index: polkadot_primitives::v1::SessionIndex) -> Option { polkadot_runtime_parachains::runtime_api_impl::v1::session_info::(index) } - fn dmq_contents( - recipient: polkadot_primitives::v1::Id, - ) -> Vec> { + fn dmq_contents(recipient: polkadot_primitives::v1::Id) -> Vec> { polkadot_runtime_parachains::runtime_api_impl::v1::dmq_contents::(recipient) } @@ -798,15 +790,27 @@ impl_runtime_apis! { polkadot_runtime_parachains::runtime_api_impl::v1::inbound_hrmp_channels_contents::(recipient) } - fn validation_code_by_hash( - hash: polkadot_primitives::v1::ValidationCodeHash, - ) -> Option { + fn validation_code_by_hash(hash: polkadot_primitives::v1::ValidationCodeHash) -> Option { polkadot_runtime_parachains::runtime_api_impl::v1::validation_code_by_hash::(hash) } fn on_chain_votes() -> Option> { polkadot_runtime_parachains::runtime_api_impl::v1::on_chain_votes::() } + + fn submit_pvf_check_statement(stmt: polkadot_primitives::v2::PvfCheckStatement, signature: polkadot_primitives::v1::ValidatorSignature) { + polkadot_runtime_parachains::runtime_api_impl::v1::submit_pvf_check_statement::(stmt, signature) + } + + fn pvfs_require_precheck() -> Vec { + polkadot_runtime_parachains::runtime_api_impl::v1::pvfs_require_precheck::() + } + + fn validation_code_hash(para_id: polkadot_primitives::v1::Id, assumption: polkadot_primitives::v1::OccupiedCoreAssumption) + -> Option + { + polkadot_runtime_parachains::runtime_api_impl::v1::validation_code_hash::(para_id, assumption) + } } impl sp_authority_discovery::AuthorityDiscoveryApi for Runtime { diff --git a/bin/rialto/runtime/src/parachains.rs b/bin/rialto/runtime/src/parachains.rs index 332a3387ac..6f3603056d 100644 --- a/bin/rialto/runtime/src/parachains.rs +++ b/bin/rialto/runtime/src/parachains.rs @@ -16,7 +16,7 @@ //! Parachains support in Rialto runtime. -use crate::{AccountId, Balance, Balances, BlockNumber, Event, Origin, Registrar, Runtime, Slots}; +use crate::{AccountId, Babe, Balance, Balances, BlockNumber, Call, Event, Origin, Registrar, Runtime, Slots, UncheckedExtrinsic}; use frame_support::{parameter_types, weights::Weight}; use frame_system::EnsureRoot; @@ -29,6 +29,15 @@ use polkadot_runtime_parachains::{ paras_inherent as parachains_paras_inherent, scheduler as parachains_scheduler, session_info as parachains_session_info, shared as parachains_shared, ump as parachains_ump, }; +use sp_runtime::transaction_validity::TransactionPriority; + +impl frame_system::offchain::SendTransactionTypes for Runtime +where + Call: From, +{ + type Extrinsic = UncheckedExtrinsic; + type OverarchingCall = Call; +} /// Special `RewardValidators` that does nothing ;) pub struct RewardValidators; @@ -49,6 +58,7 @@ impl parachains_hrmp::Config for Runtime { type Event = Event; type Origin = Origin; type Currency = Balances; + type WeightInfo = parachains_hrmp::TestWeightInfo; } impl parachains_inclusion::Config for Runtime { @@ -65,10 +75,15 @@ impl parachains_initializer::Config for Runtime { impl parachains_origin::Config for Runtime {} +parameter_types! { + pub const ParasUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); +} + impl parachains_paras::Config for Runtime { - type Origin = Origin; type Event = Event; type WeightInfo = parachains_paras::TestWeightInfo; + type UnsignedPriority = ParasUnsignedPriority; + type NextSessionRotation = Babe; } impl parachains_paras_inherent::Config for Runtime { @@ -120,6 +135,7 @@ impl slots::Config for Runtime { type LeasePeriod = LeasePeriod; type WeightInfo = slots::TestWeightInfo; type LeaseOffset = (); + type ForceOrigin = EnsureRoot; } impl paras_sudo_wrapper::Config for Runtime {} diff --git a/fuzz/storage-proof/Cargo.toml b/fuzz/storage-proof/Cargo.toml index c4da57b255..2ab1d451b0 100644 --- a/fuzz/storage-proof/Cargo.toml +++ b/fuzz/storage-proof/Cargo.toml @@ -19,6 +19,7 @@ bp-runtime = { path = "../../primitives/runtime" } # Substrate Dependencies sp-core = { 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" } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/fuzz/storage-proof/src/main.rs b/fuzz/storage-proof/src/main.rs index 42636a65c3..3495e00999 100644 --- a/fuzz/storage-proof/src/main.rs +++ b/fuzz/storage-proof/src/main.rs @@ -31,8 +31,9 @@ fn craft_known_storage_proof(input_vec: Vec<(Vec, Vec)>) -> (H256, Stora let storage_proof_vec = vec![(None, input_vec.iter().map(|x| (x.0.clone(), Some(x.1.clone()))).collect())]; log::info!("Storage proof vec {:?}", storage_proof_vec); - let backend = >::from(storage_proof_vec); - let root = backend.storage_root(std::iter::empty()).0; + let state_version = sp_runtime::StateVersion::default(); + let backend = >::from((storage_proof_vec, state_version)); + let root = backend.storage_root(std::iter::empty(), state_version).0; let vector_element_proof = StorageProof::new( prove_read(backend, input_vec.iter().map(|x| x.0.as_slice())) .unwrap() diff --git a/modules/dispatch/src/lib.rs b/modules/dispatch/src/lib.rs index f467bab0d9..b6af8367f5 100644 --- a/modules/dispatch/src/lib.rs +++ b/modules/dispatch/src/lib.rs @@ -64,8 +64,7 @@ pub mod pallet { + MaybeSerializeDeserialize + Debug + MaybeDisplay - + Ord - + Default; + + Ord; /// Type of account public key on target chain. type TargetChainAccountPublic: Parameter + IdentifyAccount; /// Type of signature that may prove that the message has been signed by @@ -520,6 +519,7 @@ mod tests { type DbWeight = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } impl Config for TestRuntime { diff --git a/modules/grandpa/src/lib.rs b/modules/grandpa/src/lib.rs index 31b5280bb0..a8267e65eb 100644 --- a/modules/grandpa/src/lib.rs +++ b/modules/grandpa/src/lib.rs @@ -101,6 +101,7 @@ pub mod pallet { } #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(PhantomData<(T, I)>); #[pallet::hooks] diff --git a/modules/grandpa/src/mock.rs b/modules/grandpa/src/mock.rs index 37d93df779..bfc749d523 100644 --- a/modules/grandpa/src/mock.rs +++ b/modules/grandpa/src/mock.rs @@ -77,6 +77,7 @@ impl frame_system::Config for TestRuntime { type BlockLength = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/modules/messages/src/instant_payments.rs b/modules/messages/src/instant_payments.rs index c145687af9..d67b82ade8 100644 --- a/modules/messages/src/instant_payments.rs +++ b/modules/messages/src/instant_payments.rs @@ -145,7 +145,7 @@ fn pay_relayers_rewards( relayer_fund_account: &AccountId, confirmation_fee: Currency::Balance, ) where - AccountId: Debug + Default + Encode + PartialEq, + AccountId: Debug + Encode + PartialEq, Currency: CurrencyT, Currency::Balance: From, { diff --git a/modules/messages/src/lib.rs b/modules/messages/src/lib.rs index 66bfecd259..e63c4b8e94 100644 --- a/modules/messages/src/lib.rs +++ b/modules/messages/src/lib.rs @@ -209,6 +209,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] + #[pallet::without_storage_info] pub struct Pallet(PhantomData<(T, I)>); #[pallet::call] diff --git a/modules/messages/src/mock.rs b/modules/messages/src/mock.rs index a333c95bb5..ef50814722 100644 --- a/modules/messages/src/mock.rs +++ b/modules/messages/src/mock.rs @@ -125,6 +125,7 @@ impl frame_system::Config for TestRuntime { type DbWeight = DbWeight; type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/modules/shift-session-manager/src/lib.rs b/modules/shift-session-manager/src/lib.rs index 06d0b3fb0f..9cf8441257 100644 --- a/modules/shift-session-manager/src/lib.rs +++ b/modules/shift-session-manager/src/lib.rs @@ -35,6 +35,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] + #[pallet::without_storage_info] pub struct Pallet(PhantomData); #[pallet::hooks] @@ -162,6 +163,7 @@ mod tests { type DbWeight = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/modules/token-swap/src/lib.rs b/modules/token-swap/src/lib.rs index 59db89b6fd..32fd2db3c7 100644 --- a/modules/token-swap/src/lib.rs +++ b/modules/token-swap/src/lib.rs @@ -179,6 +179,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] + #[pallet::without_storage_info] pub struct Pallet(PhantomData<(T, I)>); #[pallet::hooks] diff --git a/modules/token-swap/src/mock.rs b/modules/token-swap/src/mock.rs index 2c24e282af..78b8a3381d 100644 --- a/modules/token-swap/src/mock.rs +++ b/modules/token-swap/src/mock.rs @@ -91,6 +91,7 @@ impl frame_system::Config for TestRuntime { type DbWeight = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } frame_support::parameter_types! { diff --git a/primitives/chain-kusama/src/lib.rs b/primitives/chain-kusama/src/lib.rs index 0f25ac710d..3fa3993a98 100644 --- a/primitives/chain-kusama/src/lib.rs +++ b/primitives/chain-kusama/src/lib.rs @@ -41,6 +41,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 0, apis: sp_version::create_apis_vec![[]], transaction_version: 5, + state_version: 0, }; // NOTE: This needs to be kept up to date with the Kusama runtime found in the Polkadot repo. diff --git a/primitives/chain-millau/src/lib.rs b/primitives/chain-millau/src/lib.rs index 2e671e901c..d83b4ea433 100644 --- a/primitives/chain-millau/src/lib.rs +++ b/primitives/chain-millau/src/lib.rs @@ -30,13 +30,13 @@ use frame_support::{ }; use frame_system::limits; use scale_info::TypeInfo; -use sp_core::Hasher as HasherT; +use sp_core::{storage::StateVersion, Hasher as HasherT}; use sp_runtime::{ traits::{Convert, IdentifyAccount, Verify}, MultiSignature, MultiSigner, Perbill, }; use sp_std::prelude::*; -use sp_trie::{trie_types::Layout, TrieConfiguration}; +use sp_trie::{LayoutV0, LayoutV1, TrieConfiguration}; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; @@ -206,12 +206,18 @@ impl sp_core::Hasher for BlakeTwoAndKeccak256 { impl sp_runtime::traits::Hash for BlakeTwoAndKeccak256 { type Output = MillauHash; - fn trie_root(input: Vec<(Vec, Vec)>) -> Self::Output { - Layout::::trie_root(input) + fn trie_root(input: Vec<(Vec, Vec)>, state_version: StateVersion) -> Self::Output { + match state_version { + StateVersion::V0 => LayoutV0::::trie_root(input), + StateVersion::V1 => LayoutV1::::trie_root(input), + } } - fn ordered_trie_root(input: Vec>) -> Self::Output { - Layout::::ordered_trie_root(input) + fn ordered_trie_root(input: Vec>, state_version: StateVersion) -> Self::Output { + match state_version { + StateVersion::V0 => LayoutV0::::ordered_trie_root(input), + StateVersion::V1 => LayoutV1::::ordered_trie_root(input), + } } } @@ -340,9 +346,9 @@ mod tests { #[test] fn maximal_account_size_does_not_overflow_constant() { assert!( - MAXIMAL_ENCODED_ACCOUNT_ID_SIZE as usize >= AccountId::default().encode().len(), + MAXIMAL_ENCODED_ACCOUNT_ID_SIZE as usize >= AccountId::from([0u8; 32]).encode().len(), "Actual maximal size of encoded AccountId ({}) overflows expected ({})", - AccountId::default().encode().len(), + AccountId::from([0u8; 32]).encode().len(), MAXIMAL_ENCODED_ACCOUNT_ID_SIZE, ); } diff --git a/primitives/chain-polkadot/src/lib.rs b/primitives/chain-polkadot/src/lib.rs index 19cf1a7970..31141a25dc 100644 --- a/primitives/chain-polkadot/src/lib.rs +++ b/primitives/chain-polkadot/src/lib.rs @@ -41,6 +41,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 0, apis: sp_version::create_apis_vec![[]], transaction_version: 7, + state_version: 0, }; // NOTE: This needs to be kept up to date with the Polkadot runtime found in the Polkadot repo. diff --git a/primitives/chain-rialto/src/lib.rs b/primitives/chain-rialto/src/lib.rs index c6cb1bceb8..0adb703c13 100644 --- a/primitives/chain-rialto/src/lib.rs +++ b/primitives/chain-rialto/src/lib.rs @@ -312,9 +312,9 @@ mod tests { #[test] fn maximal_account_size_does_not_overflow_constant() { assert!( - MAXIMAL_ENCODED_ACCOUNT_ID_SIZE as usize >= AccountId::default().encode().len(), + MAXIMAL_ENCODED_ACCOUNT_ID_SIZE as usize >= AccountId::from([0u8; 32]).encode().len(), "Actual maximal size of encoded AccountId ({}) overflows expected ({})", - AccountId::default().encode().len(), + AccountId::from([0u8; 32]).encode().len(), MAXIMAL_ENCODED_ACCOUNT_ID_SIZE, ); } diff --git a/primitives/chain-rococo/src/lib.rs b/primitives/chain-rococo/src/lib.rs index d485e916cf..9a7ac9da67 100644 --- a/primitives/chain-rococo/src/lib.rs +++ b/primitives/chain-rococo/src/lib.rs @@ -48,6 +48,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 0, apis: sp_version::create_apis_vec![[]], transaction_version: 0, + state_version: 0, }; // NOTE: This needs to be kept up to date with the Rococo runtime found in the Polkadot repo. diff --git a/primitives/chain-westend/src/lib.rs b/primitives/chain-westend/src/lib.rs index 68bc22c7cd..91f4a61e47 100644 --- a/primitives/chain-westend/src/lib.rs +++ b/primitives/chain-westend/src/lib.rs @@ -59,6 +59,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 0, apis: sp_version::create_apis_vec![[]], transaction_version: 5, + state_version: 0, }; /// Westend Runtime `Call` enum. diff --git a/primitives/header-chain/tests/justification.rs b/primitives/header-chain/tests/justification.rs index 85846c6d50..99117ff8aa 100644 --- a/primitives/header-chain/tests/justification.rs +++ b/primitives/header-chain/tests/justification.rs @@ -136,7 +136,7 @@ fn justification_with_invalid_commit_rejected() { #[test] fn justification_with_invalid_authority_signature_rejected() { let mut justification = make_default_justification::(&test_header(1)); - justification.commit.precommits[0].signature = Default::default(); + justification.commit.precommits[0].signature = sp_core::crypto::UncheckedFrom::unchecked_from([1u8; 64]); assert_eq!( verify_justification::( diff --git a/primitives/polkadot-core/src/lib.rs b/primitives/polkadot-core/src/lib.rs index 8be9cc17da..50e8423437 100644 --- a/primitives/polkadot-core/src/lib.rs +++ b/primitives/polkadot-core/src/lib.rs @@ -33,7 +33,8 @@ use scale_info::{StaticTypeInfo, TypeInfo}; use sp_core::Hasher as HasherT; use sp_runtime::{ generic, - traits::{BlakeTwo256, IdentifyAccount, Verify}, + traits::{BlakeTwo256, DispatchInfoOf, IdentifyAccount, Verify}, + transaction_validity::TransactionValidityError, MultiAddress, MultiSignature, OpaqueExtrinsic, }; use sp_std::prelude::Vec; @@ -332,6 +333,16 @@ where ) -> Result { Ok(self.additional_signed) } + + fn pre_dispatch( + self, + who: &Self::AccountId, + call: &Self::Call, + info: &DispatchInfoOf, + len: usize, + ) -> Result { + Ok(self.validate(who, call, info, len).map(|_| ())?) + } } /// Polkadot-like chain. @@ -399,7 +410,7 @@ mod tests { #[test] fn maximal_encoded_account_id_size_is_correct() { - let actual_size = AccountId::default().encode().len(); + let actual_size = AccountId::from([0u8; 32]).encode().len(); assert!( actual_size <= MAXIMAL_ENCODED_ACCOUNT_ID_SIZE as usize, "Actual size of encoded account id for Polkadot-like chains ({}) is larger than expected {}", diff --git a/primitives/runtime/src/chain.rs b/primitives/runtime/src/chain.rs index 9dfe6216a7..1c51d754f9 100644 --- a/primitives/runtime/src/chain.rs +++ b/primitives/runtime/src/chain.rs @@ -88,8 +88,7 @@ pub trait Chain: Send + Sync + 'static { + MaybeSerializeDeserialize + Debug + MaybeDisplay - + Ord - + Default; + + Ord; /// Balance of an account in native tokens. /// /// The chain may support multiple tokens, but this particular type is for token that is used diff --git a/primitives/runtime/src/storage_proof.rs b/primitives/runtime/src/storage_proof.rs index 9cc5b48ebd..177b0f8664 100644 --- a/primitives/runtime/src/storage_proof.rs +++ b/primitives/runtime/src/storage_proof.rs @@ -19,7 +19,7 @@ use hash_db::{HashDB, Hasher, EMPTY_PREFIX}; use sp_runtime::RuntimeDebug; use sp_std::vec::Vec; -use sp_trie::{read_trie_value, Layout, MemoryDB, StorageProof}; +use sp_trie::{read_trie_value, LayoutV1, MemoryDB, StorageProof}; /// This struct is used to read storage values from a subset of a Merklized database. The "proof" /// is a subset of the nodes in the Merkle structure of the database, so that it provides @@ -52,7 +52,8 @@ where /// Reads a value from the available subset of storage. If the value cannot be read due to an /// incomplete or otherwise invalid proof, this returns an error. pub fn read_value(&self, key: &[u8]) -> Result>, Error> { - read_trie_value::, _>(&self.db, &self.root, key) + // LayoutV1 or LayoutV0 is identical for proof that only read values. + read_trie_value::, _>(&self.db, &self.root, key) .map_err(|_| Error::StorageValueUnavailable) } } @@ -70,15 +71,20 @@ pub enum Error { pub fn craft_valid_storage_proof() -> (sp_core::H256, StorageProof) { use sp_state_machine::{backend::Backend, prove_read, InMemoryBackend}; + let state_version = sp_runtime::StateVersion::default(); + // construct storage proof - let backend = >::from(vec![ - (None, vec![(b"key1".to_vec(), Some(b"value1".to_vec()))]), - (None, vec![(b"key2".to_vec(), Some(b"value2".to_vec()))]), - (None, vec![(b"key3".to_vec(), Some(b"value3".to_vec()))]), - // Value is too big to fit in a branch node - (None, vec![(b"key11".to_vec(), Some(vec![0u8; 32]))]), - ]); - let root = backend.storage_root(std::iter::empty()).0; + let backend = >::from(( + vec![ + (None, vec![(b"key1".to_vec(), Some(b"value1".to_vec()))]), + (None, vec![(b"key2".to_vec(), Some(b"value2".to_vec()))]), + (None, vec![(b"key3".to_vec(), Some(b"value3".to_vec()))]), + // Value is too big to fit in a branch node + (None, vec![(b"key11".to_vec(), Some(vec![0u8; 32]))]), + ], + state_version, + )); + let root = backend.storage_root(std::iter::empty(), state_version).0; let proof = StorageProof::new( prove_read(backend, &[&b"key1"[..], &b"key2"[..], &b"key22"[..]]) .unwrap() diff --git a/primitives/test-utils/src/keyring.rs b/primitives/test-utils/src/keyring.rs index 059d6eb5be..2436d79339 100644 --- a/primitives/test-utils/src/keyring.rs +++ b/primitives/test-utils/src/keyring.rs @@ -19,7 +19,6 @@ use codec::Encode; use ed25519_dalek::{Keypair, PublicKey, SecretKey, Signature}; use finality_grandpa::voter_set::VoterSet; -use sp_application_crypto::Public; use sp_finality_grandpa::{AuthorityId, AuthorityList, AuthorityWeight}; use sp_runtime::RuntimeDebug; use sp_std::prelude::*; @@ -70,7 +69,7 @@ impl Account { impl From for AuthorityId { fn from(p: Account) -> Self { - AuthorityId::from_slice(&p.public().to_bytes()) + sp_application_crypto::UncheckedFrom::unchecked_from(p.public().to_bytes()) } } diff --git a/relays/lib-substrate-relay/src/messages_target.rs b/relays/lib-substrate-relay/src/messages_target.rs index f973cef897..5336e065a9 100644 --- a/relays/lib-substrate-relay/src/messages_target.rs +++ b/relays/lib-substrate-relay/src/messages_target.rs @@ -290,7 +290,7 @@ where &self.transaction_params, HeaderId(Default::default(), Default::default()), Zero::zero(), - Default::default(), + self.relayer_id_at_source.clone(), nonces.clone(), prepare_dummy_messages_proof::( nonces.clone(), @@ -332,7 +332,7 @@ where &self.transaction_params, HeaderId(Default::default(), Default::default()), Zero::zero(), - Default::default(), + self.relayer_id_at_source.clone(), nonces.clone(), prepare_dummy_messages_proof::( nonces.clone(), From 2d0e7f06e50698ffe53b70a20fe5dd76c8cf067a Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 27 Jan 2022 09:43:45 +0300 Subject: [PATCH 2/9] fix test --- modules/dispatch/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/dispatch/src/lib.rs b/modules/dispatch/src/lib.rs index b6af8367f5..1e030b7332 100644 --- a/modules/dispatch/src/lib.rs +++ b/modules/dispatch/src/lib.rs @@ -649,11 +649,11 @@ mod tests { fn should_fail_on_weight_mismatch() { new_test_ext().execute_with(|| { let id = [0; 4]; - let call = Call::System(frame_system::Call::remark { remark: vec![1, 2, 3] }); + let call = Call::System(frame_system::Call::set_heap_pages { pages: 42 }); let call_weight = call.get_dispatch_info().weight; let mut message = prepare_root_message(call); message.weight = 7; - assert!(call_weight != 7, "needed for test to actually trigger a weight mismatch"); + assert!(call_weight > 7, "needed for test to actually trigger a weight mismatch"); System::set_block_number(1); let result = Dispatch::dispatch( From 8b6465386755ead39f8e61a5869f0a35a412ee77 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 27 Jan 2022 10:05:49 +0300 Subject: [PATCH 3/9] fix tests --- bin/rialto/runtime/src/millau_messages.rs | 2 +- modules/messages/src/lib.rs | 2 ++ relays/bin-substrate/src/cli/encode_call.rs | 2 +- relays/bin-substrate/src/cli/encode_message.rs | 2 +- relays/bin-substrate/src/cli/send_message.rs | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/rialto/runtime/src/millau_messages.rs b/bin/rialto/runtime/src/millau_messages.rs index 05935c90ea..22d11c68be 100644 --- a/bin/rialto/runtime/src/millau_messages.rs +++ b/bin/rialto/runtime/src/millau_messages.rs @@ -316,7 +316,7 @@ mod tests { SystemConfig::default().build_storage::().unwrap().into(); ext.execute_with(|| { let bridge = MILLAU_CHAIN_ID; - let call: Call = SystemCall::remark { remark: vec![] }.into(); + let call: Call = SystemCall::set_heap_pages { pages: 64 }.into(); let dispatch_weight = call.get_dispatch_info().weight; let dispatch_fee = ::WeightToFee::calc( &dispatch_weight, diff --git a/modules/messages/src/lib.rs b/modules/messages/src/lib.rs index e63c4b8e94..f37dc88481 100644 --- a/modules/messages/src/lib.rs +++ b/modules/messages/src/lib.rs @@ -2117,6 +2117,7 @@ mod tests { #[test] #[should_panic] + #[cfg(debug_assertions)] fn receive_messages_panics_in_debug_mode_if_callback_is_wrong() { run_test(|| { TestOnDeliveryConfirmed1::set_consumed_weight_per_message( @@ -2249,6 +2250,7 @@ mod tests { #[test] #[should_panic] + #[cfg(debug_assertions)] fn message_accepted_panics_in_debug_mode_if_callback_is_wrong() { run_test(|| { TestOnMessageAccepted::set_consumed_weight_per_message( diff --git a/relays/bin-substrate/src/cli/encode_call.rs b/relays/bin-substrate/src/cli/encode_call.rs index b409cf383e..707e783783 100644 --- a/relays/bin-substrate/src/cli/encode_call.rs +++ b/relays/bin-substrate/src/cli/encode_call.rs @@ -343,7 +343,7 @@ mod tests { // then assert!(format!("{:?}", call_hex).starts_with( - "0x0f030000000001000000381409000000000001d43593c715fdd31c61141abd04a99fd6822c8558854cc\ + "0x0f030000000001000000000000000000000001d43593c715fdd31c61141abd04a99fd6822c8558854cc\ de39a5684e7a56da27d01d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d01" )) } diff --git a/relays/bin-substrate/src/cli/encode_message.rs b/relays/bin-substrate/src/cli/encode_message.rs index 98e1269aa6..ee77fc4a46 100644 --- a/relays/bin-substrate/src/cli/encode_message.rs +++ b/relays/bin-substrate/src/cli/encode_message.rs @@ -106,6 +106,6 @@ mod tests { let hex = encode_message.encode().unwrap(); // then - assert_eq!(format!("{:?}", hex), "0x0100000010f108000000000002d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d003c000130000000000000000000000000"); + assert_eq!(format!("{:?}", hex), "0x01000000000000000000000002d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d003c000130000000000000000000000000"); } } diff --git a/relays/bin-substrate/src/cli/send_message.rs b/relays/bin-substrate/src/cli/send_message.rs index 2d81576de3..e3597f766b 100644 --- a/relays/bin-substrate/src/cli/send_message.rs +++ b/relays/bin-substrate/src/cli/send_message.rs @@ -324,7 +324,7 @@ mod tests { payload, MessagePayload { spec_version: relay_millau_client::Millau::RUNTIME_VERSION.spec_version, - weight: 576000, + weight: 0, origin: CallOrigin::SourceAccount( sp_keyring::AccountKeyring::Alice.to_account_id() ), @@ -366,7 +366,7 @@ mod tests { payload, MessagePayload { spec_version: relay_millau_client::Millau::RUNTIME_VERSION.spec_version, - weight: 576000, + weight: 0, origin: CallOrigin::TargetAccount( sp_keyring::AccountKeyring::Alice.to_account_id(), sp_keyring::AccountKeyring::Bob.into(), From e160d18268978284c88f60dacb2347d937afae38 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 27 Jan 2022 10:33:07 +0300 Subject: [PATCH 4/9] fix Polkadot ref again --- Cargo.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d9f19f73e2..dd2d81982f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4762,7 +4762,7 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "derive_more", "futures 0.3.19", @@ -6695,7 +6695,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -7048,7 +7048,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "async-std", "lazy_static", @@ -7066,7 +7066,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "bs58", "futures 0.3.19", @@ -7085,7 +7085,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "async-trait", "derive_more", @@ -7103,7 +7103,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "bounded-vec", "futures 0.3.19", @@ -7125,7 +7125,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7135,7 +7135,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "derive_more", "futures 0.3.19", @@ -7182,7 +7182,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "futures 0.3.19", "futures-timer", @@ -7203,7 +7203,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "async-trait", "futures 0.3.19", @@ -7220,7 +7220,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -7231,7 +7231,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "derive_more", "frame-support", @@ -7263,7 +7263,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "bitvec", "frame-system", @@ -7630,7 +7630,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -12618,7 +12618,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -12651,7 +12651,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -12668,7 +12668,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#102bc8c618ce297a03dfe5b1634fe068c892b210" +source = "git+https://github.com/paritytech/polkadot?branch=master#60df3c55c711c2872872d6220f98b2611340e051" dependencies = [ "Inflector", "proc-macro2", From bb564bba3f87f0281109db46bccc65816fb52290 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 27 Jan 2022 11:12:28 +0300 Subject: [PATCH 5/9] sync HostConfiguration with polkadot service --- bin/rialto/node/src/chain_spec.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/bin/rialto/node/src/chain_spec.rs b/bin/rialto/node/src/chain_spec.rs index 49ccd309d6..6bfacba83a 100644 --- a/bin/rialto/node/src/chain_spec.rs +++ b/bin/rialto/node/src/chain_spec.rs @@ -251,7 +251,7 @@ fn testnet_genesis( configuration: ConfigurationConfig { config: polkadot_runtime_parachains::configuration::HostConfiguration { validation_upgrade_cooldown: 2u32, - validation_upgrade_delay: 1, + validation_upgrade_delay: 2, code_retention_period: 1200, max_code_size: polkadot_primitives::v1::MAX_CODE_SIZE, max_pov_size: polkadot_primitives::v1::MAX_POV_SIZE, @@ -261,13 +261,8 @@ fn testnet_genesis( thread_availability_period: 4, max_upward_queue_count: 8, max_upward_queue_size: 1024 * 1024, - max_downward_message_size: 1024, - // this is approximatelly 4ms. - // - // Same as `4 * frame_support::weights::WEIGHT_PER_MILLIS`. We don't bother with - // an import since that's a made up number and should be replaced with a constant - // obtained by benchmarking anyway. - ump_service_total_weight: 4 * 1_000_000_000, + max_downward_message_size: 1024 * 1024, + ump_service_total_weight: 100_000_000_000, max_upward_message_size: 1024 * 1024, max_upward_message_num_per_candidate: 5, hrmp_sender_deposit: 0, @@ -286,6 +281,7 @@ fn testnet_genesis( needed_approvals: 2, relay_vrf_modulo_samples: 2, zeroth_delay_tranche_width: 0, + minimum_validation_upgrade_delay: 5, ..Default::default() }, }, From 3183f2d4db1e0f04e7541acebf6393fbc03367bb Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 27 Jan 2022 12:07:56 +0300 Subject: [PATCH 6/9] fixed benchmarks --- bin/millau/runtime/src/lib.rs | 2 +- .../src/messages_benchmarking.rs | 18 ++++++------- modules/token-swap/src/benchmarking.rs | 26 ++++++++++--------- scripts/update-weights.sh | 6 ----- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/bin/millau/runtime/src/lib.rs b/bin/millau/runtime/src/lib.rs index 77049f8958..e0c3903621 100644 --- a/bin/millau/runtime/src/lib.rs +++ b/bin/millau/runtime/src/lib.rs @@ -843,7 +843,7 @@ impl_runtime_apis! { } fn bridged_relayer_id() -> Self::InboundRelayer { - Default::default() + [0u8; 32].into() } fn account_balance(account: &Self::AccountId) -> Self::OutboundMessageFee { diff --git a/bin/runtime-common/src/messages_benchmarking.rs b/bin/runtime-common/src/messages_benchmarking.rs index 1b14ee30ae..12c270d866 100644 --- a/bin/runtime-common/src/messages_benchmarking.rs +++ b/bin/runtime-common/src/messages_benchmarking.rs @@ -40,7 +40,7 @@ use pallet_bridge_messages::benchmarking::{ use sp_core::Hasher; use sp_runtime::traits::{Header, IdentifyAccount, MaybeSerializeDeserialize, Zero}; use sp_std::{fmt::Debug, prelude::*}; -use sp_trie::{record_all_keys, trie_types::TrieDBMut, Layout, MemoryDB, Recorder, TrieMut}; +use sp_trie::{record_all_keys, trie_types::TrieDBMutV1, LayoutV1, MemoryDB, Recorder, TrieMut}; use sp_version::RuntimeVersion; /// Prepare outbound message for the `send_message` call. @@ -177,7 +177,7 @@ where let mut root = Default::default(); let mut mdb = MemoryDB::default(); { - let mut trie = TrieDBMut::::new(&mut mdb, &mut root); + let mut trie = TrieDBMutV1::::new(&mut mdb, &mut root); trie.insert(&storage_key, ¶ms.inbound_lane_data.encode()) .map_err(|_| "TrieMut::insert has failed") .expect("TrieMut::insert should not fail in benchmarks"); @@ -186,7 +186,7 @@ where // generate storage proof to be delivered to This chain let mut proof_recorder = Recorder::::new(); - record_all_keys::, _>(&mdb, &root, &mut proof_recorder) + record_all_keys::, _>(&mdb, &root, &mut proof_recorder) .map_err(|_| "record_all_keys has failed") .expect("record_all_keys should not fail in benchmarks"); let storage_proof = proof_recorder.drain().into_iter().map(|n| n.data.to_vec()).collect(); @@ -220,7 +220,7 @@ where let mut root = Default::default(); let mut mdb = MemoryDB::default(); { - let mut trie = TrieDBMut::::new(&mut mdb, &mut root); + let mut trie = TrieDBMutV1::::new(&mut mdb, &mut root); // insert messages for nonce in params.message_nonces.clone() { @@ -256,7 +256,7 @@ where // generate storage proof to be delivered to This chain let mut proof_recorder = Recorder::::new(); - record_all_keys::, _>(&mdb, &root, &mut proof_recorder) + record_all_keys::, _>(&mdb, &root, &mut proof_recorder) .map_err(|_| "record_all_keys has failed") .expect("record_all_keys should not fail in benchmarks"); let storage_proof = proof_recorder.drain().into_iter().map(|n| n.data.to_vec()).collect(); @@ -339,7 +339,7 @@ fn grow_trie(mut root: H::Out, mdb: &mut MemoryDB, trie_size: Proo loop { // generate storage proof to be delivered to This chain let mut proof_recorder = Recorder::::new(); - record_all_keys::, _>(mdb, &root, &mut proof_recorder) + record_all_keys::, _>(mdb, &root, &mut proof_recorder) .map_err(|_| "record_all_keys has failed") .expect("record_all_keys should not fail in benchmarks"); let size: usize = proof_recorder.drain().into_iter().map(|n| n.data.len()).sum(); @@ -347,9 +347,9 @@ fn grow_trie(mut root: H::Out, mdb: &mut MemoryDB, trie_size: Proo return root } - let mut trie = TrieDBMut::::from_existing(mdb, &mut root) - .map_err(|_| "TrieDBMut::from_existing has failed") - .expect("TrieDBMut::from_existing should not fail in benchmarks"); + let mut trie = TrieDBMutV1::::from_existing(mdb, &mut root) + .map_err(|_| "TrieDBMutV1::from_existing has failed") + .expect("TrieDBMutV1::from_existing should not fail in benchmarks"); for _ in 0..iterations { trie.insert(&key_index.encode(), &vec![42u8; leaf_size as _]) .map_err(|_| "TrieMut::insert has failed") diff --git a/modules/token-swap/src/benchmarking.rs b/modules/token-swap/src/benchmarking.rs index 6ca35f5f39..baea9bc937 100644 --- a/modules/token-swap/src/benchmarking.rs +++ b/modules/token-swap/src/benchmarking.rs @@ -23,13 +23,13 @@ use crate::{ }; use bp_token_swap::{TokenSwap, TokenSwapCreation, TokenSwapState, TokenSwapType}; -use codec::Encode; +use codec::{Decode, Encode}; use frame_benchmarking::{account, benchmarks_instance_pallet}; use frame_support::{traits::Currency, Parameter}; use frame_system::RawOrigin; use sp_core::H256; use sp_io::hashing::blake2_256; -use sp_runtime::traits::Bounded; +use sp_runtime::traits::{Bounded, TrailingZeroInput}; use sp_std::{boxed::Box, vec::Vec}; const SEED: u32 = 0; @@ -43,8 +43,8 @@ pub trait Config: crate::Config { benchmarks_instance_pallet! { where_clause { where - BridgedAccountPublicOf: Default + Parameter, - BridgedAccountSignatureOf: Default, + BridgedAccountPublicOf: Decode + Parameter, + BridgedAccountSignatureOf: Decode, } // @@ -137,9 +137,9 @@ fn test_swap_hash, I: 'static>(sender: T::AccountId, is_create: boo /// Returns test token swap creation params. fn test_swap_creation, I: 'static>() -> TokenSwapCreationOf -where - BridgedAccountPublicOf: Default, - BridgedAccountSignatureOf: Default, + where + BridgedAccountPublicOf: Decode, + BridgedAccountSignatureOf: Decode, { TokenSwapCreation { target_public_at_bridged_chain: target_public_at_bridged_chain::(), @@ -176,20 +176,22 @@ fn target_balance_to_swap, I: 'static>() -> BridgedBalanceOf /// Public key of `target_account_at_bridged_chain`. fn target_public_at_bridged_chain, I: 'static>() -> BridgedAccountPublicOf where - BridgedAccountPublicOf: Default, + BridgedAccountPublicOf: Decode, { - Default::default() + BridgedAccountPublicOf::::decode(&mut TrailingZeroInput::zeroes()) + .expect("failed to decode `BridgedAccountPublicOf` from zeroes") } /// Signature of `target_account_at_bridged_chain` over message. fn bridged_currency_transfer_signature, I: 'static>() -> BridgedAccountSignatureOf where - BridgedAccountSignatureOf: Default, + BridgedAccountSignatureOf: Decode, { - Default::default() + BridgedAccountSignatureOf::::decode(&mut TrailingZeroInput::zeroes()) + .expect("failed to decode `BridgedAccountSignatureOf` from zeroes") } /// Account at the bridged chain that is participating in the swap. fn target_account_at_bridged_chain, I: 'static>() -> BridgedAccountIdOf { - Default::default() + account("target_account_at_bridged_chain", 0, SEED) } diff --git a/scripts/update-weights.sh b/scripts/update-weights.sh index b772386e75..79e786cfa2 100755 --- a/scripts/update-weights.sh +++ b/scripts/update-weights.sh @@ -8,8 +8,6 @@ set -eux time cargo run --release -p millau-bridge-node --features=runtime-benchmarks -- benchmark \ --chain=dev \ - --steps=50 \ - --repeat=20 \ --pallet=pallet_bridge_messages \ --extrinsic=* \ --execution=wasm \ @@ -20,8 +18,6 @@ time cargo run --release -p millau-bridge-node --features=runtime-benchmarks -- time cargo run --release -p millau-bridge-node --features=runtime-benchmarks -- benchmark \ --chain=dev \ - --steps=50 \ - --repeat=20 \ --pallet=pallet_bridge_grandpa \ --extrinsic=* \ --execution=wasm \ @@ -32,8 +28,6 @@ time cargo run --release -p millau-bridge-node --features=runtime-benchmarks -- time cargo run --release -p millau-bridge-node --features=runtime-benchmarks -- benchmark \ --chain=dev \ - --steps=50 \ - --repeat=20 \ --pallet=pallet_bridge_token_swap \ --extrinsic=* \ --execution=wasm \ From 3e249b038f835487b322262bfd8fe6cb83c1cc21 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 27 Jan 2022 12:09:37 +0300 Subject: [PATCH 7/9] cargo fmt --- bin/millau/node/src/service.rs | 23 +++++-- bin/rialto-parachain/node/src/command.rs | 9 ++- bin/rialto-parachain/node/src/service.rs | 66 +++++++++---------- bin/rialto/runtime/src/parachains.rs | 5 +- modules/token-swap/src/benchmarking.rs | 2 +- .../header-chain/tests/justification.rs | 3 +- primitives/runtime/src/chain.rs | 7 +- 7 files changed, 61 insertions(+), 54 deletions(-) diff --git a/bin/millau/node/src/service.rs b/bin/millau/node/src/service.rs index 6ec6b74e9e..db64af878f 100644 --- a/bin/millau/node/src/service.rs +++ b/bin/millau/node/src/service.rs @@ -218,13 +218,19 @@ pub fn new_full(mut config: Configuration) -> Result &client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"), &config.chain_spec, ); - config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone())); + config + .network + .extra_sets + .push(sc_finality_grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone())); let beefy_protocol_name = beefy_gadget::protocol_standard_name( &client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"), &config.chain_spec, ); - config.network.extra_sets.push(beefy_gadget::beefy_peers_set_config(beefy_protocol_name.clone())); + config + .network + .extra_sets + .push(beefy_gadget::beefy_peers_set_config(beefy_protocol_name.clone())); let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new( backend.clone(), @@ -302,11 +308,14 @@ pub fn new_full(mut config: Configuration) -> Result subscription_executor.clone(), finality_proof_provider.clone(), ))); - io.extend_with(beefy_gadget_rpc::BeefyApi::to_delegate(beefy_gadget_rpc::BeefyRpcHandler::::new( - beefy_commitment_stream.clone(), - beefy_best_block_stream.clone(), - subscription_executor, - ).map_err(|e| sc_service::Error::Other(format!("{}", e)))?)); + io.extend_with(beefy_gadget_rpc::BeefyApi::to_delegate( + beefy_gadget_rpc::BeefyRpcHandler::::new( + beefy_commitment_stream.clone(), + beefy_best_block_stream.clone(), + subscription_executor, + ) + .map_err(|e| sc_service::Error::Other(format!("{}", e)))?, + )); io.extend_with(pallet_mmr_rpc::MmrApi::to_delegate(pallet_mmr_rpc::Mmr::new( client.clone(), ))); diff --git a/bin/rialto-parachain/node/src/command.rs b/bin/rialto-parachain/node/src/command.rs index efb4d5b412..9a69042a80 100644 --- a/bin/rialto-parachain/node/src/command.rs +++ b/bin/rialto-parachain/node/src/command.rs @@ -211,7 +211,10 @@ pub fn run() -> Result<()> { builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); let _ = builder.init(); - let spec = load_spec(¶ms.chain.clone().unwrap_or_default(), params.parachain_id.expect("Missing ParaId").into(),)?; + let spec = load_spec( + ¶ms.chain.clone().unwrap_or_default(), + params.parachain_id.expect("Missing ParaId").into(), + )?; let state_version = Cli::native_runtime_version(&spec).state_version(); let block: Block = generate_genesis_block(&spec, state_version)?; let raw_header = block.header().encode(); @@ -279,8 +282,8 @@ pub fn run() -> Result<()> { let state_version = RelayChainCli::native_runtime_version(&config.chain_spec).state_version(); - let block: Block = - generate_genesis_block(&config.chain_spec, state_version).map_err(|e| format!("{:?}", e))?; + let block: Block = generate_genesis_block(&config.chain_spec, state_version) + .map_err(|e| format!("{:?}", e))?; let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); let polkadot_config = SubstrateCli::create_configuration( diff --git a/bin/rialto-parachain/node/src/service.rs b/bin/rialto-parachain/node/src/service.rs index c3098c06c8..61f705086e 100644 --- a/bin/rialto-parachain/node/src/service.rs +++ b/bin/rialto-parachain/node/src/service.rs @@ -28,15 +28,12 @@ use std::{sync::Arc, time::Duration}; use rialto_parachain_runtime::RuntimeApi; // Cumulus Imports -use cumulus_client_consensus_aura::{ - BuildAuraConsensusParams, SlotProportion, -}; +use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; use cumulus_client_consensus_common::ParachainConsensus; use cumulus_client_network::BlockAnnounceValidator; use cumulus_client_service::{ prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; -use cumulus_client_consensus_aura::AuraConsensus; use cumulus_primitives_core::ParaId; use cumulus_relay_chain_interface::RelayChainInterface; use cumulus_relay_chain_local::build_relay_chain_interface; @@ -282,10 +279,7 @@ where let client = params.client.clone(); let backend = params.backend.clone(); - let block_announce_validator = BlockAnnounceValidator::new( - relay_chain_interface.clone(), - id, - ); + let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id); let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); @@ -472,45 +466,47 @@ pub async fn start_node( telemetry.clone(), ); - Ok(AuraConsensus::build::(BuildAuraConsensusParams { - proposer_factory, - create_inherent_data_providers: move |_, (relay_parent, validation_data)| { - let relay_chain_interface = relay_chain_interface.clone(); - async move { - let parachain_inherent = + Ok(AuraConsensus::build::( + BuildAuraConsensusParams { + proposer_factory, + create_inherent_data_providers: move |_, (relay_parent, validation_data)| { + let relay_chain_interface = relay_chain_interface.clone(); + async move { + let parachain_inherent = cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( relay_parent, &relay_chain_interface, &validation_data, id, ).await; - let time = sp_timestamp::InherentDataProvider::from_system_time(); + let time = sp_timestamp::InherentDataProvider::from_system_time(); - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( *time, slot_duration.slot_duration(), ); - let parachain_inherent = parachain_inherent.ok_or_else(|| { - Box::::from( - "Failed to create parachain inherent", - ) - })?; - Ok((time, slot, parachain_inherent)) - } + let parachain_inherent = parachain_inherent.ok_or_else(|| { + Box::::from( + "Failed to create parachain inherent", + ) + })?; + Ok((time, slot, parachain_inherent)) + } + }, + block_import: client.clone(), + para_client: client, + backoff_authoring_blocks: Option::<()>::None, + sync_oracle, + keystore, + force_authoring, + slot_duration, + // We got around 500ms for proposing + block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), + telemetry, + max_block_proposal_slot_portion: None, }, - block_import: client.clone(), - para_client: client, - backoff_authoring_blocks: Option::<()>::None, - sync_oracle, - keystore, - force_authoring, - slot_duration, - // We got around 500ms for proposing - block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), - telemetry, - max_block_proposal_slot_portion: None, - })) + )) }, ) .await diff --git a/bin/rialto/runtime/src/parachains.rs b/bin/rialto/runtime/src/parachains.rs index 6f3603056d..9a316ef0e2 100644 --- a/bin/rialto/runtime/src/parachains.rs +++ b/bin/rialto/runtime/src/parachains.rs @@ -16,7 +16,10 @@ //! Parachains support in Rialto runtime. -use crate::{AccountId, Babe, Balance, Balances, BlockNumber, Call, Event, Origin, Registrar, Runtime, Slots, UncheckedExtrinsic}; +use crate::{ + AccountId, Babe, Balance, Balances, BlockNumber, Call, Event, Origin, Registrar, Runtime, + Slots, UncheckedExtrinsic, +}; use frame_support::{parameter_types, weights::Weight}; use frame_system::EnsureRoot; diff --git a/modules/token-swap/src/benchmarking.rs b/modules/token-swap/src/benchmarking.rs index baea9bc937..c68fb6b642 100644 --- a/modules/token-swap/src/benchmarking.rs +++ b/modules/token-swap/src/benchmarking.rs @@ -137,7 +137,7 @@ fn test_swap_hash, I: 'static>(sender: T::AccountId, is_create: boo /// Returns test token swap creation params. fn test_swap_creation, I: 'static>() -> TokenSwapCreationOf - where +where BridgedAccountPublicOf: Decode, BridgedAccountSignatureOf: Decode, { diff --git a/primitives/header-chain/tests/justification.rs b/primitives/header-chain/tests/justification.rs index 99117ff8aa..5b4981a0f6 100644 --- a/primitives/header-chain/tests/justification.rs +++ b/primitives/header-chain/tests/justification.rs @@ -136,7 +136,8 @@ fn justification_with_invalid_commit_rejected() { #[test] fn justification_with_invalid_authority_signature_rejected() { let mut justification = make_default_justification::(&test_header(1)); - justification.commit.precommits[0].signature = sp_core::crypto::UncheckedFrom::unchecked_from([1u8; 64]); + justification.commit.precommits[0].signature = + sp_core::crypto::UncheckedFrom::unchecked_from([1u8; 64]); assert_eq!( verify_justification::( diff --git a/primitives/runtime/src/chain.rs b/primitives/runtime/src/chain.rs index 1c51d754f9..30e754b570 100644 --- a/primitives/runtime/src/chain.rs +++ b/primitives/runtime/src/chain.rs @@ -83,12 +83,7 @@ pub trait Chain: Send + Sync + 'static { + MaybeSerializeDeserialize; /// The user account identifier type for the runtime. - type AccountId: Parameter - + Member - + MaybeSerializeDeserialize - + Debug - + MaybeDisplay - + Ord; + type AccountId: Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + Ord; /// Balance of an account in native tokens. /// /// The chain may support multiple tokens, but this particular type is for token that is used From 277131207ca9517b745a3999ff80a6b28e2de72b Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 27 Jan 2022 12:24:06 +0300 Subject: [PATCH 8/9] remove obsolete deps --- Cargo.lock | 3 --- bin/millau/node/Cargo.toml | 1 - bin/rialto-parachain/node/Cargo.toml | 1 - bin/rialto/node/Cargo.toml | 1 - 4 files changed, 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dd2d81982f..30279bd978 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4820,7 +4820,6 @@ dependencies = [ "sp-finality-grandpa", "sp-runtime", "sp-timestamp", - "structopt", "substrate-build-script-utils", "substrate-frame-rpc-system", ] @@ -8561,7 +8560,6 @@ dependencies = [ "sp-session", "sp-timestamp", "sp-transaction-pool", - "structopt", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", @@ -8625,7 +8623,6 @@ dependencies = [ "sp-session", "sp-timestamp", "sp-transaction-pool", - "structopt", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", diff --git a/bin/millau/node/Cargo.toml b/bin/millau/node/Cargo.toml index 2edfa612d6..12a10ad6c2 100644 --- a/bin/millau/node/Cargo.toml +++ b/bin/millau/node/Cargo.toml @@ -12,7 +12,6 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] clap = { version = "3.0", features = ["derive"] } jsonrpc-core = "18.0" -structopt = "0.3.21" serde_json = "1.0.59" # Bridge dependencies diff --git a/bin/rialto-parachain/node/Cargo.toml b/bin/rialto-parachain/node/Cargo.toml index 3e1cac7887..975d551b88 100644 --- a/bin/rialto-parachain/node/Cargo.toml +++ b/bin/rialto-parachain/node/Cargo.toml @@ -22,7 +22,6 @@ clap = { version = "3.0", features = ["derive"] } derive_more = '0.99.2' log = '0.4.14' codec = { package = 'parity-scale-codec', version = '2.0.0' } -structopt = '0.3.8' serde = { version = '1.0', features = ['derive'] } hex-literal = '0.3.1' diff --git a/bin/rialto/node/Cargo.toml b/bin/rialto/node/Cargo.toml index b688527380..6c7bce4d4e 100644 --- a/bin/rialto/node/Cargo.toml +++ b/bin/rialto/node/Cargo.toml @@ -16,7 +16,6 @@ jsonrpc-core = "18.0" kvdb = "0.10" kvdb-rocksdb = "0.12" lru = "0.7" -structopt = "0.3.21" serde_json = "1.0.59" thiserror = "1.0" From ef90758b61a37fcf6acba4a4bb07e6a8fbe06b73 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 27 Jan 2022 12:26:26 +0300 Subject: [PATCH 9/9] revert test changes --- scripts/update-weights.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/update-weights.sh b/scripts/update-weights.sh index 79e786cfa2..b772386e75 100755 --- a/scripts/update-weights.sh +++ b/scripts/update-weights.sh @@ -8,6 +8,8 @@ set -eux time cargo run --release -p millau-bridge-node --features=runtime-benchmarks -- benchmark \ --chain=dev \ + --steps=50 \ + --repeat=20 \ --pallet=pallet_bridge_messages \ --extrinsic=* \ --execution=wasm \ @@ -18,6 +20,8 @@ time cargo run --release -p millau-bridge-node --features=runtime-benchmarks -- time cargo run --release -p millau-bridge-node --features=runtime-benchmarks -- benchmark \ --chain=dev \ + --steps=50 \ + --repeat=20 \ --pallet=pallet_bridge_grandpa \ --extrinsic=* \ --execution=wasm \ @@ -28,6 +32,8 @@ time cargo run --release -p millau-bridge-node --features=runtime-benchmarks -- time cargo run --release -p millau-bridge-node --features=runtime-benchmarks -- benchmark \ --chain=dev \ + --steps=50 \ + --repeat=20 \ --pallet=pallet_bridge_token_swap \ --extrinsic=* \ --execution=wasm \