From 96304bf92125d4acd50edc63bbadce6a48605812 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Sat, 28 May 2022 00:09:01 -0400 Subject: [PATCH 1/4] Update to 0.9.22 and fmt, still weird error persists with rpc --- Cargo.lock | 4149 +++++++++-------- README.md | 2 +- node/Cargo.toml | 98 +- node/src/chain_spec.rs | 1 + node/src/lib.rs | 1 + node/src/main.rs | 1 + node/src/rpc.rs | 58 + node/src/service.rs | 209 +- polkadot-launch/README.md | 2 +- runtime/Cargo.toml | 104 +- runtime/src/impls.rs | 34 + runtime/src/lib.rs | 161 +- runtime/src/protocol_substrate_config.rs | 27 +- runtime/src/xcm_config.rs | 39 + scripts/polkadot-launch/README.md | 2 +- standalone/node/Cargo.toml | 99 +- standalone/node/src/chain_spec.rs | 1 + standalone/node/src/rpc.rs | 89 +- standalone/runtime/Cargo.toml | 134 +- standalone/runtime/src/impls.rs | 34 + standalone/runtime/src/lib.rs | 604 +-- .../runtime/src/protocol_substrate_config.rs | 27 +- 22 files changed, 3155 insertions(+), 2721 deletions(-) create mode 100644 node/src/rpc.rs create mode 100644 runtime/src/impls.rs create mode 100644 standalone/runtime/src/impls.rs diff --git a/Cargo.lock b/Cargo.lock index 1eefd0334..a57227ece 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,7 +44,7 @@ checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures 0.2.2", + "cpufeatures", "opaque-debug 0.3.0", ] @@ -94,7 +94,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -160,7 +160,7 @@ dependencies = [ "ark-serialize", "ark-snark", "ark-std", - "blake2", + "blake2 0.9.2", "derivative", "digest 0.9.0", "tracing", @@ -394,7 +394,7 @@ dependencies = [ "arkworks-r1cs-circuits", "arkworks-r1cs-gadgets", "arkworks-utils", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "tiny-keccak", ] @@ -501,9 +501,9 @@ dependencies = [ [[package]] name = "async-io" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" +checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07" dependencies = [ "concurrent-queue", "futures-lite", @@ -513,9 +513,9 @@ dependencies = [ "parking", "polling", "slab", - "socket2 0.4.4", + "socket2", "waker-fn", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -550,7 +550,7 @@ dependencies = [ "libc", "once_cell", "signal-hook", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -584,15 +584,16 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.20.4" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf3e776afdf3a2477ef4854b85ba0dff3bd85792f685fb3c68948b4d304e4f0" +checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8" dependencies = [ "async-std", "async-trait", "futures-io", "futures-util", "pin-utils", + "socket2", "trust-dns-resolver", ] @@ -634,26 +635,13 @@ dependencies = [ "syn", ] -[[package]] -name = "asynchronous-codec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4401f0a3622dad2e0763fa79e0eb328bc70fb7dccfdd645341f00d671247d6" -dependencies = [ - "bytes 1.1.0", - "futures-sink", - "futures-util", - "memchr", - "pin-project-lite 0.2.9", -] - [[package]] name = "asynchronous-codec" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-sink", "futures-util", "memchr", @@ -683,7 +671,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -748,9 +736,9 @@ checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179" [[package]] name = "beef" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" dependencies = [ "serde", ] @@ -758,16 +746,19 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "beefy-primitives", "fnv", "futures 0.3.21", + "futures-timer", + "hex", "log", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "sc-chain-spec", "sc-client-api", + "sc-finality-grandpa", "sc-keystore", "sc-network", "sc-network-gossip", @@ -776,8 +767,10 @@ dependencies = [ "sp-application-crypto", "sp-arithmetic", "sp-blockchain", + "sp-consensus", "sp-core", "sp-keystore", + "sp-mmr-primitives", "sp-runtime", "substrate-prometheus-endpoint", "thiserror", @@ -787,18 +780,15 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "beefy-gadget", "beefy-primitives", "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", + "jsonrpsee", "log", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "sc-rpc", "sc-utils", "serde", @@ -810,15 +800,15 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-core", @@ -874,9 +864,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "0.20.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ "funty", "radium", @@ -895,6 +885,15 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "blake2" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "blake2-rfc" version = "0.2.18" @@ -916,30 +915,40 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake2b_simd" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" +dependencies = [ + "arrayref", + "arrayvec 0.7.2", + "constant_time_eq", +] + [[package]] name = "blake2s_simd" -version = "0.5.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" +checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.2", "constant_time_eq", ] [[package]] name = "blake3" -version = "0.3.8" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.2", "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "constant_time_eq", - "crypto-mac 0.8.0", - "digest 0.9.0", + "digest 0.10.3", ] [[package]] @@ -1004,9 +1013,9 @@ dependencies = [ [[package]] name = "bounded-vec" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47cca82fca99417fe405f09d93bb8fff90bdd03d13c631f18096ee123b4281c" +checksum = "3372be4090bf9d4da36bd8ba7ce6ca1669503d0cf6e667236c6df7f053153eb6" dependencies = [ "thiserror", ] @@ -1014,12 +1023,13 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ + "bp-runtime", "finality-grandpa", "frame-support", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-finality-grandpa", @@ -1030,42 +1040,43 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bp-runtime", "frame-support", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-std", ] [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bitvec", "bp-runtime", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", + "sp-core", "sp-std", ] [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bp-messages", "bp-runtime", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -1076,13 +1087,13 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bp-messages", "bp-polkadot-core", "bp-runtime", "frame-support", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "smallvec", "sp-api", "sp-runtime", @@ -1093,13 +1104,13 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -1111,12 +1122,12 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bp-header-chain", "ed25519-dalek", "finality-grandpa", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -1126,13 +1137,13 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bp-messages", "bp-polkadot-core", "bp-rococo", "bp-runtime", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-api", "sp-runtime", "sp-std", @@ -1141,19 +1152,21 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bp-message-dispatch", "bp-messages", "bp-runtime", "frame-support", + "frame-system", "hash-db", "pallet-bridge-dispatch", "pallet-bridge-grandpa", "pallet-bridge-messages", "pallet-transaction-payment", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", + "sp-api", "sp-core", "sp-runtime", "sp-state-machine", @@ -1173,7 +1186,10 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ + "lazy_static", "memchr", + "regex-automata", + "serde", ] [[package]] @@ -1225,19 +1241,20 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "0.4.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] -name = "bytes" -version = "1.1.0" +name = "bzip2-sys" +version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] [[package]] name = "cache-padded" @@ -1327,18 +1344,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" -[[package]] -name = "chacha20" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures 0.1.5", - "zeroize", -] - [[package]] name = "chacha20" version = "0.8.1" @@ -1347,20 +1352,7 @@ checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures 0.2.2", - "zeroize", -] - -[[package]] -name = "chacha20poly1305" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5" -dependencies = [ - "aead", - "chacha20 0.7.1", - "cipher", - "poly1305", + "cpufeatures", "zeroize", ] @@ -1371,7 +1363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a" dependencies = [ "aead", - "chacha20 0.8.1", + "chacha20", "cipher", "poly1305", "zeroize", @@ -1387,18 +1379,20 @@ dependencies = [ "num-integer", "num-traits", "time", - "winapi 0.3.9", + "winapi", ] [[package]] name = "cid" -version = "0.6.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768" +checksum = "fc949bff6704880faf064c42a4854032ab07bfcf3a4fcb82a57470acededb69c" dependencies = [ + "core2", "multibase", - "multihash 0.13.2", - "unsigned-varint 0.5.1", + "multihash", + "serde", + "unsigned-varint", ] [[package]] @@ -1494,29 +1488,15 @@ dependencies = [ ] [[package]] -name = "common" -version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +name = "coarsetime" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "454038500439e141804c655b4cd1bc6a70bcb95cd2bc9463af5661b6956f0e46" dependencies = [ - "frame-executive", - "frame-support", - "frame-system", - "node-primitives", - "pallet-balances", - "pallet-parachain-staking", - "pallet-treasury", - "parity-scale-codec 2.3.1", - "polkadot-primitives", - "polkadot-runtime-common", - "scale-info 1.0.0", - "sp-consensus-aura", - "sp-consensus-babe", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "substrate-wasm-builder", - "webb-primitives", + "libc", + "once_cell", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1569,21 +1549,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] -name = "cpp_demangle" -version = "0.3.5" +name = "core2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" dependencies = [ - "cfg-if 1.0.0", + "memchr", ] [[package]] -name = "cpufeatures" -version = "0.1.5" +name = "cpp_demangle" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" dependencies = [ - "libc", + "cfg-if 1.0.0", ] [[package]] @@ -1597,18 +1577,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fc68cdb867b7d27b5f33cd65eb11376dfb41a2d09568a1a2c2bc1dc204f4ef" +checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31253a44ab62588f8235a996cc9b0636d98a299190069ced9628b8547329b47a" +checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", @@ -1623,33 +1603,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a20ab4627d30b702fb1b8a399882726d216b8164d3b3fa6189e3bf901506afe" +checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6687d9668dacfed4468361f7578d86bded8ca4db978f734d9b631494bebbb5b8" +checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc" [[package]] name = "cranelift-entity" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77c5d72db97ba2cb36f69037a709edbae0d29cb25503775891e7151c5c874bf" +checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426dca83f63c7c64ea459eb569aadc5e0c66536c0042ed5d693f91830e8750d0" +checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce" dependencies = [ "cranelift-codegen", "log", @@ -1659,9 +1639,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8007864b5d0c49b026c861a15761785a2871124e401630c03ef1426e6d0d559e" +checksum = "501241b0cdf903412ec9075385ac9f2b1eb18a89044d1538e97fab603231f70c" dependencies = [ "cranelift-codegen", "libc", @@ -1670,9 +1650,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94cf12c071415ba261d897387ae5350c4d83c238376c8c5a96514ecfa2ea66a3" +checksum = "16d9e4211bbc3268042a96dd4de5bd979cda22434991d035f5f8eacba987fad2" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1728,6 +1708,16 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.8" @@ -1775,7 +1765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" dependencies = [ "generic-array 0.14.5", - "typenum 1.15.0", + "typenum", ] [[package]] @@ -1814,6 +1804,28 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e35f15e1a0699dd988fed910dd78fdc6407f44654cd12589c91fa44ea67d9159" +[[package]] +name = "csv" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +dependencies = [ + "bstr", + "csv-core", + "itoa 0.4.8", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + [[package]] name = "ct-logs" version = "0.8.0" @@ -1856,25 +1868,26 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "clap 3.1.18", "sc-cli", "sc-service", + "url", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parity-scale-codec 2.3.1", - "parking_lot 0.10.2", + "parity-scale-codec", + "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1890,13 +1903,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -1919,13 +1932,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "dyn-clone", "futures 0.3.21", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-primitives", "sc-client-api", "sc-consensus", @@ -1940,14 +1953,14 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "derive_more", "futures 0.3.21", "futures-timer", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-parachain", @@ -1965,13 +1978,13 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1989,14 +2002,15 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ + "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-primitives", @@ -2018,14 +2032,14 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "frame-executive", "frame-support", "frame-system", "pallet-aura", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-application-crypto", "sp-consensus-aura", @@ -2036,14 +2050,14 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -2054,7 +2068,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -2065,9 +2079,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-balances", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-parachain", - "scale-info 1.0.0", + "scale-info", "serde", "sp-core", "sp-externalities", @@ -2084,9 +2098,9 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -2095,13 +2109,13 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -2112,15 +2126,15 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "rand_chacha 0.3.1", - "scale-info 1.0.0", + "scale-info", "sp-runtime", "sp-std", "xcm", @@ -2130,10 +2144,10 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "frame-support", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2146,15 +2160,15 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-client-api", - "scale-info 1.0.0", + "scale-info", "sp-api", "sp-core", "sp-inherents", @@ -2169,9 +2183,11 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "cumulus-primitives-core", + "futures 0.3.21", + "parity-scale-codec", "sp-inherents", "sp-std", "sp-timestamp", @@ -2180,11 +2196,11 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "cumulus-primitives-core", "frame-support", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2197,59 +2213,34 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "async-trait", "cumulus-primitives-core", "derive_more", "futures 0.3.21", + "jsonrpsee-core", + "parity-scale-codec", "parking_lot 0.12.0", "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=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" -dependencies = [ - "async-trait", - "cumulus-primitives-core", - "cumulus-relay-chain-interface", - "futures 0.3.21", - "futures-timer", - "parking_lot 0.12.0", - "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", + "thiserror", ] [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "cumulus-primitives-core", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-primitives", "sp-runtime", "sp-state-machine", @@ -2278,15 +2269,15 @@ dependencies = [ "rand 0.6.5", "rand 0.7.3", "rust-gmp-kzen", - "secp256k1", + "secp256k1 0.20.3", "serde", "serde_bytes", "serde_derive", "sha2 0.8.2", "sha2 0.9.9", - "sha3", + "sha3 0.9.1", "thiserror", - "typenum 1.15.0", + "typenum", "zeroize", ] @@ -2316,6 +2307,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.3", + "subtle 2.4.1", + "zeroize", +] + [[package]] name = "data-encoding" version = "2.3.2" @@ -2410,6 +2414,7 @@ checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ "block-buffer 0.10.2", "crypto-common", + "subtle 2.4.1", ] [[package]] @@ -2431,6 +2436,17 @@ dependencies = [ "dirs-sys-next", ] +[[package]] +name = "dirs" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" +dependencies = [ + "libc", + "redox_users 0.3.5", + "winapi", +] + [[package]] name = "dirs-sys" version = "0.3.7" @@ -2438,8 +2454,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "redox_users", - "winapi 0.3.9", + "redox_users 0.4.3", + "winapi", ] [[package]] @@ -2449,14 +2465,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users", - "winapi 0.3.9", + "redox_users 0.4.3", + "winapi", ] [[package]] name = "dkg-gadget" version = "0.0.1" -source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#cca78fd3d36a69c83a8f1d50c711d02a617f90d4" +source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#f50a5f84535d3e819ca4b15c62612e1ee775682a" dependencies = [ "async-trait", "atomic", @@ -2469,9 +2485,9 @@ dependencies = [ "libsecp256k1 0.3.5", "linked_hash_set", "log", - "lru 0.7.5", + "lru 0.7.6", "multi-party-ecdsa", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parking_lot 0.11.2", "rand 0.8.5", "round-based", @@ -2480,10 +2496,10 @@ dependencies = [ "sc-network", "sc-peerset", "sc-service", - "scale-info 1.0.0", + "scale-info", "serde", "serde_json", - "sha3", + "sha3 0.9.1", "sp-api", "sp-application-crypto", "sp-arithmetic", @@ -2503,9 +2519,9 @@ dependencies = [ [[package]] name = "dkg-primitives" version = "0.0.1" -source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#cca78fd3d36a69c83a8f1d50c711d02a617f90d4" +source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#f50a5f84535d3e819ca4b15c62612e1ee775682a" dependencies = [ - "chacha20poly1305 0.9.0", + "chacha20poly1305", "curv-kzen", "dkg-runtime-primitives", "fnv", @@ -2514,7 +2530,7 @@ dependencies = [ "libsecp256k1 0.3.5", "log", "multi-party-ecdsa", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parking_lot 0.11.2", "rand 0.8.5", "round-based", @@ -2522,7 +2538,7 @@ dependencies = [ "sc-service", "serde", "serde_json", - "sha3", + "sha3 0.9.1", "sp-core", "sp-keystore", "sp-runtime", @@ -2534,16 +2550,16 @@ dependencies = [ [[package]] name = "dkg-runtime-primitives" version = "0.0.1" -source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#cca78fd3d36a69c83a8f1d50c711d02a617f90d4" +source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#f50a5f84535d3e819ca4b15c62612e1ee775682a" dependencies = [ "ethereum", - "ethereum-types", + "ethereum-types 0.13.1", "frame-support", "frame-system", "hex", "impl-trait-for-tuples", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-core", @@ -2551,7 +2567,7 @@ dependencies = [ "sp-runtime", "sp-std", "tiny-keccak", - "webb-proposals 0.2.5", + "webb-proposals", ] [[package]] @@ -2572,9 +2588,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "0.4.8" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6" [[package]] name = "dyn-clonable" @@ -2668,7 +2684,6 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-interface", - "cumulus-relay-chain-local", "derive_more", "dkg-gadget", "dkg-primitives", @@ -2680,7 +2695,7 @@ dependencies = [ "jsonrpc-core", "log", "pallet-transaction-payment-rpc", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", @@ -2697,6 +2712,7 @@ dependencies = [ "sc-rpc", "sc-rpc-api", "sc-service", + "sc-sysinfo", "sc-telemetry", "sc-tracing", "sc-transaction-pool", @@ -2715,7 +2731,7 @@ dependencies = [ "sp-timestamp", "sp-transaction-pool", "structopt", - "substrate-build-script-utils 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "substrate-build-script-utils 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22)", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", ] @@ -2724,7 +2740,6 @@ dependencies = [ name = "egg-runtime" version = "3.0.0" dependencies = [ - "common", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -2748,6 +2763,7 @@ dependencies = [ "pallet-anchor", "pallet-anchor-handler", "pallet-asset-registry", + "pallet-asset-tx-payment", "pallet-aura", "pallet-authorship", "pallet-balances", @@ -2756,6 +2772,7 @@ dependencies = [ "pallet-dkg-proposal-handler", "pallet-dkg-proposals", "pallet-hasher", + "pallet-indices", "pallet-linkable-tree", "pallet-mixer", "pallet-mt", @@ -2771,10 +2788,10 @@ dependencies = [ "pallet-verifier", "pallet-xcm", "parachain-info", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-parachain", "polkadot-runtime-common", - "scale-info 1.0.0", + "scale-info", "serde", "smallvec", "sp-api", @@ -2807,7 +2824,6 @@ dependencies = [ "arkworks-setups", "async-trait", "clap 3.1.18", - "common", "dkg-gadget", "dkg-primitives", "dkg-runtime-primitives", @@ -2820,11 +2836,13 @@ dependencies = [ "jsonrpc-core", "log", "pallet-im-online", + "pallet-linkable-tree-rpc", + "pallet-linkable-tree-rpc-runtime-api", "pallet-mt", "pallet-mt-rpc", "pallet-mt-rpc-runtime-api", "pallet-transaction-payment-rpc", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "rand 0.7.3", "sc-authority-discovery", "sc-basic-authorship", @@ -2878,7 +2896,6 @@ dependencies = [ name = "egg-standalone-runtime" version = "0.1.0" dependencies = [ - "common", "dkg-runtime-primitives", "frame-benchmarking", "frame-election-provider-support", @@ -2895,6 +2912,7 @@ dependencies = [ "pallet-anchor", "pallet-anchor-handler", "pallet-asset-registry", + "pallet-asset-tx-payment", "pallet-assets", "pallet-aura", "pallet-authority-discovery", @@ -2919,6 +2937,7 @@ dependencies = [ "pallet-mt", "pallet-mt-rpc-runtime-api", "pallet-multisig", + "pallet-nomination-pools", "pallet-offences", "pallet-preimage", "pallet-proxy", @@ -2936,8 +2955,8 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-verifier", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "smallvec", "sp-api", @@ -3000,11 +3019,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + [[package]] name = "enum-as-inner" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4" +checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -3014,18 +3039,18 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.6.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0" +checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.6.4" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" +checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ "proc-macro2", "quote", @@ -3070,7 +3095,7 @@ checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ "errno-dragonfly", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3089,9 +3114,9 @@ version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76ef192b63e8a44b3d08832acebbb984c3fba154b5c26f70037c860202a0d4b" dependencies = [ - "ethereum-types", + "ethereum-types 0.12.1", "hex", - "sha3", + "sha3 0.9.1", ] [[package]] @@ -3099,29 +3124,41 @@ name = "ethbloom" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8" +dependencies = [ + "crunchy", + "fixed-hash", + "tiny-keccak", +] + +[[package]] +name = "ethbloom" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef" dependencies = [ "crunchy", "fixed-hash", "impl-codec", "impl-rlp", - "scale-info 1.0.0", + "scale-info", "tiny-keccak", ] [[package]] name = "ethereum" -version = "0.9.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a67be3eaf296ef668733f54c637e84d0ca34eaf194f0077455135981ad464c3" +checksum = "23750149fe8834c0e24bb9adcbacbe06c45b9861f15df53e09f26cb7c4ab91ef" dependencies = [ - "bytes 1.1.0", - "ethereum-types", + "bytes", + "ethereum-types 0.13.1", "hash-db", "hash256-std-hasher", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "rlp", "rlp-derive", - "sha3", + "scale-info", + "sha3 0.10.1", "triehash", ] @@ -3131,12 +3168,24 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf" dependencies = [ - "ethbloom", + "ethbloom 0.11.1", + "fixed-hash", + "primitive-types 0.10.1", + "uint", +] + +[[package]] +name = "ethereum-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6" +dependencies = [ + "ethbloom 0.12.1", "fixed-hash", "impl-codec", "impl-rlp", - "primitive-types 0.10.1", - "scale-info 1.0.0", + "primitive-types 0.11.1", + "scale-info", "uint", ] @@ -3156,14 +3205,39 @@ dependencies = [ ] [[package]] -name = "fake-simd" -version = "0.1.2" +name = "expander" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" +checksum = "a718c0675c555c5f976fff4ea9e2c150fa06cefa201cadef87cfbf9324075881" +dependencies = [ + "blake3", + "fs-err", + "proc-macro2", + "quote", +] [[package]] -name = "fallible-iterator" -version = "0.2.0" +name = "expander" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3774182a5df13c3d1690311ad32fbe913feef26baba609fa2dd5f72042bd2ab6" +dependencies = [ + "blake2 0.10.4", + "fs-err", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "fake-simd" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" + +[[package]] +name = "fallible-iterator" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" @@ -3176,6 +3250,31 @@ dependencies = [ "instant", ] +[[package]] +name = "fatality" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad875162843b0d046276327afe0136e9ed3a23d5a754210fb6f1f33610d39ab" +dependencies = [ + "fatality-proc-macro", + "thiserror", +] + +[[package]] +name = "fatality-proc-macro" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" +dependencies = [ + "expander 0.0.4", + "indexmap", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "thiserror", +] + [[package]] name = "fdlimit" version = "0.2.1" @@ -3243,18 +3342,18 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.14.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" +checksum = "d9def033d8505edf199f6a5d07aa7e6d2d6185b164293b77f0efd108f4f3e11d" dependencies = [ "either", "futures 0.3.21", "futures-timer", "log", "num-traits", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parking_lot 0.11.2", - "scale-info 1.0.0", + "scale-info", ] [[package]] @@ -3297,9 +3396,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", ] [[package]] @@ -3309,21 +3408,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" dependencies = [ "matches", - "percent-encoding 2.1.0", + "percent-encoding", ] [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "linregress", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "paste", - "scale-info 1.0.0", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -3337,53 +3436,89 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "Inflector", "chrono", "clap 3.1.18", "frame-benchmarking", "frame-support", + "frame-system", "handlebars", + "hash-db", + "hex", + "itertools 0.10.3", + "kvdb", + "lazy_static", "linked-hash-map", "log", - "parity-scale-codec 2.3.1", + "memory-db", + "parity-scale-codec", + "prettytable-rs", + "rand 0.8.5", + "rand_pcg 0.3.1", + "sc-block-builder", "sc-cli", + "sc-client-api", "sc-client-db", "sc-executor", "sc-service", + "sc-sysinfo", "serde", "serde_json", + "serde_nanos", + "sp-api", + "sp-blockchain", "sp-core", + "sp-database", "sp-externalities", + "sp-inherents", "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-storage", + "sp-trie", + "tempfile", + "thiserror", + "thousands", +] + +[[package]] +name = "frame-election-provider-solution-type" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ + "frame-election-provider-solution-type", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-npos-elections", + "sp-runtime", "sp-std", ] [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -3393,30 +3528,31 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" +checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", ] [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "bitflags", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", + "k256", "log", "once_cell", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "paste", - "scale-info 1.0.0", + "scale-info", "serde", "smallvec", "sp-arithmetic", @@ -3435,7 +3571,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -3447,10 +3583,10 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -3459,7 +3595,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "proc-macro2", "quote", @@ -3469,12 +3605,12 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -3486,13 +3622,13 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -3501,16 +3637,16 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-api", ] [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "sp-api", @@ -3533,7 +3669,7 @@ dependencies = [ "lazy_static", "libc", "libloading 0.5.2", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3543,36 +3679,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" +name = "fs_extra" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" [[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" +name = "fuchsia-cprng" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] name = "funty" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" @@ -3657,13 +3783,13 @@ dependencies = [ [[package]] name = "futures-rustls" -version = "0.21.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" +checksum = "e01fe9932a224b72b45336d96040aa86386d674a31d0af27d800ea7bc8ca97fe" dependencies = [ "futures-io", - "rustls 0.19.1", - "webpki 0.21.4", + "rustls 0.20.6", + "webpki 0.22.0", ] [[package]] @@ -3709,7 +3835,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ - "typenum 1.15.0", + "typenum", ] [[package]] @@ -3718,7 +3844,7 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ - "typenum 1.15.0", + "typenum", "version_check", ] @@ -3826,7 +3952,7 @@ version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "futures-core", "futures-sink", @@ -4010,7 +4136,7 @@ checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" dependencies = [ "libc", "match_cfg", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4019,7 +4145,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "itoa 1.0.2", ] @@ -4030,7 +4156,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.1.0", + "bytes", "http", "pin-project-lite 0.2.9", ] @@ -4055,11 +4181,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.18" +version = "0.14.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" +checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -4070,7 +4196,7 @@ dependencies = [ "httpdate", "itoa 1.0.2", "pin-project-lite 0.2.9", - "socket2 0.4.4", + "socket2", "tokio", "tower-service", "tracing", @@ -4094,17 +4220,6 @@ dependencies = [ "webpki 0.21.4", ] -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.2.3" @@ -4118,48 +4233,39 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de" -dependencies = [ - "if-addrs-sys", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "if-addrs-sys" -version = "0.3.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" +checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" dependencies = [ - "cc", "libc", + "winapi", ] [[package]] name = "if-watch" -version = "0.2.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179" +checksum = "ae8f4a3c3d4c89351ca83e120c1c00b27df945d38e05695668c9d4b4f7bc52f3" dependencies = [ "async-io", + "core-foundation", + "fnv", "futures 0.3.21", - "futures-lite", "if-addrs", "ipnet", - "libc", "log", - "winapi 0.3.9", + "rtnetlink", + "system-configuration", + "windows", ] [[package]] name = "impl-codec" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", ] [[package]] @@ -4193,9 +4299,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" dependencies = [ "autocfg 1.1.0", "hashbrown 0.11.2", @@ -4228,21 +4334,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.4.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ef6787e7f0faedc040f95716bdd0e62bcfcf4ba93da053b62dea2691c13864" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] +checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" [[package]] name = "ip_network" @@ -4252,13 +4346,13 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipconfig" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" +checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98" dependencies = [ - "socket2 0.3.19", + "socket2", "widestring", - "winapi 0.3.9", + "winapi", "winreg", ] @@ -4316,22 +4410,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpc-client-transports" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" -dependencies = [ - "derive_more", - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-pubsub", - "log", - "serde", - "serde_json", - "url 1.7.2", -] - [[package]] name = "jsonrpc-core" version = "18.0.0" @@ -4347,165 +4425,60 @@ dependencies = [ "serde_json", ] -[[package]] -name = "jsonrpc-core-client" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" -dependencies = [ - "futures 0.3.21", - "jsonrpc-client-transports", -] - -[[package]] -name = "jsonrpc-derive" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" -dependencies = [ - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "jsonrpc-http-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" -dependencies = [ - "futures 0.3.21", - "hyper", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "net2", - "parking_lot 0.11.2", - "unicase", -] - -[[package]] -name = "jsonrpc-ipc-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" -dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-tokio-ipc", - "parking_lot 0.11.2", - "tower-service", -] - -[[package]] -name = "jsonrpc-pubsub" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" -dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "lazy_static", - "log", - "parking_lot 0.11.2", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "jsonrpc-server-utils" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" -dependencies = [ - "bytes 1.1.0", - "futures 0.3.21", - "globset", - "jsonrpc-core", - "lazy_static", - "log", - "tokio", - "tokio-stream", - "tokio-util 0.6.10", - "unicase", -] - -[[package]] -name = "jsonrpc-ws-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946" -dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-ws", - "parking_lot 0.11.2", - "slab", -] - [[package]] name = "jsonrpsee" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5" -dependencies = [ - "jsonrpsee-types 0.4.1", - "jsonrpsee-utils", - "jsonrpsee-ws-client 0.4.1", -] - -[[package]] -name = "jsonrpsee" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9" +checksum = "a1f2ab5a60e558e74ea93bcf5164ebc47939a7fff8938fa9b5233bbc63e16061" dependencies = [ "jsonrpsee-core", + "jsonrpsee-http-server", "jsonrpsee-proc-macros", - "jsonrpsee-types 0.8.0", - "jsonrpsee-ws-client 0.8.0", + "jsonrpsee-types", + "jsonrpsee-ws-client", + "jsonrpsee-ws-server", + "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3303cdf246e6ab76e2866fb3d9acb6c76a068b1b28bd923a1b7a8122257ad7b5" +checksum = "26d682f4a55081a2be3e639280c640523070e4aeb8ee2fd8dd9168fdae57a9db" dependencies = [ - "futures 0.3.21", + "futures-util", "http", "jsonrpsee-core", - "jsonrpsee-types 0.8.0", + "jsonrpsee-types", "pin-project 1.0.10", "rustls-native-certs 0.6.2", "soketto", "thiserror", "tokio", "tokio-rustls 0.23.4", - "tokio-util 0.6.10", + "tokio-util 0.7.2", "tracing", - "webpki-roots 0.22.3", + "webpki-roots", ] [[package]] name = "jsonrpsee-core" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f220b5a238dc7992b90f1144fbf6eaa585872c9376afe6fe6863ffead6191bf3" +checksum = "6e27462b21279edf9a6a91f46ffbe125e9cdc58b901d2e08bf59b31a47d7d0ab" dependencies = [ "anyhow", "arrayvec 0.7.2", + "async-lock", "async-trait", "beef", "futures-channel", + "futures-timer", "futures-util", "hyper", - "jsonrpsee-types 0.8.0", + "jsonrpsee-types", + "parking_lot 0.12.0", + "rand 0.8.5", "rustc-hash", "serde", "serde_json", @@ -4516,41 +4489,41 @@ dependencies = [ ] [[package]] -name = "jsonrpsee-proc-macros" -version = "0.8.0" +name = "jsonrpsee-http-server" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4299ebf790ea9de1cb72e73ff2ae44c723ef264299e5e2d5ef46a371eb3ac3d8" +checksum = "7178f16eabd7154c094e24d295b9ee355ec1e5f24c328759c56255ff7bbd4548" dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", + "futures-channel", + "futures-util", + "globset", + "hyper", + "jsonrpsee-core", + "jsonrpsee-types", + "lazy_static", + "serde_json", + "tokio", + "tracing", + "unicase", ] [[package]] -name = "jsonrpsee-types" -version = "0.4.1" +name = "jsonrpsee-proc-macros" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f778cf245158fbd8f5d50823a2e9e4c708a40be164766bd35e9fb1d86715b2" +checksum = "8b8d7f449cab3b747f12c3efc27f5cad537f3b597c6a3838b0fac628f4bf730a" dependencies = [ - "anyhow", - "async-trait", - "beef", - "futures-channel", - "futures-util", - "hyper", - "log", - "serde", - "serde_json", - "soketto", - "thiserror", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "jsonrpsee-types" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b3f601bbbe45cd63f5407b6f7d7950e08a7d4f82aa699ff41a4a5e9e54df58" +checksum = "8fd11763134104122ddeb0f97e4bbe393058017dfb077db63fbf44b4dd0dd86e" dependencies = [ "anyhow", "beef", @@ -4560,50 +4533,32 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-utils" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c" -dependencies = [ - "arrayvec 0.7.2", - "beef", - "jsonrpsee-types 0.4.1", -] - [[package]] name = "jsonrpsee-ws-client" -version = "0.4.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559aa56fc402af206c00fc913dc2be1d9d788dcde045d14df141a535245d35ef" +checksum = "76f15180afb3761c7a3a32c0a8b680788176dcfdfe725b24c1758c90b1d1595b" dependencies = [ - "arrayvec 0.7.2", - "async-trait", - "fnv", - "futures 0.3.21", - "http", - "jsonrpsee-types 0.4.1", - "log", - "pin-project 1.0.10", - "rustls-native-certs 0.5.0", - "serde", - "serde_json", - "soketto", - "thiserror", - "tokio", - "tokio-rustls 0.22.0", - "tokio-util 0.6.10", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types", ] [[package]] -name = "jsonrpsee-ws-client" -version = "0.8.0" +name = "jsonrpsee-ws-server" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" +checksum = "dfb6c21556c551582b56e4e8e6e6249b0bbdb69bb7fa39efe9b9a6b54af9f206" dependencies = [ - "jsonrpsee-client-transport", + "futures-channel", + "futures-util", "jsonrpsee-core", - "jsonrpsee-types 0.8.0", + "jsonrpsee-types", + "serde_json", + "soketto", + "tokio", + "tokio-util 0.7.2", + "tracing", ] [[package]] @@ -4620,24 +4575,14 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" - -[[package]] -name = "kernel32-sys" -version = "0.2.2" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] +checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "kusama-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "beefy-primitives", "bitvec", @@ -4655,6 +4600,7 @@ dependencies = [ "pallet-bags-list", "pallet-balances", "pallet-bounties", + "pallet-child-bounties", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -4665,9 +4611,9 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", - "pallet-mmr-primitives", "pallet-multisig", "pallet-nicks", + "pallet-nomination-pools", "pallet-offences", "pallet-preimage", "pallet-proxy", @@ -4685,12 +4631,12 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 1.0.0", + "scale-info", "serde", "serde_derive", "smallvec", @@ -4702,6 +4648,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime", @@ -4719,8 +4666,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "frame-support", "polkadot-primitives", @@ -4740,9 +4687,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512" +checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" dependencies = [ "parity-util-mem", "smallvec", @@ -4750,20 +4697,20 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" +checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "kvdb-rocksdb" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a" +checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" dependencies = [ "fs-swap", "kvdb", @@ -4771,7 +4718,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rocksdb", "smallvec", @@ -4813,7 +4760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" dependencies = [ "cc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4823,7 +4770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4834,14 +4781,18 @@ checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" [[package]] name = "libp2p" -version = "0.40.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bec54343492ba5940a6c555e512c6721139835d28c59bc22febece72dfd0d9d" +checksum = "475ce2ac4a9727e53a519f6ee05b38abfcba8f0d39c4d24f103d184e36fd5b0f" dependencies = [ "atomic", - "bytes 1.1.0", + "bytes", "futures 0.3.21", + "futures-timer", + "getrandom 0.2.6", + "instant", "lazy_static", + "libp2p-autonat", "libp2p-core", "libp2p-deflate", "libp2p-dns", @@ -4867,17 +4818,36 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multiaddr", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", + "rand 0.7.3", "smallvec", - "wasm-timer", +] + +[[package]] +name = "libp2p-autonat" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13b690e65046af6a09c0b27bd9508fa1cab0efce889de74b0b643b9d2a98f9a" +dependencies = [ + "async-trait", + "futures 0.3.21", + "futures-timer", + "instant", + "libp2p-core", + "libp2p-request-response", + "libp2p-swarm", + "log", + "prost", + "prost-build", + "rand 0.8.5", ] [[package]] name = "libp2p-core" -version = "0.30.2" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86aad7d54df283db817becded03e611137698a6509d4237a96881976a162340c" +checksum = "db5b02602099fb75cb2d16f9ea860a320d6eb82ce41e95ab680912c454805cd5" dependencies = [ "asn1_der", "bs58", @@ -4891,28 +4861,28 @@ dependencies = [ "libsecp256k1 0.7.0", "log", "multiaddr", - "multihash 0.14.0", + "multihash", "multistream-select", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "prost", "prost-build", "rand 0.8.5", "ring", "rw-stream-sink", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec", "thiserror", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", "zeroize", ] [[package]] name = "libp2p-deflate" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51a800adb195f33de63f4b17b63fe64cfc23bf2c6a0d3d0d5321328664e65197" +checksum = "6b1d37f042f748e224f04785d0e987ae09a2aa518d6401d82d412dad83e360ed" dependencies = [ "flate2", "futures 0.3.21", @@ -4921,9 +4891,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.30.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498" +checksum = "066e33e854e10b5c93fc650458bf2179c7e0d143db260b0963e44a94859817f1" dependencies = [ "async-std-resolver", "futures 0.3.21", @@ -4935,9 +4905,9 @@ dependencies = [ [[package]] name = "libp2p-floodsub" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab3d7210901ea51b7bae2b581aa34521797af8c4ec738c980bda4a06434067f" +checksum = "733d3ea6ebe7a7a85df2bc86678b93f24b015fae5fe3b3acc4c400e795a55d2d" dependencies = [ "cuckoofilter", "fnv", @@ -4953,78 +4923,82 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.33.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeead619eb5dac46e65acc78c535a60aaec803d1428cca6407c3a4fc74d698d" +checksum = "a90c989a7c0969c2ab63e898da9bc735e3be53fb4f376e9c045ce516bcc9f928" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "base64", "byteorder", - "bytes 1.1.0", + "bytes", "fnv", "futures 0.3.21", "hex_fmt", + "instant", "libp2p-core", "libp2p-swarm", "log", + "prometheus-client", "prost", "prost-build", "rand 0.7.3", "regex", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec", - "unsigned-varint 0.7.1", + "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca1275574183f288ff8b72d535d5ffa5ea9292ef7829af8b47dcb197c7b0dcd" +checksum = "c5ef5a5b57904c7c33d6713ef918d239dc6b7553458f3475d87f8a18e9c651c8" dependencies = [ "futures 0.3.21", + "futures-timer", "libp2p-core", "libp2p-swarm", "log", - "lru 0.6.6", + "lru 0.7.6", "prost", "prost-build", "smallvec", - "wasm-timer", ] [[package]] name = "libp2p-kad" -version = "0.32.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2297dc0ca285f3a09d1368bde02449e539b46f94d32d53233f53f6625bcd3ba" +checksum = "564e6bd64d177446399ed835b9451a8825b07929d6daa6a94e6405592974725e" dependencies = [ "arrayvec 0.5.2", - "asynchronous-codec 0.6.0", - "bytes 1.1.0", + "asynchronous-codec", + "bytes", "either", "fnv", "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", "prost", "prost-build", "rand 0.7.3", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec", + "thiserror", "uint", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-mdns" -version = "0.32.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c864b64bdc8a84ff3910a0df88e6535f256191a450870f1e7e10cbf8e64d45" +checksum = "611ae873c8e280ccfab0d57c7a13cac5644f364529e233114ff07863946058b0" dependencies = [ "async-io", "data-encoding", @@ -5037,49 +5011,51 @@ dependencies = [ "log", "rand 0.8.5", "smallvec", - "socket2 0.4.4", + "socket2", "void", ] [[package]] name = "libp2p-metrics" -version = "0.1.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af432fcdd2f8ba4579b846489f8f0812cfd738ced2c0af39df9b1c48bbb6ab2" +checksum = "985be799bb3796e0c136c768208c3c06604a38430571906a13dcfeda225a3b9d" dependencies = [ "libp2p-core", + "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-ping", + "libp2p-relay", "libp2p-swarm", - "open-metrics-client", + "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2cd64ef597f40e14bfce0497f50ecb63dd6d201c61796daeb4227078834fbf" +checksum = "442eb0c9fff0bf22a34f015724b4143ce01877e079ed0963c722d94c07c72160" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", + "asynchronous-codec", + "bytes", "futures 0.3.21", "libp2p-core", "log", "nohash-hasher", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.7.3", "smallvec", - "unsigned-varint 0.7.1", + "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8772c7a99088221bb7ca9c5c0574bf55046a7ab4c319f3619b275f28c8fb87a" +checksum = "9dd7e0c94051cda67123be68cf6b65211ba3dde7277be9068412de3e7ffd63ef" dependencies = [ - "bytes 1.1.0", + "bytes", "curve25519-dalek 3.2.0", "futures 0.3.21", "lazy_static", @@ -5088,7 +5064,7 @@ dependencies = [ "prost", "prost-build", "rand 0.8.5", - "sha2 0.9.9", + "sha2 0.10.2", "snow", "static_assertions", "x25519-dalek", @@ -5097,33 +5073,34 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ef7b0ec5cf06530d9eb6cf59ae49d46a2c45663bde31c25a12f682664adbcf" +checksum = "bf57a3c2e821331dda9fe612d4654d676ab6e33d18d9434a18cced72630df6ad" dependencies = [ "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", "rand 0.7.3", "void", - "wasm-timer", ] [[package]] name = "libp2p-plaintext" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba1a6ff33e4a274c89a3b1d78b9f34f32af13265cc5c46c16938262d4e945a" +checksum = "962c0fb0e7212fb96a69b87f2d09bcefd317935239bdc79cda900e7a8897a3fe" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", + "asynchronous-codec", + "bytes", "futures 0.3.21", "libp2p-core", "log", "prost", "prost-build", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", ] @@ -5138,94 +5115,101 @@ dependencies = [ "pin-project 1.0.10", "rand 0.7.3", "salsa20", - "sha3", + "sha3 0.9.1", ] [[package]] name = "libp2p-relay" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2852b61c90fa8ce3c8fcc2aba76e6cefc20d648f9df29157d6b3a916278ef3e3" +checksum = "3aa754cb7bccef51ebc3c458c6bbcef89d83b578a9925438389be841527d408f" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", + "asynchronous-codec", + "bytes", + "either", "futures 0.3.21", "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", "pin-project 1.0.10", "prost", "prost-build", - "rand 0.7.3", + "rand 0.8.5", "smallvec", - "unsigned-varint 0.7.1", + "static_assertions", + "thiserror", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-rendezvous" -version = "0.1.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a6d2b9e7677eff61dc3d2854876aaf3976d84a01ef6664b610c77a0c9407c5" +checksum = "bbd0baab894c5b84da510b915d53264d566c3c35889f09931fe9edbd2a773bee" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "bimap", "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", "prost", "prost-build", "rand 0.8.5", - "sha2 0.9.9", + "sha2 0.10.2", "thiserror", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-request-response" -version = "0.13.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a877a4ced6d46bf84677e1974e8cf61fb434af73b2e96fb48d6cb6223a4634d8" +checksum = "b5e6a6fc6c9ad95661f46989473b34bd2993d14a4de497ff3b2668a910d4b869" dependencies = [ "async-trait", - "bytes 1.1.0", + "bytes", "futures 0.3.21", + "instant", "libp2p-core", "libp2p-swarm", "log", - "lru 0.7.5", "rand 0.7.3", "smallvec", - "unsigned-varint 0.7.1", - "wasm-timer", + "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5184a508f223bc100a12665517773fb8730e9f36fc09eefb670bf01b107ae9" +checksum = "8f0c69ad9e8f7c5fc50ad5ad9c7c8b57f33716532a2b623197f69f93e374d14c" dependencies = [ "either", + "fnv", "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "log", + "pin-project 1.0.10", "rand 0.7.3", "smallvec", + "thiserror", "void", - "wasm-timer", ] [[package]] name = "libp2p-swarm-derive" -version = "0.25.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072c290f727d39bdc4e9d6d1c847978693d25a673bd757813681e33e5f6c00c2" +checksum = "daf2fe8c80b43561355f4d51875273b5b6dfbac37952e8f64b1270769305c9d7" dependencies = [ "quote", "syn", @@ -5233,9 +5217,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" +checksum = "193447aa729c85aac2376828df76d171c1a589c9e6b58fcc7f9d9a020734122c" dependencies = [ "async-io", "futures 0.3.21", @@ -5245,14 +5229,14 @@ dependencies = [ "libc", "libp2p-core", "log", - "socket2 0.4.4", + "socket2", ] [[package]] name = "libp2p-uds" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7563e46218165dfd60f64b96f7ce84590d75f53ecbdc74a7dd01450dc5973" +checksum = "24bdab114f7f2701757d6541266e1131b429bbae382008f207f2114ee4222dcb" dependencies = [ "async-std", "futures 0.3.21", @@ -5262,9 +5246,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1008a302b73c5020251f9708c653f5ed08368e530e247cc9cd2f109ff30042cf" +checksum = "4f6ea0f84a967ef59a16083f222c18115ae2e91db69809dce275df62e101b279" dependencies = [ "futures 0.3.21", "js-sys", @@ -5276,9 +5260,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.31.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e12df82d1ed64969371a9e65ea92b91064658604cc2576c2757f18ead9a1cf" +checksum = "c932834c3754501c368d1bf3d0fb458487a642b90fc25df082a3a2f3d3b32e37" dependencies = [ "either", "futures 0.3.21", @@ -5288,33 +5272,36 @@ dependencies = [ "quicksink", "rw-stream-sink", "soketto", - "url 2.2.2", - "webpki-roots 0.21.1", + "url", + "webpki-roots", ] [[package]] name = "libp2p-yamux" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" +checksum = "be902ebd89193cd020e89e89107726a38cfc0d16d18f613f4a37d046e92c7517" dependencies = [ "futures 0.3.21", "libp2p-core", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "thiserror", "yamux", ] [[package]] name = "librocksdb-sys" -version = "6.20.3" +version = "0.6.1+6.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" +checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" dependencies = [ "bindgen", + "bzip2-sys", "cc", "glob", "libc", + "libz-sys", + "tikv-jemalloc-sys", ] [[package]] @@ -5330,7 +5317,7 @@ dependencies = [ "rand 0.7.3", "sha2 0.8.2", "subtle 2.4.1", - "typenum 1.15.0", + "typenum", ] [[package]] @@ -5349,7 +5336,7 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.9.9", - "typenum 1.15.0", + "typenum", ] [[package]] @@ -5383,9 +5370,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e7e15d7610cce1d9752e137625f14e61a28cd45929b6e12e47b50fe154ee2e" +checksum = "174c5e7b8fecdcbf27c63fc1d70c22a53f64bbd81c92c17b2b5723f52a3a24cf" dependencies = [ "cc", "pkg-config", @@ -5419,18 +5406,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.36" +version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca" - -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] +checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" [[package]] name = "lock_api" @@ -5463,9 +5441,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889" +checksum = "8015d95cb7b2ddd3c0d32ca38283ceb1eea09b4713ee380bceb942d85a244228" dependencies = [ "hashbrown 0.11.2", ] @@ -5579,12 +5557,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d505169b746dacf02f7d14d8c80b34edfd8212159c63d23c977739a0d960c626" +checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" dependencies = [ "hash-db", - "hashbrown 0.11.2", + "hashbrown 0.12.1", "parity-util-mem", ] @@ -5626,14 +5604,17 @@ dependencies = [ [[package]] name = "metered-channel" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ + "coarsetime", + "crossbeam-queue", "derive_more", "futures 0.3.21", "futures-timer", + "nanorand", "thiserror", - "tracing", + "tracing-gum", ] [[package]] @@ -5662,25 +5643,6 @@ dependencies = [ "adler", ] -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - [[package]] name = "mio" version = "0.8.3" @@ -5693,30 +5655,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio 0.6.23", - "slab", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - [[package]] name = "more-asserts" version = "0.2.2" @@ -5744,27 +5682,27 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499" +checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" dependencies = [ "arrayref", "bs58", "byteorder", "data-encoding", - "multihash 0.14.0", - "percent-encoding 2.1.0", + "multihash", + "percent-encoding", "serde", "static_assertions", - "unsigned-varint 0.7.1", - "url 2.2.2", + "unsigned-varint", + "url", ] [[package]] name = "multibase" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b78c60039650ff12e140ae867ef5299a58e19dded4d334c849dc7177083667e2" +checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" dependencies = [ "base-x", "data-encoding", @@ -5773,41 +5711,28 @@ dependencies = [ [[package]] name = "multihash" -version = "0.13.2" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab" +checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689" dependencies = [ - "blake2b_simd", + "blake2b_simd 1.0.0", "blake2s_simd", "blake3", - "digest 0.9.0", - "generic-array 0.14.5", - "multihash-derive", - "sha2 0.9.9", - "sha3", - "unsigned-varint 0.5.1", -] - -[[package]] -name = "multihash" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8" -dependencies = [ - "digest 0.9.0", - "generic-array 0.14.5", + "core2", + "digest 0.10.3", "multihash-derive", - "sha2 0.9.9", - "unsigned-varint 0.7.1", + "sha2 0.10.2", + "sha3 0.10.1", + "unsigned-varint", ] [[package]] name = "multihash-derive" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" +checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -5823,16 +5748,16 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a336acba8bc87c8876f6425407dbbe6c417bf478b22015f8fb0994ef3bc0ab" +checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" dependencies = [ - "bytes 1.1.0", + "bytes", "futures 0.3.21", "log", "pin-project 1.0.10", "smallvec", - "unsigned-varint 0.7.1", + "unsigned-varint", ] [[package]] @@ -5850,7 +5775,7 @@ dependencies = [ "rand 0.8.5", "rand_distr", "simba", - "typenum 1.15.0", + "typenum", ] [[package]] @@ -5866,35 +5791,95 @@ dependencies = [ [[package]] name = "names" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" +checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146" dependencies = [ "rand 0.8.5", ] [[package]] -name = "net2" -version = "0.2.37" +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" + +[[package]] +name = "netlink-packet-core" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297" dependencies = [ - "cfg-if 0.1.10", + "anyhow", + "byteorder", "libc", - "winapi 0.3.9", + "netlink-packet-utils", ] [[package]] -name = "node-primitives" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +name = "netlink-packet-route" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733ea73609acfd7fa7ddadfb7bf709b0471668c456ad9513685af543a06342b2" dependencies = [ - "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", - "sp-application-crypto", - "sp-core", - "sp-runtime", + "anyhow", + "bitflags", + "byteorder", + "libc", + "netlink-packet-core", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-utils" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +dependencies = [ + "anyhow", + "byteorder", + "paste", + "thiserror", +] + +[[package]] +name = "netlink-proto" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8785b8141e8432aa45fceb922a7e876d7da3fad37fa7e7ec702ace3aa0826b" +dependencies = [ + "bytes", + "futures 0.3.21", + "log", + "netlink-packet-core", + "netlink-sys", + "tokio", +] + +[[package]] +name = "netlink-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4c9f9547a08241bee7b6558b9b98e1f290d187de8b7cfca2bbb4937bcaa8f8" +dependencies = [ + "async-io", + "bytes", + "futures 0.3.21", + "libc", + "log", +] + +[[package]] +name = "nix" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", + "memoffset", ] [[package]] @@ -6049,30 +6034,7 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" name = "opaque-debug" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "open-metrics-client" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7337d80c23c2d8b1349563981bc4fb531220733743ba8115454a67b181173f0d" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "open-metrics-client-derive-text-encode", - "owning_ref", -] - -[[package]] -name = "open-metrics-client-derive-text-encode" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c83b586f00268c619c1cb3340ec1a6f59dd9ba1d9833a273a68e6d5cd8ffc" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl-probe" @@ -6092,14 +6054,14 @@ dependencies = [ [[package]] name = "orml-currencies" version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#070457de18d26d2daed6abdfa57d8a951a525605" dependencies = [ "frame-support", "frame-system", "orml-traits", "orml-utilities", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -6109,13 +6071,13 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#070457de18d26d2daed6abdfa57d8a951a525605" dependencies = [ "frame-support", "frame-system", "orml-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -6124,14 +6086,14 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#070457de18d26d2daed6abdfa57d8a951a525605" dependencies = [ "frame-support", "impl-trait-for-tuples", "num-traits", "orml-utilities", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -6142,11 +6104,11 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#070457de18d26d2daed6abdfa57d8a951a525605" dependencies = [ "frame-support", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -6155,9 +6117,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d8d0b2f198229de29dca79676f2738ff952edf3fde542eb8bf94d8c21b435" +checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" [[package]] name = "owning_ref" @@ -6197,7 +6159,7 @@ dependencies = [ [[package]] name = "pallet-anchor" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "frame-benchmarking", "frame-support", @@ -6208,8 +6170,8 @@ dependencies = [ "pallet-linkable-tree", "pallet-mt", "pallet-verifier", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6219,7 +6181,7 @@ dependencies = [ [[package]] name = "pallet-anchor-handler" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "frame-support", "frame-system", @@ -6231,8 +6193,8 @@ dependencies = [ "pallet-linkable-tree", "pallet-mt", "pallet-signature-bridge", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-core", @@ -6245,36 +6207,51 @@ dependencies = [ [[package]] name = "pallet-asset-registry" version = "0.1.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "orml-traits", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "primitive-types 0.8.0", - "scale-info 1.0.0", + "scale-info", "serde", "sp-api", "sp-arithmetic", "sp-core", - "sp-io", "sp-runtime", "sp-std", "webb-primitives", - "xcm", +] + +[[package]] +name = "pallet-asset-tx-payment" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +dependencies = [ + "frame-support", + "frame-system", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -6282,13 +6259,13 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "pallet-timestamp", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -6298,13 +6275,13 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-authority-discovery", "sp-runtime", @@ -6314,13 +6291,13 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-authorship", "sp-runtime", "sp-std", @@ -6329,7 +6306,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", @@ -6338,8 +6315,8 @@ dependencies = [ "pallet-authorship", "pallet-session", "pallet-timestamp", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", @@ -6353,14 +6330,14 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-election-provider-support", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -6368,14 +6345,14 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -6383,14 +6360,14 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "beefy-primitives", "frame-support", "frame-system", "pallet-session", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -6399,21 +6376,19 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "beefy-merkle-tree", "beefy-primitives", "frame-support", "frame-system", "hex", - "libsecp256k1 0.7.0", "log", "pallet-beefy", "pallet-mmr", - "pallet-mmr-primitives", "pallet-session", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -6424,14 +6399,14 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "log", "pallet-treasury", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6441,13 +6416,13 @@ dependencies = [ [[package]] name = "pallet-bridge" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "frame-support", "frame-system", "pallet-balances", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6458,15 +6433,15 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bp-message-dispatch", "bp-runtime", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -6475,7 +6450,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bp-header-chain", "bp-runtime", @@ -6485,8 +6460,8 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-finality-grandpa", "sp-runtime", @@ -6497,7 +6472,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bitvec", "bp-message-dispatch", @@ -6507,8 +6482,8 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -6518,15 +6493,15 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "log", "pallet-bounties", "pallet-treasury", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6536,7 +6511,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -6544,9 +6519,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "rand 0.8.5", - "scale-info 1.0.0", + "scale-info", "serde", "sp-runtime", "sp-staking", @@ -6556,14 +6531,14 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6573,13 +6548,13 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -6589,7 +6564,7 @@ dependencies = [ [[package]] name = "pallet-dkg-metadata" version = "0.1.0" -source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#cca78fd3d36a69c83a8f1d50c711d02a617f90d4" +source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#f50a5f84535d3e819ca4b15c62612e1ee775682a" dependencies = [ "dkg-runtime-primitives", "frame-benchmarking", @@ -6598,8 +6573,8 @@ dependencies = [ "hex", "libsecp256k1 0.7.0", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6608,7 +6583,7 @@ dependencies = [ [[package]] name = "pallet-dkg-proposal-handler" version = "0.1.0" -source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#cca78fd3d36a69c83a8f1d50c711d02a617f90d4" +source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#f50a5f84535d3e819ca4b15c62612e1ee775682a" dependencies = [ "dkg-runtime-primitives", "frame-benchmarking", @@ -6616,8 +6591,8 @@ dependencies = [ "frame-system", "hex-literal 0.3.4", "pallet-dkg-metadata", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6627,7 +6602,7 @@ dependencies = [ [[package]] name = "pallet-dkg-proposals" version = "1.0.0" -source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#cca78fd3d36a69c83a8f1d50c711d02a617f90d4" +source = "git+https://github.com/webb-tools/dkg-substrate.git?branch=async#f50a5f84535d3e819ca4b15c62612e1ee775682a" dependencies = [ "dkg-runtime-primitives", "frame-benchmarking", @@ -6637,8 +6612,8 @@ dependencies = [ "log", "pallet-balances", "pallet-timestamp", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6648,16 +6623,16 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "rand 0.7.3", - "scale-info 1.0.0", + "scale-info", "sp-arithmetic", "sp-core", "sp-io", @@ -6671,13 +6646,13 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-npos-elections", @@ -6688,13 +6663,13 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-runtime", "sp-std", @@ -6703,7 +6678,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", @@ -6711,8 +6686,8 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -6726,13 +6701,13 @@ dependencies = [ [[package]] name = "pallet-hasher" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", "webb-primitives", @@ -6741,14 +6716,14 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "enumflags2", "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6757,14 +6732,14 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "log", "pallet-authorship", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-io", @@ -6776,12 +6751,12 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-keyring", @@ -6792,7 +6767,7 @@ dependencies = [ [[package]] name = "pallet-linkable-tree" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "frame-benchmarking", "frame-support", @@ -6800,8 +6775,8 @@ dependencies = [ "orml-traits", "pallet-hasher", "pallet-mt", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -6809,17 +6784,47 @@ dependencies = [ "webb-primitives", ] +[[package]] +name = "pallet-linkable-tree-rpc" +version = "0.1.0" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +dependencies = [ + "jsonrpsee", + "pallet-linkable-tree", + "pallet-linkable-tree-rpc-runtime-api", + "parity-scale-codec", + "sc-rpc", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "thiserror", + "webb-primitives", +] + +[[package]] +name = "pallet-linkable-tree-rpc-runtime-api" +version = "1.0.0" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +dependencies = [ + "pallet-linkable-tree", + "parity-scale-codec", + "sp-api", + "sp-std", + "webb-primitives", +] + [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6829,7 +6834,7 @@ dependencies = [ [[package]] name = "pallet-mixer" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "frame-benchmarking", "frame-support", @@ -6842,8 +6847,8 @@ dependencies = [ "pallet-hasher", "pallet-mt", "pallet-verifier", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", "webb-primitives", @@ -6852,33 +6857,17 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", "frame-support", "frame-system", - "pallet-mmr-primitives", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-mmr-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" -dependencies = [ - "frame-support", - "frame-system", - "log", - "parity-scale-codec 2.3.1", - "serde", - "sp-api", - "sp-core", + "sp-mmr-primitives", "sp-runtime", "sp-std", ] @@ -6886,31 +6875,29 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "pallet-mmr-primitives", - "parity-scale-codec 2.3.1", + "jsonrpsee", + "parity-scale-codec", "serde", "sp-api", "sp-blockchain", "sp-core", + "sp-mmr-primitives", "sp-runtime", ] [[package]] name = "pallet-mt" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "pallet-hasher", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", "webb-primitives", @@ -6919,26 +6906,25 @@ dependencies = [ [[package]] name = "pallet-mt-rpc" version = "0.1.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee", "pallet-mt", "pallet-mt-rpc-runtime-api", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-rpc", "sp-api", "sp-blockchain", "sp-core", "sp-runtime", + "thiserror", "webb-primitives", ] [[package]] name = "pallet-mt-rpc-runtime-api" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "pallet-mt", "sp-api", @@ -6948,12 +6934,12 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6962,64 +6948,59 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", ] [[package]] -name = "pallet-offences" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +name = "pallet-nomination-pools" +version = "1.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", - "log", - "pallet-balances", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", - "serde", + "parity-scale-codec", + "scale-info", + "sp-core", "sp-runtime", "sp-staking", "sp-std", ] [[package]] -name = "pallet-parachain-staking" -version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +name = "pallet-offences" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", "log", - "pallet-authorship", - "pallet-session", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "pallet-balances", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-staking", "sp-std", - "substrate-fixed", ] [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -7029,12 +7010,12 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -7043,13 +7024,13 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "safe-mix", - "scale-info 1.0.0", + "scale-info", "sp-runtime", "sp-std", ] @@ -7057,12 +7038,13 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -7071,14 +7053,14 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -7087,15 +7069,15 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "log", "pallet-timestamp", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -7108,14 +7090,14 @@ dependencies = [ [[package]] name = "pallet-signature-bridge" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "frame-support", "frame-system", "hex-literal 0.3.4", "pallet-balances", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -7126,13 +7108,13 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "rand_chacha 0.2.2", - "scale-info 1.0.0", + "scale-info", "sp-runtime", "sp-std", ] @@ -7140,7 +7122,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-election-provider-support", "frame-support", @@ -7148,8 +7130,8 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-application-crypto", "sp-io", @@ -7161,9 +7143,9 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -7172,7 +7154,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "log", "sp-arithmetic", @@ -7181,12 +7163,12 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -7195,14 +7177,14 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-inherents", "sp-io", "sp-runtime", @@ -7213,14 +7195,14 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "log", "pallet-treasury", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -7231,15 +7213,15 @@ dependencies = [ [[package]] name = "pallet-token-wrapper" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "orml-traits", "pallet-asset-registry", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-runtime", "sp-std", @@ -7249,12 +7231,12 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "smallvec", "sp-core", @@ -7266,13 +7248,11 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-api", "sp-blockchain", "sp-core", @@ -7283,10 +7263,10 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "pallet-transaction-payment", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-api", "sp-runtime", ] @@ -7294,14 +7274,14 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "pallet-balances", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -7310,12 +7290,12 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -7325,13 +7305,13 @@ dependencies = [ [[package]] name = "pallet-verifier" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", "webb-primitives", @@ -7340,27 +7320,27 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] [[package]] name = "pallet-xcm" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -7372,13 +7352,13 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", ] @@ -7401,20 +7381,6 @@ dependencies = [ "snap", ] -[[package]] -name = "parity-scale-codec" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" -dependencies = [ - "arrayvec 0.7.2", - "bitvec", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive 2.3.1", - "serde", -] - [[package]] name = "parity-scale-codec" version = "3.1.2" @@ -7422,21 +7388,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" dependencies = [ "arrayvec 0.7.2", + "bitvec", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.1.2", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" -dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", + "parity-scale-codec-derive", + "serde", ] [[package]] @@ -7445,7 +7401,7 @@ version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -7457,34 +7413,20 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parity-tokio-ipc" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" -dependencies = [ - "futures 0.3.21", - "libc", - "log", - "rand 0.7.3", - "tokio", - "winapi 0.3.9", -] - [[package]] name = "parity-util-mem" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" +checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.11.2", + "hashbrown 0.12.1", "impl-trait-for-tuples", "parity-util-mem-derive", - "parking_lot 0.11.2", - "primitive-types 0.10.1", + "parking_lot 0.12.0", + "primitive-types 0.11.1", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -7513,40 +7455,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" -[[package]] -name = "parity-ws" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5983d3929ad50f12c3eb9a6743f19d691866ecd44da74c0a3308c3f8a56df0c6" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "httparse", - "log", - "mio 0.6.23", - "mio-extras", - "rand 0.7.3", - "sha-1 0.8.2", - "slab", - "url 2.2.2", -] - [[package]] name = "parking" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", -] - [[package]] name = "parking_lot" version = "0.11.2" @@ -7554,7 +7468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.7", + "lock_api", "parking_lot_core 0.8.5", ] @@ -7564,24 +7478,10 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ - "lock_api 0.4.7", + "lock_api", "parking_lot_core 0.9.3", ] -[[package]] -name = "parking_lot_core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec", - "winapi 0.3.9", -] - [[package]] name = "parking_lot_core" version = "0.8.5" @@ -7593,7 +7493,7 @@ dependencies = [ "libc", "redox_syscall 0.2.13", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -7639,12 +7539,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.1.0" @@ -7803,8 +7697,8 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "polkadot-approval-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -7812,31 +7706,34 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "tracing", + "rand 0.8.5", + "tracing-gum", ] [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "tracing", + "rand 0.8.5", + "tracing-gum", ] [[package]] name = "polkadot-availability-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "derive_more", + "fatality", "futures 0.3.21", - "lru 0.7.5", - "parity-scale-codec 2.3.1", + "lru 0.7.6", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7847,17 +7744,18 @@ dependencies = [ "sp-core", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-availability-recovery" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ + "fatality", "futures 0.3.21", - "lru 0.7.5", - "parity-scale-codec 2.3.1", + "lru 0.7.6", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7867,44 +7765,51 @@ dependencies = [ "rand 0.8.5", "sc-network", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-cli" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "clap 3.1.18", "frame-benchmarking-cli", "futures 0.3.21", "log", + "polkadot-client", "polkadot-node-core-pvf", "polkadot-node-metrics", "polkadot-performance-test", "polkadot-service", "sc-cli", "sc-service", + "sc-sysinfo", "sc-tracing", "sp-core", "sp-trie", - "substrate-build-script-utils 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17)", + "substrate-build-script-utils 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22)", "thiserror", "try-runtime-cli", ] [[package]] name = "polkadot-client" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "beefy-primitives", "frame-benchmarking", + "frame-benchmarking-cli", + "frame-system", "frame-system-rpc-runtime-api", - "pallet-mmr-primitives", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", + "polkadot-core-primitives", + "polkadot-node-core-parachains-inherent", "polkadot-primitives", "polkadot-runtime", + "polkadot-runtime-common", "rococo-runtime", "sc-client-api", "sc-consensus", @@ -7916,21 +7821,26 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", + "sp-core", "sp-finality-grandpa", + "sp-inherents", + "sp-keyring", + "sp-mmr-primitives", "sp-offchain", "sp-runtime", "sp-session", "sp-storage", + "sp-timestamp", "sp-transaction-pool", ] [[package]] name = "polkadot-collator-protocol" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "always-assert", - "derive_more", + "fatality", "futures 0.3.21", "futures-timer", "polkadot-node-network-protocol", @@ -7942,17 +7852,17 @@ dependencies = [ "sp-keystore", "sp-runtime", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-core-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parity-util-mem", - "scale-info 1.0.0", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -7960,13 +7870,14 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "derive_more", + "fatality", "futures 0.3.21", - "lru 0.7.5", - "parity-scale-codec 2.3.1", + "lru 0.7.6", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7977,15 +7888,15 @@ dependencies = [ "sp-application-crypto", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-erasure-coding" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", @@ -7996,8 +7907,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "futures 0.3.21", "futures-timer", @@ -8011,18 +7922,20 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-keystore", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-network-bridge" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ + "always-assert", "async-trait", + "bytes", "futures 0.3.21", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -8030,16 +7943,16 @@ dependencies = [ "polkadot-primitives", "sc-network", "sp-consensus", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-collation-generation" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "futures 0.3.21", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8048,22 +7961,22 @@ dependencies = [ "sp-core", "sp-maybe-compressed-blob", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bitvec", "derive_more", "futures 0.3.21", "futures-timer", "kvdb", - "lru 0.7.5", + "lru 0.7.6", "merlin", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8076,19 +7989,20 @@ dependencies = [ "sp-consensus", "sp-consensus-slots", "sp-runtime", - "tracing", + "thiserror", + "tracing-gum", ] [[package]] name = "polkadot-node-core-av-store" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bitvec", "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8096,15 +8010,16 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-backing" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bitvec", + "fatality", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -8114,13 +8029,13 @@ dependencies = [ "polkadot-statement-table", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -8128,18 +8043,18 @@ dependencies = [ "polkadot-primitives", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", "wasm-timer", ] [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8147,13 +8062,13 @@ dependencies = [ "polkadot-parachain", "polkadot-primitives", "sp-maybe-compressed-blob", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -8162,48 +8077,49 @@ dependencies = [ "sc-client-api", "sc-consensus-babe", "sp-blockchain", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ + "fatality", "futures 0.3.21", "kvdb", - "lru 0.7.5", - "parity-scale-codec 2.3.1", + "lru 0.7.6", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sc-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "async-trait", "futures 0.3.21", @@ -8214,15 +8130,16 @@ dependencies = [ "sp-inherents", "sp-runtime", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bitvec", + "fatality", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -8231,13 +8148,13 @@ dependencies = [ "polkadot-primitives", "rand 0.8.5", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "always-assert", "assert_matches", @@ -8245,7 +8162,7 @@ dependencies = [ "async-std", "futures 0.3.21", "futures-timer", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "pin-project 1.0.10", "polkadot-core-primitives", "polkadot-node-subsystem-util", @@ -8261,13 +8178,13 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-tracing", "sp-wasm-interface", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -8277,13 +8194,13 @@ dependencies = [ "polkadot-primitives", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "futures 0.3.21", "memory-lru", @@ -8295,20 +8212,20 @@ dependencies = [ "sp-authority-discovery", "sp-consensus-babe", "sp-core", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "async-std", "lazy_static", "log", "mick-jaeger", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-primitives", "sc-network", @@ -8318,49 +8235,51 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bs58", "futures 0.3.21", "futures-timer", "log", "metered-channel", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-primitives", "sc-cli", "sc-service", "sc-tracing", "substrate-prometheus-endpoint", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-network-protocol" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "async-trait", "derive_more", + "fatality", "futures 0.3.21", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", + "rand 0.8.5", "sc-authority-discovery", "sc-network", - "strum 0.23.0", + "strum 0.24.0", "thiserror", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bounded-vec", "futures 0.3.21", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "schnorrkel", @@ -8377,8 +8296,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -8387,8 +8306,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "derive_more", "futures 0.3.21", @@ -8406,16 +8325,21 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "async-trait", "derive_more", + "fatality", "futures 0.3.21", "itertools 0.10.3", - "lru 0.7.5", + "kvdb", + "lru 0.7.6", "metered-channel", - "parity-scale-codec 2.3.1", + "parity-db", + "parity-scale-codec", + "parity-util-mem", + "parking_lot 0.11.2", "pin-project 1.0.10", "polkadot-node-jaeger", "polkadot-node-metrics", @@ -8429,19 +8353,19 @@ dependencies = [ "sp-core", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-overseer" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "futures 0.3.21", "futures-timer", - "lru 0.7.5", + "lru 0.7.6", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -8450,13 +8374,13 @@ dependencies = [ "polkadot-primitives", "sc-client-api", "sp-api", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-overseer-gen" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "async-trait", "futures 0.3.21", @@ -8467,15 +8391,16 @@ dependencies = [ "polkadot-node-primitives", "polkadot-overseer-gen-proc-macro", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-overseer-gen-proc-macro" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ - "proc-macro-crate 1.1.3", + "expander 0.0.6", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -8483,15 +8408,15 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "derive_more", "frame-support", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", - "scale-info 1.0.0", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -8500,8 +8425,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "env_logger", "kusama-runtime", @@ -8515,17 +8440,17 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bitvec", "frame-system", "hex-literal 0.3.4", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", - "scale-info 1.0.0", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -8545,12 +8470,12 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", - "jsonrpc-core", + "jsonrpsee", "pallet-mmr-rpc", "pallet-transaction-payment-rpc", "polkadot-primitives", @@ -8572,12 +8497,13 @@ dependencies = [ "sp-keystore", "sp-runtime", "substrate-frame-rpc-system", + "substrate-state-trie-migration-rpc", ] [[package]] name = "polkadot-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "beefy-primitives", "bitvec", @@ -8594,6 +8520,7 @@ dependencies = [ "pallet-bags-list", "pallet-balances", "pallet-bounties", + "pallet-child-bounties", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -8603,7 +8530,6 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", - "pallet-mmr-primitives", "pallet-multisig", "pallet-nicks", "pallet-offences", @@ -8621,13 +8547,13 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 1.0.0", + "scale-info", "serde", "serde_derive", "smallvec", @@ -8638,6 +8564,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime", @@ -8655,8 +8582,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "beefy-primitives", "bitvec", @@ -8677,11 +8604,11 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 1.0.0", + "scale-info", "serde", "serde_derive", "slot-range-helper", @@ -8700,8 +8627,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "frame-support", "polkadot-primitives", @@ -8712,11 +8639,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bs58", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-primitives", "sp-std", "sp-tracing", @@ -8724,8 +8651,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "bitflags", "bitvec", @@ -8741,13 +8668,13 @@ dependencies = [ "pallet-staking", "pallet-timestamp", "pallet-vesting", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", - "scale-info 1.0.0", + "scale-info", "serde", "sp-api", "sp-core", @@ -8764,8 +8691,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "async-trait", "beefy-gadget", @@ -8775,12 +8702,12 @@ dependencies = [ "hex-literal 0.3.4", "kvdb", "kvdb-rocksdb", - "lru 0.7.5", + "lru 0.7.6", "pallet-babe", "pallet-im-online", - "pallet-mmr-primitives", "pallet-staking", "pallet-transaction-payment-rpc-runtime-api", + "parity-db", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", @@ -8834,9 +8761,11 @@ dependencies = [ "sc-offchain", "sc-service", "sc-sync-state-rpc", + "sc-sysinfo", "sc-telemetry", "sc-transaction-pool", "serde", + "serde_json", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -8858,19 +8787,19 @@ dependencies = [ "sp-trie", "substrate-prometheus-endpoint", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-statement-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "arrayvec 0.5.2", - "derive_more", + "fatality", "futures 0.3.21", "indexmap", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8879,23 +8808,23 @@ dependencies = [ "sp-keystore", "sp-staking", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-statement-table" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-primitives", "sp-core", ] [[package]] name = "polkadot-test-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "beefy-primitives", "bitvec", @@ -8911,7 +8840,6 @@ dependencies = [ "pallet-balances", "pallet-grandpa", "pallet-indices", - "pallet-mmr-primitives", "pallet-nicks", "pallet-offences", "pallet-session", @@ -8923,13 +8851,13 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 1.0.0", + "scale-info", "serde", "serde_derive", "smallvec", @@ -8940,6 +8868,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", "sp-offchain", "sp-runtime", "sp-session", @@ -8956,8 +8885,8 @@ dependencies = [ [[package]] name = "polkadot-test-service" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "frame-benchmarking", "frame-system", @@ -9005,7 +8934,7 @@ dependencies = [ "tempfile", "test-runtime-constants", "tokio", - "tracing", + "tracing-gum", ] [[package]] @@ -9018,7 +8947,7 @@ dependencies = [ "libc", "log", "wepoll-ffi", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -9027,7 +8956,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ - "cpufeatures 0.2.2", + "cpufeatures", "opaque-debug 0.3.0", "universal-hash", ] @@ -9039,7 +8968,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cpufeatures", "opaque-debug 0.3.0", "universal-hash", ] @@ -9050,6 +8979,20 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +[[package]] +name = "prettytable-rs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" +dependencies = [ + "atty", + "csv", + "encode_unicode", + "lazy_static", + "term", + "unicode-width", +] + [[package]] name = "primitive-types" version = "0.8.0" @@ -9067,20 +9010,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ "fixed-hash", - "impl-codec", - "impl-rlp", - "impl-serde", - "scale-info 1.0.0", "uint", ] [[package]] -name = "proc-macro-crate" -version = "0.1.5" +name = "primitive-types" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ - "toml", + "fixed-hash", + "impl-codec", + "impl-rlp", + "impl-serde", + "scale-info", + "uint", ] [[package]] @@ -9133,17 +9077,40 @@ dependencies = [ ] [[package]] -name = "prometheus" -version = "0.13.1" +name = "prometheus" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cface98dfa6d645ea4c789839f176e4b072265d085bfcc48eaa8d137f58d3c39" +dependencies = [ + "cfg-if 1.0.0", + "fnv", + "lazy_static", + "memchr", + "parking_lot 0.12.0", + "thiserror", +] + +[[package]] +name = "prometheus-client" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a896938cc6018c64f279888b8c7559d3725210d5db9a3a1ee6bc7188d51d34" +dependencies = [ + "dtoa", + "itoa 1.0.2", + "owning_ref", + "prometheus-client-derive-text-encode", +] + +[[package]] +name = "prometheus-client-derive-text-encode" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cface98dfa6d645ea4c789839f176e4b072265d085bfcc48eaa8d137f58d3c39" +checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652" dependencies = [ - "cfg-if 1.0.0", - "fnv", - "lazy_static", - "memchr", - "parking_lot 0.12.0", - "thiserror", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -9152,7 +9119,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ - "bytes 1.1.0", + "bytes", "prost-derive", ] @@ -9162,7 +9129,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ - "bytes 1.1.0", + "bytes", "heck 0.3.3", "itertools 0.10.3", "lazy_static", @@ -9195,7 +9162,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ - "bytes 1.1.0", + "bytes", "prost", ] @@ -9236,9 +9203,9 @@ dependencies = [ [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -9250,7 +9217,7 @@ dependencies = [ "libc", "rand_core 0.3.1", "rdrand", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -9269,7 +9236,7 @@ dependencies = [ "rand_os", "rand_pcg 0.1.2", "rand_xorshift 0.1.1", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -9405,7 +9372,7 @@ checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" dependencies = [ "libc", "rand_core 0.4.2", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -9419,7 +9386,7 @@ dependencies = [ "libc", "rand_core 0.4.2", "rdrand", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -9441,6 +9408,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_pcg" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" +dependencies = [ + "rand_core 0.6.3", +] + [[package]] name = "rand_xorshift" version = "0.1.1" @@ -9513,6 +9489,17 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_users" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +dependencies = [ + "getrandom 0.1.16", + "redox_syscall 0.1.57", + "rust-argon2", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -9559,9 +9546,9 @@ dependencies = [ [[package]] name = "regalloc" -version = "0.0.33" +version = "0.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d808cff91dfca7b239d40b972ba628add94892b1d9e19a842aedc5cfae8ab1a" +checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" dependencies = [ "log", "rustc-hash", @@ -9603,18 +9590,18 @@ dependencies = [ "bitflags", "libc", "mach", - "winapi 0.3.9", + "winapi", ] [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "env_logger", - "jsonrpsee 0.8.0", + "jsonrpsee", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "serde", "serde_json", "sp-core", @@ -9629,7 +9616,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -9671,7 +9658,7 @@ dependencies = [ "spin", "untrusted", "web-sys", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -9680,7 +9667,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" dependencies = [ - "bytes 1.1.0", + "bytes", "rustc-hex", ] @@ -9697,9 +9684,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" +checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" dependencies = [ "libc", "librocksdb-sys", @@ -9707,9 +9694,10 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ + "beefy-merkle-tree", "beefy-primitives", "bp-messages", "bp-rococo", @@ -9736,7 +9724,6 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-mmr", - "pallet-mmr-primitives", "pallet-multisig", "pallet-offences", "pallet-proxy", @@ -9748,13 +9735,13 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rococo-runtime-constants", - "scale-info 1.0.0", + "scale-info", "serde", "serde_derive", "smallvec", @@ -9765,6 +9752,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", "sp-offchain", "sp-runtime", "sp-session", @@ -9780,8 +9768,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "frame-support", "polkadot-primitives", @@ -9811,7 +9799,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "rtnetlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f54290e54521dac3de4149d83ddf9f62a359b3cc93bcb494a794a41e6f4744b" +dependencies = [ + "async-global-executor", + "futures 0.3.21", + "log", + "netlink-packet-route", + "netlink-proto", + "nix", + "thiserror", +] + +[[package]] +name = "rust-argon2" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" +dependencies = [ + "base64", + "blake2b_simd 0.5.11", + "constant_time_eq", + "crossbeam-utils", ] [[package]] @@ -9872,16 +9887,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.31.3" +version = "0.33.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dcfc2778a90e38f56a708bfc90572422e11d6c7ee233d053d1f782cf9df6d2" +checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -9995,7 +10010,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "log", "sp-core", @@ -10006,7 +10021,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "futures 0.3.21", @@ -10014,7 +10029,7 @@ dependencies = [ "ip_network", "libp2p", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "prost", "prost-build", "rand 0.7.3", @@ -10033,12 +10048,12 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -10056,9 +10071,9 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-client-api", "sp-api", "sp-block-builder", @@ -10072,11 +10087,11 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-chain-spec-derive", "sc-network", "sc-telemetry", @@ -10089,9 +10104,9 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -10100,7 +10115,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "chrono", "clap 3.1.18", @@ -10110,11 +10125,12 @@ dependencies = [ "libp2p", "log", "names", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "rand 0.7.3", "regex", "rpassword", "sc-client-api", + "sc-client-db", "sc-keystore", "sc-network", "sc-service", @@ -10138,14 +10154,14 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "fnv", "futures 0.3.21", "hash-db", "log", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -10166,7 +10182,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "hash-db", "kvdb", @@ -10175,8 +10191,8 @@ dependencies = [ "linked-hash-map", "log", "parity-db", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "sc-client-api", "sc-state-db", "sp-arithmetic", @@ -10191,14 +10207,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sc-utils", "serde", @@ -10215,12 +10231,12 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "futures 0.3.21", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -10244,7 +10260,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "fork-tree", @@ -10254,8 +10270,8 @@ dependencies = [ "num-bigint 0.2.6", "num-rational 0.2.4", "num-traits", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -10287,12 +10303,10 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", @@ -10311,10 +10325,10 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "fork-tree", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", @@ -10324,13 +10338,13 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-telemetry", @@ -10349,7 +10363,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "sc-client-api", "sp-authorship", @@ -10360,14 +10374,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "lazy_static", - "libsecp256k1 0.7.0", - "log", - "lru 0.6.6", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "lru 0.7.6", + "parity-scale-codec", + "parking_lot 0.12.0", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -10382,19 +10394,20 @@ dependencies = [ "sp-trie", "sp-version", "sp-wasm-interface", + "tracing", "wasmi", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "environmental", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-allocator", - "sp-core", "sp-maybe-compressed-blob", + "sp-sandbox", "sp-serializer", "sp-wasm-interface", "thiserror", @@ -10405,15 +10418,14 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-allocator", "sc-executor-common", - "scoped-tls", - "sp-core", "sp-runtime-interface", + "sp-sandbox", "sp-wasm-interface", "wasmi", ] @@ -10421,17 +10433,17 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "cfg-if 1.0.0", "libc", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", - "sp-core", "sp-runtime-interface", + "sp-sandbox", "sp-wasm-interface", "wasmtime", ] @@ -10439,17 +10451,19 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ + "ahash", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", "futures 0.3.21", "futures-timer", + "hex", "log", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "rand 0.8.5", "sc-block-builder", "sc-chain-spec", @@ -10477,16 +10491,13 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "finality-grandpa", "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", + "jsonrpsee", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-client-api", "sc-finality-grandpa", "sc-rpc", @@ -10501,7 +10512,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "ansi_term", "futures 0.3.21", @@ -10518,11 +10529,11 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "hex", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde_json", "sp-application-crypto", "sp-core", @@ -10533,13 +10544,12 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "async-std", "async-trait", - "asynchronous-codec 0.5.0", + "asynchronous-codec", "bitflags", - "bytes 1.1.0", + "bytes", "cid", "either", "fnv", @@ -10552,9 +10562,9 @@ dependencies = [ "linked-hash-map", "linked_hash_set", "log", - "lru 0.7.5", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "lru 0.7.6", + "parity-scale-codec", + "parking_lot 0.12.0", "pin-project 1.0.10", "prost", "prost-build", @@ -10562,6 +10572,8 @@ dependencies = [ "sc-block-builder", "sc-client-api", "sc-consensus", + "sc-network-common", + "sc-network-sync", "sc-peerset", "sc-utils", "serde", @@ -10575,33 +10587,76 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "thiserror", - "unsigned-varint 0.6.0", + "unsigned-varint", "void", "zeroize", ] +[[package]] +name = "sc-network-common" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +dependencies = [ + "futures 0.3.21", + "libp2p", + "parity-scale-codec", + "prost-build", + "sc-peerset", + "smallvec", +] + [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ + "ahash", "futures 0.3.21", "futures-timer", "libp2p", "log", - "lru 0.7.5", + "lru 0.7.6", "sc-network", "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] +[[package]] +name = "sc-network-sync" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +dependencies = [ + "bitflags", + "either", + "fork-tree", + "futures 0.3.21", + "libp2p", + "log", + "lru 0.7.6", + "parity-scale-codec", + "prost", + "prost-build", + "sc-client-api", + "sc-consensus", + "sc-network-common", + "sc-peerset", + "smallvec", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-finality-grandpa", + "sp-runtime", + "thiserror", +] + [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "futures 0.3.21", "futures-timer", @@ -10610,8 +10665,8 @@ dependencies = [ "hyper-rustls", "num_cpus", "once_cell", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", "sc-network", @@ -10627,7 +10682,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "futures 0.3.21", "libp2p", @@ -10640,7 +10695,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10649,15 +10704,14 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "futures 0.3.21", "hash-db", - "jsonrpc-core", - "jsonrpc-pubsub", + "jsonrpsee", "log", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -10680,18 +10734,16 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", + "jsonrpsee", "log", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", + "scale-info", "serde", "serde_json", "sp-core", @@ -10705,14 +10757,10 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-http-server", - "jsonrpc-ipc-server", - "jsonrpc-pubsub", - "jsonrpc-ws-server", + "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", @@ -10722,7 +10770,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "directories", @@ -10730,12 +10778,11 @@ dependencies = [ "futures 0.3.21", "futures-timer", "hash-db", - "jsonrpc-core", - "jsonrpc-pubsub", + "jsonrpsee", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "sc-block-builder", @@ -10747,9 +10794,11 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", + "sc-network-common", "sc-offchain", "sc-rpc", "sc-rpc-server", + "sc-sysinfo", "sc-telemetry", "sc-tracing", "sc-transaction-pool", @@ -10786,13 +10835,13 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sp-core", ] @@ -10800,18 +10849,15 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "parity-scale-codec 2.3.1", + "jsonrpsee", + "parity-scale-codec", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", "sc-consensus-epochs", "sc-finality-grandpa", - "sc-rpc-api", "serde", "serde_json", "sp-blockchain", @@ -10819,16 +10865,35 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-sysinfo" +version = "6.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +dependencies = [ + "futures 0.3.21", + "libc", + "log", + "rand 0.7.3", + "rand_pcg 0.2.1", + "regex", + "sc-telemetry", + "serde", + "serde_json", + "sp-core", + "sp-io", + "sp-std", +] + [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "chrono", "futures 0.3.21", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "serde", @@ -10840,7 +10905,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "ansi_term", "atty", @@ -10849,7 +10914,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rustc-hash", "sc-client-api", @@ -10871,9 +10936,9 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -10882,15 +10947,15 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "futures 0.3.21", "futures-timer", "linked-hash-map", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -10909,7 +10974,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "futures 0.3.21", "log", @@ -10922,51 +10987,28 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "futures 0.3.21", "futures-timer", "lazy_static", - "parking_lot 0.11.2", + "log", + "parking_lot 0.12.0", "prometheus", ] -[[package]] -name = "scale-info" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" -dependencies = [ - "bitvec", - "cfg-if 1.0.0", - "derive_more", - "parity-scale-codec 2.3.1", - "scale-info-derive 1.0.0", - "serde", -] - [[package]] name = "scale-info" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a" dependencies = [ + "bitvec", "cfg-if 1.0.0", "derive_more", - "parity-scale-codec 3.1.2", - "scale-info-derive 2.1.2", -] - -[[package]] -name = "scale-info-derive" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" -dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", + "parity-scale-codec", + "scale-info-derive", + "serde", ] [[package]] @@ -10975,7 +11017,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -11009,12 +11051,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - [[package]] name = "scopeguard" version = "1.1.0" @@ -11065,6 +11101,15 @@ dependencies = [ "serde", ] +[[package]] +name = "secp256k1" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" +dependencies = [ + "secp256k1-sys", +] + [[package]] name = "secp256k1-sys" version = "0.4.2" @@ -11197,6 +11242,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_nanos" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e" +dependencies = [ + "serde", +] + [[package]] name = "sha-1" version = "0.8.2" @@ -11217,7 +11271,7 @@ checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -11242,7 +11296,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -11254,7 +11308,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cpufeatures", "digest 0.10.3", ] @@ -11270,6 +11324,16 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha3" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" +dependencies = [ + "digest 0.10.3", + "keccak", +] + [[package]] name = "sharded-slab" version = "0.1.4" @@ -11334,11 +11398,11 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "slot-range-helper" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "enumn", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "paste", "sp-runtime", "sp-std", @@ -11367,31 +11431,19 @@ checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" [[package]] name = "snow" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" +checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ "aes-gcm", - "blake2", - "chacha20poly1305 0.8.0", - "rand 0.8.5", + "blake2 0.10.4", + "chacha20poly1305", + "curve25519-dalek 4.0.0-pre.1", "rand_core 0.6.3", "ring", - "rustc_version 0.3.3", - "sha2 0.9.9", + "rustc_version 0.4.0", + "sha2 0.10.2", "subtle 2.4.1", - "x25519-dalek", -] - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", ] [[package]] @@ -11401,7 +11453,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -11411,7 +11463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ "base64", - "bytes 1.1.0", + "bytes", "flate2", "futures 0.3.21", "httparse", @@ -11423,11 +11475,11 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "hash-db", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-api-proc-macro", "sp-core", "sp-runtime", @@ -11440,10 +11492,10 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "blake2-rfc", - "proc-macro-crate 1.1.3", + "blake2 0.10.4", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -11451,11 +11503,11 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -11464,13 +11516,13 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-debug-derive", "sp-std", @@ -11480,10 +11532,10 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-runtime", @@ -11493,10 +11545,10 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-inherents", "sp-runtime", "sp-std", @@ -11505,9 +11557,9 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -11517,13 +11569,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "futures 0.3.21", "log", - "lru 0.7.5", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "lru 0.7.6", + "parity-scale-codec", + "parking_lot 0.12.0", "sp-api", "sp-consensus", "sp-database", @@ -11535,13 +11587,13 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-core", "sp-inherents", "sp-runtime", @@ -11554,11 +11606,11 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-consensus", @@ -11572,12 +11624,12 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "merlin", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -11595,21 +11647,24 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", + "scale-info", "schnorrkel", "sp-core", "sp-runtime", @@ -11618,8 +11673,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "base58", "bitflags", @@ -11637,17 +11692,17 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", - "primitive-types 0.10.1", + "parking_lot 0.12.0", + "primitive-types 0.11.1", "rand 0.7.3", "regex", - "scale-info 1.0.0", + "scale-info", "schnorrkel", + "secp256k1 0.21.3", "secrecy", "serde", - "sha2 0.10.2", "sp-core-hashing", "sp-debug-derive", "sp-externalities", @@ -11658,8 +11713,6 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", - "tiny-keccak", - "twox-hash", "wasmi", "zeroize", ] @@ -11667,20 +11720,21 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "blake2-rfc", + "blake2 0.10.4", "byteorder", + "digest 0.10.3", "sha2 0.10.2", + "sha3 0.10.1", "sp-std", - "tiny-keccak", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "proc-macro2", "quote", @@ -11691,16 +11745,16 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "kvdb", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "proc-macro2", "quote", @@ -11709,11 +11763,11 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "environmental", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-std", "sp-storage", ] @@ -11721,12 +11775,12 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "finality-grandpa", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -11739,11 +11793,11 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "impl-trait-for-tuples", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-core", "sp-runtime", "sp-std", @@ -11752,15 +11806,16 @@ dependencies = [ [[package]] name = "sp-io" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "futures 0.3.21", "hash-db", "libsecp256k1 0.7.0", "log", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", + "secp256k1 0.21.3", "sp-core", "sp-externalities", "sp-keystore", @@ -11776,8 +11831,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "lazy_static", "sp-core", @@ -11787,14 +11842,14 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "futures 0.3.21", "merlin", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "schnorrkel", "serde", "sp-core", @@ -11805,42 +11860,45 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "thiserror", "zstd", ] [[package]] -name = "sp-npos-elections" +name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "log", + "parity-scale-codec", "serde", - "sp-arithmetic", + "sp-api", "sp-core", - "sp-npos-elections-solution-type", + "sp-debug-derive", "sp-runtime", "sp-std", ] [[package]] -name = "sp-npos-elections-solution-type" +name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", + "parity-scale-codec", + "scale-info", + "serde", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "sp-api", "sp-core", @@ -11850,7 +11908,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "backtrace", "lazy_static", @@ -11859,8 +11917,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "rustc-hash", "serde", @@ -11869,18 +11927,18 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parity-util-mem", "paste", "rand 0.7.3", - "scale-info 1.0.0", + "scale-info", "serde", "sp-application-crypto", "sp-arithmetic", @@ -11891,12 +11949,12 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec 2.3.1", - "primitive-types 0.10.1", + "parity-scale-codec", + "primitive-types 0.11.1", "sp-externalities", "sp-runtime-interface-proc-macro", "sp-std", @@ -11908,20 +11966,34 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "Inflector", - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", ] +[[package]] +name = "sp-sandbox" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +dependencies = [ + "log", + "parity-scale-codec", + "sp-core", + "sp-io", + "sp-std", + "sp-wasm-interface", + "wasmi", +] + [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "serde", "serde_json", @@ -11930,10 +12002,10 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -11944,24 +12016,24 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] [[package]] name = "sp-state-machine" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "hash-db", "log", "num-traits", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", + "parity-scale-codec", + "parking_lot 0.12.0", "rand 0.7.3", "smallvec", "sp-core", @@ -11971,22 +12043,21 @@ dependencies = [ "sp-trie", "thiserror", "tracing", - "trie-db", "trie-root", ] [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" [[package]] name = "sp-storage" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "impl-serde", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "ref-cast", "serde", "sp-debug-derive", @@ -11996,7 +12067,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "log", "sp-core", @@ -12009,12 +12080,12 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "futures-timer", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -12024,10 +12095,10 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-std", "tracing", "tracing-core", @@ -12037,7 +12108,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "sp-api", "sp-runtime", @@ -12046,12 +12117,12 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-inherents", "sp-runtime", @@ -12061,28 +12132,29 @@ dependencies = [ [[package]] name = "sp-trie" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "hash-db", "memory-db", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "sp-core", "sp-std", + "thiserror", "trie-db", "trie-root", ] [[package]] name = "sp-version" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "impl-serde", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parity-wasm 0.42.2", - "scale-info 1.0.0", + "scale-info", "serde", "sp-core-hashing-proc-macro", "sp-runtime", @@ -12094,9 +12166,9 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", "proc-macro2", "quote", "syn", @@ -12104,12 +12176,12 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "impl-trait-for-tuples", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-std", "wasmi", "wasmtime", @@ -12142,9 +12214,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.18.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb8b72a924ccfe7882d0e26144c114503760a4d1248bb5cd06c8ab2d55404cc" +checksum = "5e1e7c268f5610088463d23188fc9e764cda491784360e5e4ea3a8ce1e0e2ac9" dependencies = [ "Inflector", "num-format", @@ -12259,6 +12331,15 @@ dependencies = [ "strum_macros 0.23.1", ] +[[package]] +name = "strum" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8" +dependencies = [ + "strum_macros 0.24.0", +] + [[package]] name = "strum_macros" version = "0.21.1" @@ -12284,6 +12365,19 @@ dependencies = [ "syn", ] +[[package]] +name = "strum_macros" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + [[package]] name = "substrate-bip39" version = "0.4.4" @@ -12309,36 +12403,25 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "platforms 2.0.0", ] -[[package]] -name = "substrate-fixed" -version = "0.5.9" -source = "git+https://github.com/encointer/substrate-fixed#a4fb461aae6205ffc55bed51254a40c52be04e5d" -dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.2", - "typenum 1.16.0", -] - [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", + "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", @@ -12349,9 +12432,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ - "async-std", "futures-util", "hyper", "log", @@ -12360,15 +12442,36 @@ dependencies = [ "tokio", ] +[[package]] +name = "substrate-state-trie-migration-rpc" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +dependencies = [ + "jsonrpsee", + "log", + "parity-scale-codec", + "sc-client-api", + "sc-rpc-api", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "trie-db", +] + [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "async-trait", "futures 0.3.21", "hex", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sc-client-api", "sc-client-db", "sc-consensus", @@ -12389,7 +12492,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "ansi_term", "build-helper", @@ -12437,6 +12540,27 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "system-configuration" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +dependencies = [ + "bitflags", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -12460,7 +12584,18 @@ dependencies = [ "libc", "redox_syscall 0.2.13", "remove_dir_all", - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "term" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" +dependencies = [ + "byteorder", + "dirs", + "winapi", ] [[package]] @@ -12474,8 +12609,8 @@ dependencies = [ [[package]] name = "test-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "frame-support", "polkadot-primitives", @@ -12519,6 +12654,12 @@ dependencies = [ "syn", ] +[[package]] +name = "thousands" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" + [[package]] name = "thread_local" version = "1.1.4" @@ -12550,6 +12691,17 @@ dependencies = [ "threadpool", ] +[[package]] +name = "tikv-jemalloc-sys" +version = "0.4.3+5.2.1-patched.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + [[package]] name = "time" version = "0.1.44" @@ -12558,7 +12710,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -12610,17 +12762,18 @@ version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" dependencies = [ - "bytes 1.1.0", + "bytes", "libc", "memchr", - "mio 0.8.3", + "mio", "num_cpus", "once_cell", + "parking_lot 0.12.0", "pin-project-lite 0.2.9", "signal-hook-registry", - "socket2 0.4.4", + "socket2", "tokio-macros", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -12674,9 +12827,8 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-core", - "futures-io", "futures-sink", "log", "pin-project-lite 0.2.9", @@ -12689,8 +12841,9 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-core", + "futures-io", "futures-sink", "pin-project-lite 0.2.9", "tokio", @@ -12755,14 +12908,39 @@ dependencies = [ "tracing", ] +[[package]] +name = "tracing-gum" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +dependencies = [ + "polkadot-node-jaeger", + "polkadot-primitives", + "tracing", + "tracing-gum-proc-macro", +] + +[[package]] +name = "tracing-gum-proc-macro" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +dependencies = [ + "expander 0.0.6", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tracing-log" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ + "ahash", "lazy_static", "log", + "lru 0.7.6", "tracing-core", ] @@ -12833,9 +13011,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.20.4" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca94d4e9feb6a181c690c4040d7a24ef34018d8313ac5044a61d21222ae24e31" +checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -12844,7 +13022,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna 0.2.3", + "idna", "ipnet", "lazy_static", "log", @@ -12852,14 +13030,14 @@ dependencies = [ "smallvec", "thiserror", "tinyvec", - "url 2.2.2", + "url", ] [[package]] name = "trust-dns-resolver" -version = "0.20.4" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecae383baad9995efaa34ce8e57d12c3f305e545887472a492b838f4b5cfb77a" +checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" dependencies = [ "cfg-if 1.0.0", "futures-util", @@ -12867,7 +13045,7 @@ dependencies = [ "lazy_static", "log", "lru-cache", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "resolv-conf", "smallvec", "thiserror", @@ -12883,12 +13061,12 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" dependencies = [ "clap 3.1.18", - "jsonrpsee 0.4.1", + "jsonrpsee", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "remote-externalities", "sc-chain-spec", "sc-cli", @@ -12918,6 +13096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if 1.0.0", + "digest 0.10.3", "rand 0.8.5", "static_assertions", ] @@ -12950,15 +13129,6 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -[[package]] -name = "typenum" -version = "1.16.0" -source = "git+https://github.com/encointer/typenum?tag=v1.16.0#4c8dddaa8bdd13130149e43b4085ad14e960617f" -dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.2", -] - [[package]] name = "ucd-trie" version = "0.1.3" @@ -13035,32 +13205,14 @@ dependencies = [ "subtle 2.4.1", ] -[[package]] -name = "unsigned-varint" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" - -[[package]] -name = "unsigned-varint" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2" -dependencies = [ - "asynchronous-codec 0.5.0", - "bytes 1.1.0", - "futures-io", - "futures-util", -] - [[package]] name = "unsigned-varint" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", + "asynchronous-codec", + "bytes", "futures-io", "futures-util", ] @@ -13071,17 +13223,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - [[package]] name = "url" version = "2.2.2" @@ -13089,9 +13230,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", - "idna 0.2.3", + "idna", "matches", - "percent-encoding 2.1.0", + "percent-encoding", ] [[package]] @@ -13147,7 +13288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", - "winapi 0.3.9", + "winapi", "winapi-util", ] @@ -13288,6 +13429,7 @@ checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" dependencies = [ "downcast-rs", "libc", + "libm", "memory_units", "num-rational 0.2.4", "num-traits", @@ -13306,31 +13448,30 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.81.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc" +checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wasmtime" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9c724da92e39a85d2231d4c2a942c8be295211441dbca581c6c3f3f45a9f00" +checksum = "21ffb4705016d5ca91e18a72ed6822dab50e6d5ddd7045461b17ef19071cdef1" dependencies = [ "anyhow", "backtrace", "bincode", "cfg-if 1.0.0", - "cpp_demangle", "indexmap", "lazy_static", "libc", "log", "object 0.27.1", + "once_cell", "paste", "psm", "rayon", "region", - "rustc-demangle", "serde", "target-lexicon", "wasmparser", @@ -13339,14 +13480,14 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "winapi 0.3.9", + "winapi", ] [[package]] name = "wasmtime-cache" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4439d99100298344567c0eb6916ad5864e99e54760b8177c427e529077fb30" +checksum = "85c6ab24291fa7cb3a181f5669f6c72599b7ef781669759b45c7828c5999d0c0" dependencies = [ "anyhow", "base64", @@ -13358,15 +13499,15 @@ dependencies = [ "serde", "sha2 0.9.9", "toml", - "winapi 0.3.9", + "winapi", "zstd", ] [[package]] name = "wasmtime-cranelift" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1762765dd69245f00e5d9783b695039e449a7be0f9c5383e4c78465dd6131aeb" +checksum = "f04c810078a491b7bc4866ebe045f714d2b95e6b539e1f64009a4a7606be11de" dependencies = [ "anyhow", "cranelift-codegen", @@ -13386,9 +13527,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4468301d95ec71710bb6261382efe27d1296447711645e3dbabaea6e4de3504" +checksum = "61448266ea164b1ac406363cdcfac81c7c44db4d94c7a81c8620ac6c5c6cdf59" dependencies = [ "anyhow", "cranelift-entity", @@ -13406,38 +13547,52 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0ae6e581ff014b470ec35847ea3c0b4c3ace89a55df5a04c802a11f4574e7d" +checksum = "156b4623c6b0d4b8c24afb846c20525922f538ef464cc024abab7ea8de2109a2" dependencies = [ "addr2line", "anyhow", "bincode", "cfg-if 1.0.0", + "cpp_demangle", "gimli", + "log", "object 0.27.1", "region", + "rustc-demangle", "rustix", "serde", "target-lexicon", "thiserror", "wasmtime-environ", + "wasmtime-jit-debug", "wasmtime-runtime", - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "wasmtime-jit-debug" +version = "0.35.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5dc31f811760a6c76b2672c404866fd19b75e5fb3b0075a3e377a6846490654" +dependencies = [ + "lazy_static", + "object 0.27.1", + "rustix", ] [[package]] name = "wasmtime-runtime" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9c28877ae37a367cda7b52b8887589816152e95dde9b7c80cc686f52761961" +checksum = "f907beaff69d4d920fa4688411ee4cc75c0f01859e424677f9e426e2ef749864" dependencies = [ "anyhow", "backtrace", "cc", "cfg-if 1.0.0", "indexmap", - "lazy_static", "libc", "log", "mach", @@ -13448,14 +13603,15 @@ dependencies = [ "rustix", "thiserror", "wasmtime-environ", - "winapi 0.3.9", + "wasmtime-jit-debug", + "winapi", ] [[package]] name = "wasmtime-types" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395726e8f5dd8c57cb0db445627b842343f7e29ed7489467fdf7953ed9d3cd4f" +checksum = "514ef0e5fd197b9609dc9eb74beba0c84d5a12b2417cbae55534633329ba4852" dependencies = [ "cranelift-entity", "serde", @@ -13476,7 +13632,7 @@ dependencies = [ [[package]] name = "webb-primitives" version = "0.1.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#fee902ed45cacb7fea0e07e34f32826f5822b863" +source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" dependencies = [ "ark-bls12-377", "ark-bls12-381", @@ -13489,41 +13645,31 @@ dependencies = [ "ark-serialize", "ark-std", "arkworks-native-gadgets", - "blake2", + "blake2 0.9.2", "digest 0.9.0", "ethabi", "frame-support", "frame-system", "hex-literal 0.3.4", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", + "sp-consensus-aura", + "sp-consensus-babe", "sp-core", "sp-io", "sp-runtime", "sp-std", - "webb-proposals 0.3.0", -] - -[[package]] -name = "webb-proposals" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e819886dd31a2710cfaa4c6fb986d25e4bc3c9ea064307e77f63d7d989b3e14" -dependencies = [ - "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "webb-proposals", ] [[package]] name = "webb-proposals" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d863cca3332dff166330d4dafdc73d2ac6d4124336a52f013e2c698af5c52b" +version = "0.4.0" +source = "git+https://github.com/webb-tools/webb-rs?branch=drew/update-version#c0adc7767b905e6757fd116ff467e5597466e7c2" dependencies = [ "num-traits", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "typed-builder 0.10.0", ] @@ -13547,15 +13693,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" -dependencies = [ - "webpki 0.21.4", -] - [[package]] name = "webpki-roots" version = "0.22.3" @@ -13587,15 +13724,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - -[[package]] -name = "winapi" -version = "0.2.8" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" [[package]] name = "winapi" @@ -13607,12 +13738,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -13625,7 +13750,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -13634,43 +13759,86 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac7fef12f4b59cd0a29339406cc9203ab44e440ddff6b3f5a41455349fa9cf3" +dependencies = [ + "windows_aarch64_msvc 0.29.0", + "windows_i686_gnu 0.29.0", + "windows_i686_msvc 0.29.0", + "windows_x86_64_gnu 0.29.0", + "windows_x86_64_msvc 0.29.0", +] + [[package]] name = "windows-sys" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", ] +[[package]] +name = "windows_aarch64_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_i686_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58" + [[package]] name = "windows_i686_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4" + [[package]] name = "windows_i686_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_x86_64_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" @@ -13679,29 +13847,22 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "winreg" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] -name = "ws2_32-sys" -version = "0.2.1" +name = "wyz" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "tap", ] -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "x25519-dalek" version = "1.1.1" @@ -13715,29 +13876,29 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "derivative", "impl-trait-for-tuples", "log", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec", + "scale-info", "xcm-procedural", ] [[package]] name = "xcm-builder" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "frame-support", "frame-system", "log", "pallet-transaction-payment", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "polkadot-parachain", - "scale-info 1.0.0", + "scale-info", "sp-arithmetic", "sp-io", "sp-runtime", @@ -13748,13 +13909,13 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "frame-support", "impl-trait-for-tuples", "log", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-arithmetic", "sp-core", "sp-io", @@ -13766,7 +13927,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" dependencies = [ "Inflector", "proc-macro2", @@ -13776,14 +13937,14 @@ dependencies = [ [[package]] name = "yamux" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107" +checksum = "0c0608f53c1dc0bad505d03a34bbd49fbf2ad7b51eb036123e896365532745a1" dependencies = [ "futures 0.3.21", "log", "nohash-hasher", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.8.5", "static_assertions", ] @@ -13828,18 +13989,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.9.2+zstd.1.5.1" +version = "0.10.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" +checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.3+zstd.1.5.1" +version = "4.1.6+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" +checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" dependencies = [ "libc", "zstd-sys", @@ -13847,9 +14008,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.2+zstd.1.5.1" +version = "1.6.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" +checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" dependencies = [ "cc", "libc", diff --git a/README.md b/README.md index 125a0e414..cad56264d 100644 --- a/README.md +++ b/README.md @@ -225,7 +225,7 @@ git clone https://github.com/paritytech/polkadot.git cd polkadot # Checkout the proper commit -git checkout v0.9.17 +git checkout v0.9.22 # Build the relay chain Node cargo build --release diff --git a/node/Cargo.toml b/node/Cargo.toml index b42eaa10b..60428fd50 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -13,7 +13,7 @@ build = "build.rs" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [[bin]] name = "egg-collator" @@ -28,7 +28,7 @@ rococo-native = [ [dependencies] derive_more = "0.99.2" log = "0.4.14" -codec = { package = "parity-scale-codec", version = "2.0.0" } +codec = { package = "parity-scale-codec", version = "3" } structopt = "0.3.8" serde = { version = "1.0.119", features = ["derive"] } hex-literal = "0.3.1" @@ -50,60 +50,60 @@ ark-serialize = { version = "^0.3.0", default-features = false } ark-bn254 = { version = "^0.3.0", default-features = false, features = [ "curve" ] } # Substrate Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } ## Substrate Client Dependencies -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", features = ["wasmtime"] } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", features = ["wasmtime"] } +sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } ## Substrate Primitive Dependencies -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } # Cumulus dependencies -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } # Polkadot dependencies -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17"} -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17"} -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17"} -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17"} -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17"} \ No newline at end of file +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22"} +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22"} +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22"} +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22"} +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22"} \ No newline at end of file diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index a2736db48..093cf1647 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -292,6 +292,7 @@ fn testnet_genesis( balances: egg_runtime::BalancesConfig { balances: endowed_accounts.iter().cloned().map(|k| (k, MILLIUNIT * 4096_000)).collect(), }, + indices: Default::default(), parachain_info: egg_runtime::ParachainInfoConfig { parachain_id: id }, collator_selection: egg_runtime::CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _, _)| acc).collect(), diff --git a/node/src/lib.rs b/node/src/lib.rs index aff919855..3df9608d8 100644 --- a/node/src/lib.rs +++ b/node/src/lib.rs @@ -13,4 +13,5 @@ // limitations under the License. pub mod chain_spec; +pub mod rpc; pub mod service; diff --git a/node/src/main.rs b/node/src/main.rs index b1964f4a9..a87ce828c 100644 --- a/node/src/main.rs +++ b/node/src/main.rs @@ -21,6 +21,7 @@ mod chain_spec; mod service; mod cli; mod command; +mod rpc; fn main() -> sc_cli::Result<()> { command::run() diff --git a/node/src/rpc.rs b/node/src/rpc.rs new file mode 100644 index 000000000..8b646a5f3 --- /dev/null +++ b/node/src/rpc.rs @@ -0,0 +1,58 @@ +//! A collection of node-specific RPC methods. +//! Substrate provides the `sc-rpc` crate, which defines the core RPC layer +//! used by Substrate nodes. This file extends those RPC definitions with +//! capabilities that are specific to this project's runtime configuration. + +#![warn(missing_docs)] + +use std::sync::Arc; + +use egg_runtime::{opaque::Block, AccountId, Balance, Index as Nonce}; + +use sc_client_api::AuxStore; +pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor}; +use sc_transaction_pool_api::TransactionPool; +use sp_api::ProvideRuntimeApi; +use sp_block_builder::BlockBuilder; +use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; + +/// A type representing all RPC extensions. +pub type RpcExtension = jsonrpsee::RpcModule<()>; + +/// Full client dependencies +pub struct FullDeps { + /// The client instance to use. + pub client: Arc, + /// Transaction pool instance. + pub pool: Arc

, + /// Whether to deny unsafe calls + pub deny_unsafe: DenyUnsafe, +} + +/// Instantiate all RPC extensions. +pub fn create_full( + deps: FullDeps, +) -> Result> +where + C: ProvideRuntimeApi + + HeaderBackend + + AuxStore + + HeaderMetadata + + Send + + Sync + + 'static, + C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, + C::Api: substrate_frame_rpc_system::AccountNonceApi, + C::Api: BlockBuilder, + P: TransactionPool + Sync + Send + 'static, +{ + use pallet_transaction_payment_rpc::{TransactionPaymentApiServer, TransactionPaymentRpc}; + use substrate_frame_rpc_system::{SystemApiServer, SystemRpc}; + + let mut module = RpcExtension::new(()); + let FullDeps { client, pool, deny_unsafe } = deps; + + module.merge(SystemRpc::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?; + module.merge(TransactionPaymentRpc::new(client.clone()).into_rpc())?; + Ok(module) +} diff --git a/node/src/service.rs b/node/src/service.rs index c09969692..b12051030 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -12,10 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. +//! Service and ServiceFactory implementation. Specialized wrapper over substrate service. + +// std use std::{sync::Arc, time::Duration}; +// rpc +use jsonrpsee::RpcModule; + +use cumulus_client_cli::CollatorOptions; // Local Runtime Types -use egg_runtime::{AccountId, Balance, Index as Nonce, RuntimeApi}; +use egg_runtime::{opaque::Block, AccountId, Balance, Hash, Index as Nonce, RuntimeApi}; // Cumulus Imports use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; @@ -25,48 +32,43 @@ use cumulus_client_service::{ prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; use cumulus_primitives_core::ParaId; -use cumulus_relay_chain_interface::RelayChainInterface; -use cumulus_relay_chain_local::build_relay_chain_interface; +use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; +use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; +use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; // Substrate Imports use sc_client_api::ExecutorProvider; use sc_executor::NativeElseWasmExecutor; use sc_network::NetworkService; -use sc_service::{ - BasePath, Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager, -}; +use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sp_api::ConstructRuntimeApi; -use sp_consensus::SlotData; use sp_keystore::SyncCryptoStorePtr; use sp_runtime::traits::BlakeTwo256; use substrate_prometheus_endpoint::Registry; -// Runtime type overrides -type BlockNumber = u32; -type Header = sp_runtime::generic::Header; -pub type Block = sp_runtime::generic::Block; -type Hash = sp_core::H256; +use polkadot_service::CollatorPair; -pub struct RuntimeExecutor; +/// Native executor instance. +pub struct TemplateRuntimeExecutor; -impl sc_executor::NativeExecutionDispatch for RuntimeExecutor { +impl sc_executor::NativeExecutionDispatch for TemplateRuntimeExecutor { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { - egg_runtime::api::dispatch(method, data) + parachain_template_runtime::api::dispatch(method, data) } fn native_version() -> sc_executor::NativeVersion { - egg_runtime::native_version() + parachain_template_runtime::native_version() } } -pub type DKGRuntimeExecutor = NativeElseWasmExecutor; /// Starts a `ServiceBuilder` for a full service. /// /// Use this macro if you don't actually need the full service, but just the builder in order to /// be able to perform chain operations. +#[allow(clippy::type_complexity)] pub fn new_partial( config: &Configuration, build_import_queue: BIQ, @@ -99,12 +101,7 @@ where Block, StateBackend = sc_client_api::StateBackendFor, Block>, > + sp_offchain::OffchainWorkerApi - + sp_block_builder::BlockBuilder - + cumulus_primitives_core::CollectCollationInfo - + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + substrate_frame_rpc_system::AccountNonceApi - + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + substrate_frame_rpc_system::AccountNonceApi, + + sp_block_builder::BlockBuilder, sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, Executor: sc_executor::NativeExecutionDispatch + 'static, BIQ: FnOnce( @@ -140,7 +137,7 @@ where let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::( - &config, + config, telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), executor, )?; @@ -182,6 +179,27 @@ where Ok(params) } +async fn build_relay_chain_interface( + polkadot_config: Configuration, + parachain_config: &Configuration, + telemetry_worker_handle: Option, + task_manager: &mut TaskManager, + collator_options: CollatorOptions, + hwbench: Option, +) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option)> { + match collator_options.relay_chain_rpc_url { + Some(relay_chain_url) => + Ok((Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, None)), + None => build_inprocess_relay_chain( + polkadot_config, + parachain_config, + telemetry_worker_handle, + task_manager, + hwbench, + ), + } +} + /// Start a node with the given parachain `Configuration` and relay chain `Configuration`. /// /// This is the actual implementation that is abstract over the executor and the runtime api. @@ -189,10 +207,12 @@ where async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, + collator_options: CollatorOptions, id: ParaId, - rpc_ext_builder: RB, + _rpc_ext_builder: RB, build_import_queue: BIQ, build_consensus: BIC, + hwbench: Option, ) -> sc_service::error::Result<( TaskManager, Arc>>, @@ -212,17 +232,12 @@ where + sp_block_builder::BlockBuilder + cumulus_primitives_core::CollectCollationInfo + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + substrate_frame_rpc_system::AccountNonceApi - + dkg_runtime_primitives::DKGApi< - Block, - dkg_runtime_primitives::crypto::AuthorityId, - egg_runtime::BlockNumber, - >, + + substrate_frame_rpc_system::AccountNonceApi, sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, Executor: sc_executor::NativeExecutionDispatch + 'static, RB: Fn( - Arc>>, - ) -> Result, sc_service::Error> + Arc>, + ) -> Result, sc_service::Error> + Send + 'static, BIQ: FnOnce( @@ -267,12 +282,19 @@ where let backend = params.backend.clone(); 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(), - })?; + let (relay_chain_interface, collator_key) = build_relay_chain_interface( + polkadot_config, + ¶chain_config, + telemetry_worker_handle, + &mut task_manager, + collator_options.clone(), + hwbench.clone(), + ) + .await + .map_err(|e| match e { + RelayChainError::ServiceError(polkadot_service::Error::Sub(x)) => x, + s => s.to_string().into(), + })?; let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id); @@ -294,18 +316,54 @@ where warp_sync: None, })?; - let rpc_client = client.clone(); - let rpc_extensions_builder = Box::new(move |_, _| rpc_ext_builder(rpc_client.clone())); + let rpc_builder = { + let client = client.clone(); + let transaction_pool = transaction_pool.clone(); + + Box::new(move |deny_unsafe, _| { + let deps = crate::rpc::FullDeps { + client: client.clone(), + pool: transaction_pool.clone(), + deny_unsafe, + }; + + crate::rpc::create_full(deps).map_err(Into::into) + }) + }; + + sc_service::spawn_tasks(sc_service::SpawnTasksParams { + rpc_builder, + client: client.clone(), + transaction_pool: transaction_pool.clone(), + task_manager: &mut task_manager, + config: parachain_config, + keystore: params.keystore_container.sync_keystore(), + backend: backend.clone(), + network: network.clone(), + system_rpc_tx, + telemetry: telemetry.as_mut(), + })?; + + if let Some(hwbench) = hwbench { + sc_sysinfo::print_hwbench(&hwbench); - let base_path = if parachain_config.base_path.is_some() { - match parachain_config.base_path.as_ref() { - Some(BasePath::Permanenent(path_buf)) => Some(path_buf.clone()), - _ => None, + if let Some(ref mut telemetry) = telemetry { + let telemetry_handle = telemetry.handle(); + task_manager.spawn_handle().spawn( + "telemetry_hwbench", + None, + sc_sysinfo::initialize_hwbench_telemetry(telemetry_handle, hwbench), + ); } - } else { - None + } + + let announce_block = { + let network = network.clone(); + Arc::new(move |hash, data| network.announce_block(hash, data)) }; + let relay_chain_slot_duration = Duration::from_secs(6); + if validator { dkg_primitives::utils::insert_controller_account_keys_into_keystore( ¶chain_config, @@ -331,24 +389,6 @@ where ); } - sc_service::spawn_tasks(sc_service::SpawnTasksParams { - rpc_extensions_builder, - client: client.clone(), - transaction_pool: transaction_pool.clone(), - task_manager: &mut task_manager, - config: parachain_config, - keystore: params.keystore_container.sync_keystore(), - backend: backend.clone(), - network: network.clone(), - system_rpc_tx, - telemetry: telemetry.as_mut(), - })?; - - let announce_block = { - let network = network.clone(); - 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(), @@ -374,7 +414,7 @@ where spawner, parachain_consensus, import_queue, - collator_key, + collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, }; @@ -388,6 +428,7 @@ where relay_chain_interface, relay_chain_slot_duration, import_queue, + collator_options, }; start_full_node(params)?; @@ -398,14 +439,18 @@ where Ok((task_manager, client)) } -/// Build the import queue for the the parachain runtime. +/// Build the import queue for the parachain runtime. +#[allow(clippy::type_complexity)] pub fn parachain_build_import_queue( - client: Arc>, + client: Arc>>, config: &Configuration, telemetry: Option, task_manager: &TaskManager, ) -> Result< - sc_consensus::DefaultImportQueue>, + sc_consensus::DefaultImportQueue< + Block, + TFullClient>, + >, sc_service::Error, > { let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; @@ -425,14 +470,14 @@ pub fn parachain_build_import_queue( let time = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, - slot_duration.slot_duration(), + slot_duration, ); Ok((time, slot)) }, - registry: config.prometheus_registry().clone(), + registry: config.prometheus_registry(), can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), spawner: &task_manager.spawn_essential_handle(), telemetry, @@ -440,18 +485,23 @@ pub fn parachain_build_import_queue( .map_err(Into::into) } -/// Start a normal parachain node. +/// Start a parachain node. pub async fn start_parachain_node( parachain_config: Configuration, polkadot_config: Configuration, + collator_options: CollatorOptions, id: ParaId, -) -> sc_service::error::Result<(TaskManager, Arc>)> -{ - start_node_impl::( + hwbench: Option, +) -> sc_service::error::Result<( + TaskManager, + Arc>>, +)> { + start_node_impl::( parachain_config, polkadot_config, + collator_options, id, - |_| Ok(Default::default()), + |_| Ok(RpcModule::new(())), parachain_build_import_queue, |client, prometheus_registry, @@ -488,9 +538,9 @@ pub async fn start_parachain_node( let time = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, - slot_duration.slot_duration(), + slot_duration, ); let parachain_inherent = parachain_inherent.ok_or_else(|| { @@ -516,6 +566,7 @@ pub async fn start_parachain_node( }, )) }, + hwbench, ) .await } diff --git a/polkadot-launch/README.md b/polkadot-launch/README.md index df932e0f3..75cdcf87f 100644 --- a/polkadot-launch/README.md +++ b/polkadot-launch/README.md @@ -10,7 +10,7 @@ Build Polkadot for relay chain: ```bash git clone -n https://github.com/paritytech/polkadot.git -git checkout v0.9.17 +git checkout v0.9.22 cargo build --release ``` diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 5c13843b5..e493c7c39 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -11,13 +11,13 @@ edition = "2021" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [dependencies] -codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"]} +codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"]} log = { version = "0.4.14", default-features = false } serde = { version = "1.0.119", optional = true, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } hex-literal = { version = "0.3", optional = true } smallvec = "1.6.1" @@ -28,7 +28,6 @@ pallet-dkg-proposals = { git = "https://github.com/webb-tools/dkg-substrate.git" pallet-dkg-proposal-handler = { git = "https://github.com/webb-tools/dkg-substrate.git", branch = "async", default-features = false } # Protocol Substrate Dependencies -common = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } webb-primitives = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-hasher = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } @@ -37,9 +36,9 @@ pallet-linkable-tree = { git = "https://github.com/webb-tools/protocol-substrate pallet-mt-rpc-runtime-api = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-verifier = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } -orml-currencies = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } -orml-tokens = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } -orml-traits = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false } pallet-anchor = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-anchor-handler = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-asset-registry = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } @@ -49,57 +48,59 @@ pallet-token-wrapper = { git = "https://github.com/webb-tools/protocol-substrate # Substrate Dependencies ## Substrate Primitive Dependencies -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } ## Substrate FRAME Dependencies -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.17" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.22" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } ## Substrate Pallet Dependencies -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } # Cumulus Dependencies -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } # Polkadot Dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.17" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.22" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } [features] default = ["std"] @@ -141,6 +142,7 @@ std = [ "pallet-timestamp/std", "pallet-sudo/std", "pallet-transaction-payment/std", + "pallet-asset-tx-payment/std", "parachain-info/std", "cumulus-pallet-aura-ext/std", "cumulus-pallet-parachain-system/std", @@ -161,6 +163,7 @@ std = [ "sp-consensus-aura/std", "pallet-authorship/std", "pallet-session/std", + "pallet-indices/std", # DKG "pallet-dkg-metadata/std", @@ -169,7 +172,6 @@ std = [ "pallet-dkg-proposal-handler/std", # Protocol Substrate - "common/std", "webb-primitives/std", "pallet-hasher/std", "pallet-mt/std", diff --git a/runtime/src/impls.rs b/runtime/src/impls.rs new file mode 100644 index 000000000..97664c693 --- /dev/null +++ b/runtime/src/impls.rs @@ -0,0 +1,34 @@ +// This file is part of Substrate. + +// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! Some configurable implementations as associated type for the substrate runtime. + +use crate::{AccountId, Authorship, Balances, NegativeImbalance, Runtime}; +use frame_support::traits::{ + fungibles::{Balanced, CreditOf}, + Currency, OnUnbalanced, +}; +use pallet_asset_tx_payment::HandleCredit; + +pub struct Author; +impl OnUnbalanced for Author { + fn on_nonzero_unbalanced(amount: NegativeImbalance) { + if let Some(author) = Authorship::author() { + Balances::resolve_creating(&author, amount); + } + } +} diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 6c3dd0df8..927e9ee2b 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -20,18 +20,21 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); +pub mod impls; pub mod protocol_substrate_config; pub mod xcm_config; use codec::Encode; use dkg_runtime_primitives::{TypedChainId, UnsignedProposal}; +use impls::*; use pallet_dkg_proposals::DKGEcdsaToEthereum; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, traits::{ - self, AccountIdLookup, BlakeTwo256, Block as BlockT, IdentifyAccount, StaticLookup, Verify, + self, AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, IdentifyAccount, + StaticLookup, Verify, }, transaction_validity::{TransactionSource, TransactionValidity}, ApplyExtrinsicResult, MultiSignature, SaturatedConversion, @@ -44,16 +47,20 @@ use sp_version::NativeVersion; use sp_version::RuntimeVersion; use frame_support::weights::{ - WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, + ConstantMultiplier, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }; - -use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo}; +use pallet_transaction_payment::{ + CurrencyAdapter, FeeDetails, Multiplier, RuntimeDispatchInfo, TargetedFeeAdjustment, +}; +use polkadot_runtime_common::impls::DealWithFees; +use sp_runtime::{FixedPointNumber, Perquintill}; +use webb_primitives::AccountIndex; // A few exports that help ease life for downstream crates. pub use dkg_runtime_primitives::crypto::AuthorityId as DKGId; pub use frame_support::{ construct_runtime, match_type, parameter_types, - traits::{EnsureOneOf, Everything, IsInVec, Randomness}, + traits::{Currency, EnsureOneOf, Everything, IsInVec, Randomness}, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, DispatchClass, IdentityFee, Weight, @@ -104,6 +111,7 @@ pub type SignedBlock = generic::SignedBlock; pub type BlockId = generic::BlockId; /// The SignedExtension to the basic transaction logic. pub type SignedExtra = ( + frame_system::CheckNonZeroSender, frame_system::CheckSpecVersion, frame_system::CheckTxVersion, frame_system::CheckGenesis, @@ -123,9 +131,17 @@ pub type Executive = frame_executive::Executive< Block, frame_system::ChainContext, Runtime, - AllPalletsWithSystemReversed, + AllPalletsWithSystem, + OnRuntimeUpgrade, >; +pub struct OnRuntimeUpgrade; +impl frame_support::traits::OnRuntimeUpgrade for OnRuntimeUpgrade { + fn on_runtime_upgrade() -> u64 { + 0u64 + } +} + /// Handles converting a weight scalar to a fee value, based on the scale and granularity of the /// node's balance type. /// @@ -236,55 +252,43 @@ impl_opaque_keys! { } } -// Configure FRAME pallets to include in runtime. - impl frame_system::Config for Runtime { - /// The identifier used to distinguish between accounts. + type AccountData = pallet_balances::AccountData; type AccountId = AccountId; - /// The aggregated dispatch type that is available for extrinsics. - type Call = Call; - /// The lookup mechanism to get account ID from whatever is passed in dispatchers. - type Lookup = AccountIdLookup; - /// The index type for storing how many extrinsics an account has signed. - type Index = Index; - /// The index type for blocks. + type BaseCallFilter = Everything; + type BlockHashCount = BlockHashCount; + type BlockLength = RuntimeBlockLength; type BlockNumber = BlockNumber; - /// The type for hashing blocks and tries. + type BlockWeights = RuntimeBlockWeights; + type Call = Call; + type DbWeight = RocksDbWeight; + type Event = Event; type Hash = Hash; - /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. type Header = generic::Header; - /// The ubiquitous event type. - type Event = Event; - /// The ubiquitous origin type. + type Index = Index; + type Lookup = Indices; + type MaxConsumers = frame_support::traits::ConstU32<16>; + type OnKilledAccount = (); + type OnNewAccount = (); + type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode; type Origin = Origin; - /// Maximum number of block number to block hash mappings to keep (oldest pruned first). - type BlockHashCount = BlockHashCount; - /// Runtime version. - type Version = Version; - /// Converts a module to an index of this module in the runtime. type PalletInfo = PalletInfo; - type AccountData = pallet_balances::AccountData; - /// What to do if a new account is created. - type OnNewAccount = (); - /// What to do if an account is fully reaped from the system. - type OnKilledAccount = (); - /// The weight of database operations that the runtime can invoke. - type DbWeight = RocksDbWeight; - /// The basic call filter to use in dispatchable. - type BaseCallFilter = Everything; - /// Weight information for the extrinsics of this pallet. - type SystemWeightInfo = (); - /// Block & extrinsics weights: base values and limits. - type BlockWeights = RuntimeBlockWeights; - /// The maximum length of a block (in bytes). - type BlockLength = RuntimeBlockLength; - /// This is used as an identifier of the chain. 42 is the generic substrate prefix. 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>; + type SystemWeightInfo = frame_system::weights::SubstrateWeight; + type Version = Version; +} + +parameter_types! { + pub const IndexDeposit: Balance = UNIT; +} + +impl pallet_indices::Config for Runtime { + type AccountIndex = AccountIndex; + type Currency = Balances; + type Deposit = IndexDeposit; + type Event = Event; + type WeightInfo = pallet_indices::weights::SubstrateWeight; } parameter_types! { @@ -304,12 +308,12 @@ parameter_types! { pub const ExistentialDeposit: u128 = EXISTENTIAL_DEPOSIT; pub const TransferFee: u128 = 1 * MILLIUNIT; pub const CreationFee: u128 = 1 * MILLIUNIT; - pub const TransactionByteFee: u128 = 1 * MICROUNIT; pub const MaxLocks: u32 = 50; pub const MaxReserves: u32 = 50; - pub const OperationalFeeMultiplier: u8 = 5; } +type NegativeImbalance = >::NegativeImbalance; + impl pallet_balances::Config for Runtime { /// The type for recording an account's balance. type Balance = Balance; @@ -324,12 +328,21 @@ impl pallet_balances::Config for Runtime { type ReserveIdentifier = [u8; 8]; } +parameter_types! { + pub const TransactionByteFee: Balance = 10 * MILLIUNIT; + pub const OperationalFeeMultiplier: u8 = 5; + pub const TargetBlockFullness: Perquintill = Perquintill::from_percent(25); + pub AdjustmentVariable: Multiplier = Multiplier::saturating_from_rational(1, 100_000); + pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000_000u128); +} + impl pallet_transaction_payment::Config for Runtime { - type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; - type TransactionByteFee = TransactionByteFee; - type WeightToFee = IdentityFee; - type FeeMultiplierUpdate = (); + type OnChargeTransaction = CurrencyAdapter; type OperationalFeeMultiplier = OperationalFeeMultiplier; + type WeightToFee = IdentityFee; + type LengthToFee = ConstantMultiplier; + type FeeMultiplierUpdate = + TargetedFeeAdjustment; } impl pallet_randomness_collective_flip::Config for Runtime {} @@ -339,42 +352,6 @@ impl pallet_sudo::Config for Runtime { type Event = Event; } -parameter_types! { - pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; - pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; -} - -impl cumulus_pallet_parachain_system::Config for Runtime { - type Event = Event; - type OnSystemEvent = (); - type SelfParaId = parachain_info::Pallet; - type DmpMessageHandler = DmpQueue; - type ReservedDmpWeight = ReservedDmpWeight; - type OutboundXcmpMessageSource = XcmpQueue; - type XcmpMessageHandler = XcmpQueue; - type ReservedXcmpWeight = ReservedXcmpWeight; -} - -impl parachain_info::Config for Runtime {} - -impl cumulus_pallet_aura_ext::Config for Runtime {} - -impl cumulus_pallet_xcmp_queue::Config for Runtime { - type Event = Event; - type XcmExecutor = XcmExecutor; - type ChannelInfo = ParachainSystem; - type VersionWrapper = (); - type ExecuteOverweightOrigin = EnsureRoot; - type ControllerOrigin = EnsureRoot; - type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; -} - -impl cumulus_pallet_dmp_queue::Config for Runtime { - type Event = Event; - type XcmExecutor = XcmExecutor; - type ExecuteOverweightOrigin = frame_system::EnsureRoot; -} - parameter_types! { pub const MaxAuthorities: u32 = 1_000; } @@ -514,6 +491,7 @@ where .saturating_sub(1); let era = Era::mortal(period, current_block); let extra = ( + frame_system::CheckNonZeroSender::::new(), frame_system::CheckSpecVersion::::new(), frame_system::CheckTxVersion::::new(), frame_system::CheckGenesis::::new(), @@ -524,11 +502,11 @@ where ); let raw_payload = SignedPayload::new(call, extra) .map_err(|e| { - frame_support::log::warn!("Unable to create signed payload: {:?}", e); + log::warn!("Unable to create signed payload: {:?}", e); }) .ok()?; let signature = raw_payload.using_encoded(|payload| C::sign(payload, public))?; - let address = AccountIdLookup::::unlookup(account); + let address = Indices::unlookup(account); let (call, extra, _) = raw_payload.deconstruct(); Some((call, (address, signature, extra))) } @@ -564,6 +542,7 @@ construct_runtime!( Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, + Indices: pallet_indices::{Pallet, Call, Storage, Config, Event}, // Collator support. the order of these 4 are important and shall not change. Authorship: pallet_authorship::{Pallet, Call, Storage}, @@ -587,7 +566,7 @@ construct_runtime!( HasherBn254: pallet_hasher::::{Pallet, Call, Storage, Event, Config}, AssetRegistry: pallet_asset_registry::{Pallet, Call, Storage, Event, Config}, - Currencies: orml_currencies::{Pallet, Call, Event}, + Currencies: orml_currencies::{Pallet, Call}, Tokens: orml_tokens::{Pallet, Storage, Call, Event}, TokenWrapper: pallet_token_wrapper::{Pallet, Storage, Call, Event}, diff --git a/runtime/src/protocol_substrate_config.rs b/runtime/src/protocol_substrate_config.rs index 2cf79b7b5..81dda6d84 100644 --- a/runtime/src/protocol_substrate_config.rs +++ b/runtime/src/protocol_substrate_config.rs @@ -1,7 +1,7 @@ use crate::*; use codec::{Decode, Encode}; -use frame_support::traits::Nothing; -use orml_currencies::BasicCurrencyAdapter; +use frame_support::{pallet_prelude::ConstU32, traits::Nothing}; +use orml_currencies::{BasicCurrencyAdapter, NativeCurrencyOf}; use webb_primitives::{ hashing::{ethereum::Keccak256HasherBn254, ArkworksPoseidonHasherBn254}, verifying::ArkworksVerifierBn254, @@ -109,12 +109,13 @@ impl pallet_asset_registry::Config for Runtime { type AssetNativeLocation = (); type Balance = Balance; type Event = Event; - type NativeAssetId = NativeCurrencyId; + type NativeAssetId = GetNativeCurrencyId; type RegistryOrigin = frame_system::EnsureRoot; type StringLimit = RegistryStringLimit; type WeightInfo = (); } +pub type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { type Amount = Amount; type Balance = Balance; @@ -122,29 +123,35 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = AssetRegistry; - type MaxLocks = (); type OnDust = (); type WeightInfo = (); + type MaxLocks = ConstU32<2>; + type MaxReserves = ConstU32<2>; + type ReserveIdentifier = ReserveIdentifier; } +parameter_types! { + pub const GetNativeCurrencyId: webb_primitives::AssetId = 0; +} + +pub type NativeCurrency = NativeCurrencyOf; +pub type AdaptedBasicCurrency = BasicCurrencyAdapter; impl orml_currencies::Config for Runtime { - type Event = Event; - type GetNativeCurrencyId = NativeCurrencyId; type MultiCurrency = Tokens; - type NativeCurrency = BasicCurrencyAdapter; + type NativeCurrency = AdaptedBasicCurrency; + type GetNativeCurrencyId = GetNativeCurrencyId; type WeightInfo = (); } parameter_types! { pub const MixerPalletId: PalletId = PalletId(*b"py/mixer"); - pub const NativeCurrencyId: u32 = 0; pub const RegistryStringLimit: u32 = 10; } impl pallet_mixer::Config for Runtime { type Currency = Currencies; type Event = Event; - type NativeCurrencyId = NativeCurrencyId; + type NativeCurrencyId = GetNativeCurrencyId; type PalletId = MixerPalletId; type Tree = MerkleTreeBn254; type Verifier = MixerVerifierBn254; @@ -174,7 +181,7 @@ impl pallet_anchor::Config for Runtime { type Currency = Currencies; type Event = Event; type LinkableTree = LinkableTreeBn254; - type NativeCurrencyId = NativeCurrencyId; + type NativeCurrencyId = GetNativeCurrencyId; type PalletId = AnchorPalletId; type PostDepositHook = (); type Verifier = AnchorVerifierBn254; diff --git a/runtime/src/xcm_config.rs b/runtime/src/xcm_config.rs index 9d9fbb9e3..23a0eba5c 100644 --- a/runtime/src/xcm_config.rs +++ b/runtime/src/xcm_config.rs @@ -16,11 +16,13 @@ use super::{ AccountId, Balances, Call, Event, Origin, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, WeightToFee, XcmpQueue, }; +use crate::{DmpQueue, MAXIMUM_BLOCK_WEIGHT}; use frame_support::{ match_type, parameter_types, traits::{Everything, Nothing}, weights::Weight, }; +use frame_system::EnsureRoot; use pallet_xcm::XcmPassthrough; use polkadot_parachain::primitives::Sibling; use polkadot_runtime_common::impls::ToAuthor; @@ -165,3 +167,40 @@ impl cumulus_pallet_xcm::Config for Runtime { type Event = Event; type XcmExecutor = XcmExecutor; } + +parameter_types! { + pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; + pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; +} + +impl cumulus_pallet_parachain_system::Config for Runtime { + type Event = Event; + type OnSystemEvent = (); + type SelfParaId = parachain_info::Pallet; + type DmpMessageHandler = DmpQueue; + type ReservedDmpWeight = ReservedDmpWeight; + type OutboundXcmpMessageSource = XcmpQueue; + type XcmpMessageHandler = XcmpQueue; + type ReservedXcmpWeight = ReservedXcmpWeight; +} + +impl parachain_info::Config for Runtime {} + +impl cumulus_pallet_aura_ext::Config for Runtime {} + +impl cumulus_pallet_xcmp_queue::Config for Runtime { + type Event = Event; + type XcmExecutor = XcmExecutor; + type ChannelInfo = ParachainSystem; + type VersionWrapper = (); + type ExecuteOverweightOrigin = EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; + type WeightInfo = (); +} + +impl cumulus_pallet_dmp_queue::Config for Runtime { + type Event = Event; + type XcmExecutor = XcmExecutor; + type ExecuteOverweightOrigin = frame_system::EnsureRoot; +} diff --git a/scripts/polkadot-launch/README.md b/scripts/polkadot-launch/README.md index df932e0f3..75cdcf87f 100644 --- a/scripts/polkadot-launch/README.md +++ b/scripts/polkadot-launch/README.md @@ -10,7 +10,7 @@ Build Polkadot for relay chain: ```bash git clone -n https://github.com/paritytech/polkadot.git -git checkout v0.9.17 +git checkout v0.9.22 cargo build --release ``` diff --git a/standalone/node/Cargo.toml b/standalone/node/Cargo.toml index 77f9606d4..cfd1fe8f0 100644 --- a/standalone/node/Cargo.toml +++ b/standalone/node/Cargo.toml @@ -27,7 +27,7 @@ substrate-build-script-utils = "3.0.0" futures = { version = "0.3.16" } log = "0.4.8" clap = { version = "3.0", features = ["derive"] } -codec = { package = "parity-scale-codec", version = "2.3.0" } +codec = { package = "parity-scale-codec", version = "3" } serde = { version = "1.0.101", features = ["derive"] } hex-literal = "0.2.1" async-trait = "0.1.42" @@ -35,11 +35,12 @@ rand = "0.7.2" itertools = "0.10.0" # Protocol Substrate -common = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } webb-primitives = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-mt = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-mt-rpc = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-mt-rpc-runtime-api = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } +pallet-linkable-tree-rpc = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } +pallet-linkable-tree-rpc-runtime-api = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } # DKG dependencies egg-runtime = { package = "egg-standalone-runtime", path = "../runtime" } @@ -48,58 +49,58 @@ dkg-primitives = { git = "https://github.com/webb-tools/dkg-substrate.git", bran dkg-gadget = { git = "https://github.com/webb-tools/dkg-substrate.git", branch = "async" } # Substrate dependencies -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", features = ["wasmtime"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", features = ["wasmtime"] } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", features = ["wasmtime"] } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", features = ["wasmtime"] } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", features = ["wasmtime"] } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", features = ["wasmtime"] } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-storage-proof = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-transaction-storage-proof = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } # RPC related dependencies jsonrpc-core = "18.0.0" -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } arkworks-setups = { version = "1.0.0", features = ["r1cs"], default-features = false } ark-std = { version = "^0.3.0", default-features = false } diff --git a/standalone/node/src/chain_spec.rs b/standalone/node/src/chain_spec.rs index 9ca30355e..09ccaa6f1 100644 --- a/standalone/node/src/chain_spec.rs +++ b/standalone/node/src/chain_spec.rs @@ -403,6 +403,7 @@ fn testnet_genesis( // Configure endowed accounts with initial balance of 1 << 60. balances: endowed_accounts.iter().cloned().map(|k| (k, ENDOWMENT)).collect(), }, + indices: Default::default(), session: SessionConfig { keys: initial_authorities .iter() diff --git a/standalone/node/src/rpc.rs b/standalone/node/src/rpc.rs index 1f343191b..31385a8d7 100644 --- a/standalone/node/src/rpc.rs +++ b/standalone/node/src/rpc.rs @@ -1,6 +1,6 @@ // This file is part of Substrate. -// Copyright (C) 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd. // SPDX-License-Identifier: Apache-2.0 // Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,18 +29,18 @@ //! be placed here or imported from corresponding FRAME RPC definitions. #![warn(missing_docs)] +#![warn(unused_crate_dependencies)] use std::sync::Arc; -use common::{AccountId, Balance, Block, BlockNumber, Hash, Index}; -use egg_runtime::protocol_substrate_config::Element; - -use pallet_mt_rpc::{MerkleTreeRpcApi, MerkleTreeClient}; +use egg_runtime::Element; +use jsonrpsee::RpcModule; use sc_client_api::AuxStore; +use sc_consensus_epochs::SharedEpochChanges; use sc_finality_grandpa::{ FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState, }; -use sc_finality_grandpa_rpc::GrandpaRpcHandler; +use sc_finality_grandpa_rpc::GrandpaRpc; use sc_rpc::SubscriptionTaskExecutor; pub use sc_rpc_api::DenyUnsafe; use sc_transaction_pool_api::TransactionPool; @@ -48,6 +48,15 @@ use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; use sp_consensus::SelectChain; +use sp_keystore::SyncCryptoStorePtr; +use webb_primitives::{ + opaque::Block, AccountId, Balance, BlockNumber, ChainId, Hash, Index, LeafIndex, +}; + +pub use jsonrpc_core::IoHandler; + +use pallet_linkable_tree_rpc::LinkableTreeClient; +use pallet_mt_rpc::MerkleTreeClient; /// Extra dependencies for GRANDPA pub struct GrandpaDeps { @@ -79,16 +88,14 @@ pub struct FullDeps { pub grandpa: GrandpaDeps, } -/// A IO handler that uses all Full RPC extensions. -pub type IoHandler = jsonrpc_core::IoHandler; - /// Instantiate all Full RPC extensions. pub fn create_full( deps: FullDeps, - _backend: Arc, -) -> Result, Box> + backend: Arc, +) -> Result, Box> where C: ProvideRuntimeApi + + sc_client_api::BlockBackend + HeaderBackend + AuxStore + HeaderMetadata @@ -99,16 +106,25 @@ where C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, C::Api: BlockBuilder, C::Api: pallet_mt_rpc_runtime_api::MerkleTreeApi, + C::Api: + pallet_linkable_tree_rpc_runtime_api::LinkableTreeApi, P: TransactionPool + 'static, SC: SelectChain + 'static, B: sc_client_api::Backend + Send + Sync + 'static, B::State: sc_client_api::backend::StateBackend>, { - use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; - use substrate_frame_rpc_system::{FullSystem, SystemApi}; - - let mut io = jsonrpc_core::IoHandler::default(); - let FullDeps { client, pool, select_chain: _, chain_spec: _, deny_unsafe, grandpa } = deps; + use pallet_linkable_tree_rpc::LinkableTreeRpcApiServer; + use pallet_mt_rpc::MerkleTreeRpcApiServer; + use pallet_transaction_payment_rpc::{TransactionPaymentApiServer, TransactionPaymentRpc}; + use sc_consensus_babe_rpc::BabeApiServer; + use sc_finality_grandpa_rpc::GrandpaApiServer; + use sc_rpc::dev::{Dev, DevApiServer}; + use sc_sync_state_rpc::{SyncStateRpc, SyncStateRpcApiServer}; + use substrate_frame_rpc_system::{SystemApiServer, SystemRpc}; + use substrate_state_trie_migration_rpc::StateMigrationApiServer; + + let mut io = RpcModule::new(()); + let FullDeps { client, pool, select_chain, chain_spec, deny_unsafe, babe, grandpa } = deps; let GrandpaDeps { shared_voter_state, @@ -118,17 +134,34 @@ where finality_provider, } = grandpa; - io.extend_with(SystemApi::to_delegate(FullSystem::new(client.clone(), pool, deny_unsafe))); - io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone()))); - - io.extend_with(sc_finality_grandpa_rpc::GrandpaApi::to_delegate(GrandpaRpcHandler::new( - shared_authority_set.clone(), - shared_voter_state, - justification_stream, - subscription_executor, - finality_provider, - ))); - - io.extend_with(MerkleTreeRpcApi::to_delegate(MerkleTreeClient::new(client))); + io.merge(SystemRpc::new(client.clone(), pool, deny_unsafe).into_rpc())?; + // Making synchronous calls in light client freezes the browser currently, + // more context: https://github.com/paritytech/substrate/pull/3480 + // These RPCs should use an asynchronous caller instead. + io.merge(TransactionPaymentRpc::new(client.clone()).into_rpc())?; + io.merge( + GrandpaRpc::new( + subscription_executor, + shared_authority_set.clone(), + shared_voter_state, + justification_stream, + finality_provider, + ) + .into_rpc(), + )?; + + io.merge( + SyncStateRpc::new(chain_spec, client.clone(), shared_authority_set, shared_epoch_changes)? + .into_rpc(), + )?; + + io.merge( + substrate_state_trie_migration_rpc::MigrationRpc::new(client.clone(), backend, deny_unsafe) + .into_rpc(), + )?; + io.merge(Dev::new(client.clone(), deny_unsafe).into_rpc())?; + + io.merge(MerkleTreeClient::new(client.clone(), deny_unsafe).into_rpc())?; + io.merge(LinkableTreeClient::new(client, deny_unsafe).into_rpc())?; Ok(io) } diff --git a/standalone/runtime/Cargo.toml b/standalone/runtime/Cargo.toml index 234b4b226..67f6144bd 100644 --- a/standalone/runtime/Cargo.toml +++ b/standalone/runtime/Cargo.toml @@ -11,13 +11,13 @@ version = "0.1.0" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } [dependencies] -codec = {package = "parity-scale-codec", version = "2.3.0", default-features = false, features = ["derive", "max-encoded-len"]} +codec = {package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"]} hex-literal = {version = '0.3.1', optional = true} log = {version = "0.4.14", default-features = false} -scale-info = {version = "1.0.0", default-features = false, features = ["derive"]} +scale-info = {version = "2.1.1", default-features = false, features = ["derive"]} serde = {version = "1.0.101", optional = true, features = ["derive"]} smallvec = "1.6.1" static_assertions = "1.1.0" @@ -29,7 +29,6 @@ pallet-dkg-proposals = { git = "https://github.com/webb-tools/dkg-substrate.git" pallet-dkg-proposal-handler = { git = "https://github.com/webb-tools/dkg-substrate.git", branch = "async", default-features = false } # Protocol Substrate Dependencies -common = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } webb-primitives = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-hasher = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } @@ -38,9 +37,9 @@ pallet-linkable-tree = { git = "https://github.com/webb-tools/protocol-substrate pallet-mt-rpc-runtime-api = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-verifier = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } -orml-currencies = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } -orml-tokens = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } -orml-traits = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false } pallet-anchor = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-anchor-handler = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-asset-registry = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } @@ -49,64 +48,66 @@ pallet-mixer = { git = "https://github.com/webb-tools/protocol-substrate.git", d pallet-token-wrapper = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } # Substrate dependencies -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } - -frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.17", default-features = false } -frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.17", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } - -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } - -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } - -pallet-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } -pallet-im-online = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } - -pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.17", default-features = false } - -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } + +frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.22", default-features = false } +frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.22", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } + +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } + +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } + +pallet-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-im-online = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-offences = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } + +pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-nomination-pools = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-staking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } + +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } [features] default = ["std"] @@ -161,6 +162,7 @@ std = [ "pallet-sudo/std", "pallet-timestamp/std", "pallet-transaction-payment/std", + "pallet-asset-tx-payment/std", "pallet-transaction-payment-rpc-runtime-api/std", "pallet-utility/std", "pallet-collective/std", @@ -172,6 +174,7 @@ std = [ "pallet-staking/std", "pallet-scheduler/std", "pallet-preimage/std", + "pallet-nomination-pools/std", "pallet-treasury/std", # DKG @@ -181,7 +184,6 @@ std = [ "pallet-dkg-proposal-handler/std", # Protocol Substrate - "common/std", "webb-primitives/std", "pallet-hasher/std", "pallet-mt/std", diff --git a/standalone/runtime/src/impls.rs b/standalone/runtime/src/impls.rs new file mode 100644 index 000000000..97664c693 --- /dev/null +++ b/standalone/runtime/src/impls.rs @@ -0,0 +1,34 @@ +// This file is part of Substrate. + +// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! Some configurable implementations as associated type for the substrate runtime. + +use crate::{AccountId, Authorship, Balances, NegativeImbalance, Runtime}; +use frame_support::traits::{ + fungibles::{Balanced, CreditOf}, + Currency, OnUnbalanced, +}; +use pallet_asset_tx_payment::HandleCredit; + +pub struct Author; +impl OnUnbalanced for Author { + fn on_nonzero_unbalanced(amount: NegativeImbalance) { + if let Some(author) = Authorship::author() { + Balances::resolve_creating(&author, amount); + } + } +} diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index 12277ff60..7f3fcd730 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -20,56 +20,59 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); +pub mod impls; pub mod protocol_substrate_config; pub mod voter_bags; use codec::{Decode, Encode}; use dkg_runtime_primitives::{TypedChainId, UnsignedProposal}; +use frame_election_provider_support::{onchain, ExtendedBalance, SequentialPhragmen, VoteWeight}; use frame_support::weights::{ - WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, + ConstantMultiplier, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }; +use impls::*; use pallet_dkg_proposals::DKGEcdsaToEthereum; +use pallet_election_provider_multi_phase::SolutionAccuracyOf; use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, }; +use pallet_im_online::sr25519::AuthorityId as ImOnlineId; +use pallet_session::historical as pallet_session_historical; pub use pallet_staking::StakerStatus; +use pallet_transaction_payment::{ + CurrencyAdapter, FeeDetails, Multiplier, RuntimeDispatchInfo, TargetedFeeAdjustment, +}; use protocol_substrate_config::Element; use sp_api::impl_runtime_apis; -use sp_core::{ - crypto::KeyTypeId, - u32_trait::{_1, _2, _3, _4, _5}, - OpaqueMetadata, -}; +use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_runtime::{ create_runtime_str, curve::PiecewiseLinear, generic, impl_opaque_keys, traits::{ - self, AccountIdLookup, BlakeTwo256, Block as BlockT, IdentifyAccount, NumberFor, + self, AccountIdLookup, BlakeTwo256, Block as BlockT, Convert, IdentifyAccount, NumberFor, OpaqueKeys, StaticLookup, Verify, }, transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity}, - ApplyExtrinsicResult, MultiSignature, SaturatedConversion, + ApplyExtrinsicResult, FixedPointNumber, MultiSignature, Perquintill, SaturatedConversion, }; use sp_std::prelude::*; #[cfg(feature = "std")] use sp_version::NativeVersion; use sp_version::RuntimeVersion; use static_assertions::const_assert; - -use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo}; - -use pallet_session::historical as pallet_session_historical; +use webb_primitives::AccountIndex; // A few exports that help ease life for downstream crates. pub use dkg_runtime_primitives::crypto::AuthorityId as DKGId; pub use frame_support::{ construct_runtime, match_type, - pallet_prelude::ConstU32, + pallet_prelude::Get, parameter_types, traits::{ - ConstU128, Currency, EnsureOneOf, EqualPrivilegeOnly, Everything, Imbalance, - InstanceFilter, KeyOwnerProofSystem, LockIdentifier, OnUnbalanced, U128CurrencyToVote, + ConstU128, ConstU16, ConstU32, Currency, EnsureOneOf, EqualPrivilegeOnly, Everything, + Imbalance, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, OnUnbalanced, + U128CurrencyToVote, }, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, @@ -118,6 +121,7 @@ pub type SignedBlock = generic::SignedBlock; pub type BlockId = generic::BlockId; /// The SignedExtension to the basic transaction logic. pub type SignedExtra = ( + frame_system::CheckNonZeroSender, frame_system::CheckSpecVersion, frame_system::CheckTxVersion, frame_system::CheckGenesis, @@ -137,9 +141,17 @@ pub type Executive = frame_executive::Executive< Block, frame_system::ChainContext, Runtime, - AllPalletsWithSystemReversed, + AllPalletsWithSystem, + OnRuntimeUpgrade, >; +pub struct OnRuntimeUpgrade; +impl frame_support::traits::OnRuntimeUpgrade for OnRuntimeUpgrade { + fn on_runtime_upgrade() -> u64 { + 0u64 + } +} + /// Handles converting a weight scalar to a fee value, based on the scale and granularity of the /// node's balance type. /// @@ -274,55 +286,43 @@ pub mod opaque { } } -// Configure FRAME pallets to include in runtime. - impl frame_system::Config for Runtime { - /// The identifier used to distinguish between accounts. + type AccountData = pallet_balances::AccountData; type AccountId = AccountId; - /// The aggregated dispatch type that is available for extrinsics. - type Call = Call; - /// The lookup mechanism to get account ID from whatever is passed in dispatchers. - type Lookup = AccountIdLookup; - /// The index type for storing how many extrinsics an account has signed. - type Index = Index; - /// The index type for blocks. + type BaseCallFilter = Everything; + type BlockHashCount = BlockHashCount; + type BlockLength = RuntimeBlockLength; type BlockNumber = BlockNumber; - /// The type for hashing blocks and tries. + type BlockWeights = RuntimeBlockWeights; + type Call = Call; + type DbWeight = RocksDbWeight; + type Event = Event; type Hash = Hash; - /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. type Header = generic::Header; - /// The ubiquitous event type. - type Event = Event; - /// The ubiquitous origin type. + type Index = Index; + type Lookup = Indices; + type MaxConsumers = frame_support::traits::ConstU32<16>; + type OnKilledAccount = (); + type OnNewAccount = (); + type OnSetCode = (); type Origin = Origin; - /// Maximum number of block number to block hash mappings to keep (oldest pruned first). - type BlockHashCount = BlockHashCount; - /// Runtime version. - type Version = Version; - /// Converts a module to an index of this module in the runtime. type PalletInfo = PalletInfo; - type AccountData = pallet_balances::AccountData; - /// What to do if a new account is created. - type OnNewAccount = (); - /// What to do if an account is fully reaped from the system. - type OnKilledAccount = (); - /// The weight of database operations that the runtime can invoke. - type DbWeight = RocksDbWeight; - /// The basic call filter to use in dispatchable. - type BaseCallFilter = Everything; - /// Weight information for the extrinsics of this pallet. - type SystemWeightInfo = (); - /// Block & extrinsics weights: base values and limits. - type BlockWeights = RuntimeBlockWeights; - /// The maximum length of a block (in bytes). - type BlockLength = RuntimeBlockLength; - /// This is used as an identifier of the chain. 42 is the generic substrate prefix. type SS58Prefix = SS58Prefix; - /// The action to take on a Runtime Upgrade - type OnSetCode = (); - type MaxConsumers = frame_support::traits::ConstU32<16>; + type SystemWeightInfo = frame_system::weights::SubstrateWeight; + type Version = Version; +} + +parameter_types! { + pub const IndexDeposit: Balance = UNIT; +} + +impl pallet_indices::Config for Runtime { + type AccountIndex = AccountIndex; + type Currency = Balances; + type Deposit = IndexDeposit; + type Event = Event; + type WeightInfo = pallet_indices::weights::SubstrateWeight; } parameter_types! { @@ -342,12 +342,12 @@ parameter_types! { pub const ExistentialDeposit: u128 = EXISTENTIAL_DEPOSIT; pub const TransferFee: u128 = 1 * MILLIUNIT; pub const CreationFee: u128 = 1 * MILLIUNIT; - pub const TransactionByteFee: u128 = 1 * MICROUNIT; pub const MaxLocks: u32 = 50; pub const MaxReserves: u32 = 50; - pub const OperationalFeeMultiplier: u8 = 5; } +type NegativeImbalance = >::NegativeImbalance; + impl pallet_balances::Config for Runtime { /// The type for recording an account's balance. type Balance = Balance; @@ -362,12 +362,21 @@ impl pallet_balances::Config for Runtime { type ReserveIdentifier = [u8; 8]; } +parameter_types! { + pub const TransactionByteFee: Balance = 10 * MILLIUNIT; + pub const OperationalFeeMultiplier: u8 = 5; + pub const TargetBlockFullness: Perquintill = Perquintill::from_percent(25); + pub AdjustmentVariable: Multiplier = Multiplier::saturating_from_rational(1, 100_000); + pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000_000u128); +} + impl pallet_transaction_payment::Config for Runtime { - type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; - type TransactionByteFee = TransactionByteFee; - type WeightToFee = IdentityFee; - type FeeMultiplierUpdate = (); + type OnChargeTransaction = CurrencyAdapter; type OperationalFeeMultiplier = OperationalFeeMultiplier; + type WeightToFee = IdentityFee; + type LengthToFee = ConstantMultiplier; + type FeeMultiplierUpdate = + TargetedFeeAdjustment; } parameter_types! { @@ -413,10 +422,6 @@ impl pallet_sudo::Config for Runtime { type Event = Event; } -parameter_types! { - pub const MaxAuthorities: u32 = 1_000; -} - impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); @@ -447,12 +452,6 @@ impl pallet_grandpa::Config for Runtime { type WeightInfo = (); } -impl pallet_offences::Config for Runtime { - type Event = Event; - type IdentificationTuple = pallet_session::historical::IdentificationTuple; - type OnOffenceHandler = Staking; -} - parameter_types! { pub const UncleGenerations: u32 = 0; } @@ -481,6 +480,11 @@ impl pallet_session::Config for Runtime { type WeightInfo = pallet_session::weights::SubstrateWeight; } +impl pallet_session::historical::Config for Runtime { + type FullIdentification = pallet_staking::Exposure; + type FullIdentificationOf = pallet_staking::ExposureOf; +} + pallet_staking_reward_curve::build! { const REWARD_CURVE: PiecewiseLinear<'static> = curve!( min_inflation: 0_040_000, @@ -493,28 +497,16 @@ pallet_staking_reward_curve::build! { ); } -impl pallet_session::historical::Config for Runtime { - type FullIdentification = pallet_staking::Exposure; - type FullIdentificationOf = pallet_staking::ExposureOf; -} - -use frame_election_provider_support::onchain; -impl onchain::Config for Runtime { - type Accuracy = Perbill; - type DataProvider = Staking; -} - parameter_types! { - pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17); pub const SessionsPerEra: sp_staking::SessionIndex = 6; - pub const BondingDuration: u32 = 24 * 28; - pub const SlashDeferDuration: u32 = 24 * 7; // 1/4 the bonding duration. + pub const BondingDuration: sp_staking::EraIndex = 24 * 28; + pub const SlashDeferDuration: sp_staking::EraIndex = 24 * 7; // 1/4 the bonding duration. pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE; pub const MaxNominatorRewardedPerValidator: u32 = 256; - pub const MaxNominations: u32 = MAX_NOMINATIONS; + pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17); pub OffchainRepeat: BlockNumber = 5; - pub const StakingUnsignedPriority: TransactionPriority = TransactionPriority::max_value() / 2; } + pub struct StakingBenchmarkingConfig; impl pallet_staking::BenchmarkingConfig for StakingBenchmarkingConfig { type MaxNominators = ConstU32<1000>; @@ -522,90 +514,35 @@ impl pallet_staking::BenchmarkingConfig for StakingBenchmarkingConfig { } impl pallet_staking::Config for Runtime { - type BenchmarkingConfig = StakingBenchmarkingConfig; - type BondingDuration = BondingDuration; + type MaxNominations = MaxNominations; type Currency = Balances; + type CurrencyBalance = Balance; + type UnixTime = Timestamp; type CurrencyToVote = U128CurrencyToVote; - type ElectionProvider = ElectionProviderMultiPhase; - type EraPayout = pallet_staking::ConvertCurve; - type Event = Event; - type GenesisElectionProvider = onchain::OnChainSequentialPhragmen; - type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; - type NextNewSession = Session; - type OffendingValidatorsThreshold = OffendingValidatorsThreshold; - // send the slashed funds to the treasury. - type Reward = (); type RewardRemainder = Treasury; - type SessionInterface = Self; - // rewards are minted from the void + type Event = Event; + type Slash = Treasury; // send the slashed funds to the treasury. + type Reward = (); // rewards are minted from the void type SessionsPerEra = SessionsPerEra; - type Slash = Treasury; + type BondingDuration = BondingDuration; + type SlashDeferDuration = SlashDeferDuration; /// A super-majority of the council can cancel the slash. type SlashCancelOrigin = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>, + pallet_collective::EnsureProportionAtLeast, >; - type SlashDeferDuration = SlashDeferDuration; - // Alternatively, use pallet_staking::UseNominatorsMap to just use the - // nominators map. Note that the aforementioned does not scale to a very large - // number of nominators. - type SortedListProvider = BagsList; - type UnixTime = Timestamp; - type MaxNominations = MaxNominations; + type SessionInterface = Self; + type EraPayout = pallet_staking::ConvertCurve; + type NextNewSession = Session; + type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; + type OffendingValidatorsThreshold = OffendingValidatorsThreshold; + type ElectionProvider = ElectionProviderMultiPhase; + type GenesisElectionProvider = onchain::UnboundedExecution; + type VoterList = BagsList; + type MaxUnlockingChunks = ConstU32<32>; + type OnStakerSlash = NominationPools; type WeightInfo = pallet_staking::weights::SubstrateWeight; -} - -parameter_types! { - // phase durations. 1/4 of the last session for each. - pub const SignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4; - pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4; - - // signed config - pub const SignedMaxSubmissions: u32 = 10; - pub const SignedRewardBase: Balance = UNIT; - pub const SignedDepositBase: Balance = UNIT; - pub const SignedDepositByte: Balance = CENTS; - - pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(1u32, 10_000); - - // miner configs - pub const MultiPhaseUnsignedPriority: TransactionPriority = StakingUnsignedPriority::get() - 1u64; - pub MinerMaxWeight: Weight = RuntimeBlockWeights::get() - .get(DispatchClass::Normal) - .max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed") - .saturating_sub(BlockExecutionWeight::get()); - // Solution can occupy 90% of normal block size - pub MinerMaxLength: u32 = Perbill::from_rational(9u32, 10) * - *RuntimeBlockLength::get() - .max - .get(DispatchClass::Normal); - - // BagsList allows a practically unbounded count of nominators to participate in NPoS elections. - // To ensure we respect memory limits when using the BagsList this must be set to a number of - // voters we know can fit into a single vec allocation. - pub const VoterSnapshotPerBlock: u32 = 10_000; -} - -sp_npos_elections::generate_solution_type!( - #[compact] - pub struct NposSolution16::< - VoterIndex = u32, - TargetIndex = u16, - Accuracy = sp_runtime::PerU16, - >(16) -); - -pub const MAX_NOMINATIONS: u32 = ::LIMIT as u32; - -parameter_types! { - pub const BagThresholds: &'static [u64] = &voter_bags::THRESHOLDS; -} - -impl pallet_bags_list::Config for Runtime { - type BagThresholds = BagThresholds; - type Event = Event; - type VoteWeightProvider = Staking; - type WeightInfo = pallet_bags_list::weights::SubstrateWeight; + type BenchmarkingConfig = StakingBenchmarkingConfig; } parameter_types! { @@ -617,14 +554,14 @@ parameter_types! { pub const EnactmentPeriod: BlockNumber = 30 * 24 * 60 * MINUTES; pub const CooloffPeriod: BlockNumber = 28 * 24 * 60 * MINUTES; // One cent: $10,000 / MB - pub const PreimageByteDeposit: Balance = 1 * CENTS; + pub const PreimageByteDeposit: Balance = CENTS; pub const MaxVotes: u32 = 100; pub const MaxProposals: u32 = 100; } type EnsureRootOrHalfCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>, + pallet_collective::EnsureProportionMoreThan, >; impl pallet_democracy::Config for Runtime { @@ -633,12 +570,12 @@ impl pallet_democracy::Config for Runtime { // be unanimous or Root must agree. type CancelProposalOrigin = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, CouncilCollective>, + pallet_collective::EnsureProportionAtLeast, >; // To cancel a proposal which has been passed, 2/3 of the council must agree to // it. type CancellationOrigin = - pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>; + pallet_collective::EnsureProportionAtLeast; type CooloffPeriod = CooloffPeriod; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; @@ -646,23 +583,23 @@ impl pallet_democracy::Config for Runtime { /// A unanimous council can have the next scheduled referendum be a straight /// default-carries (NTB) vote. type ExternalDefaultOrigin = - pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, CouncilCollective>; + pallet_collective::EnsureProportionAtLeast; /// A super-majority can have the next scheduled referendum be a straight /// majority-carries vote. type ExternalMajorityOrigin = - pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>; + pallet_collective::EnsureProportionAtLeast; /// A straight majority of the council can decide what their next motion is. type ExternalOrigin = - pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, CouncilCollective>; + pallet_collective::EnsureProportionAtLeast; /// Two thirds of the technical committee can have an /// ExternalMajority/ExternalDefault vote be tabled immediately and with a /// shorter voting/enactment period. type FastTrackOrigin = - pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>; + pallet_collective::EnsureProportionAtLeast; type FastTrackVotingPeriod = FastTrackVotingPeriod; type InstantAllowed = InstantAllowed; type InstantOrigin = - pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, CouncilCollective>; + pallet_collective::EnsureProportionAtLeast; type LaunchPeriod = LaunchPeriod; type MaxProposals = MaxProposals; type MaxVotes = MaxVotes; @@ -683,7 +620,7 @@ impl pallet_democracy::Config for Runtime { } parameter_types! { - pub const CouncilMotionDuration: BlockNumber = 7 * DAYS; + pub const CouncilMotionDuration: BlockNumber = 5 * DAYS; pub const CouncilMaxProposals: u32 = 100; pub const CouncilMaxMembers: u32 = 100; } @@ -701,39 +638,43 @@ impl pallet_collective::Config for Runtime { } parameter_types! { - pub const CandidacyBond: Balance = 10 * UNIT; - // 1 storage item created, key size is 32 bytes, value size is 16+16. - pub const VotingBondBase: Balance = deposit(1, 64); - // additional data per vote is 32 bytes (account id). - pub const VotingBondFactor: Balance = deposit(0, 32); - pub const TermDuration: BlockNumber = 7 * DAYS; - pub const DesiredMembers: u32 = 13; - pub const DesiredRunnersUp: u32 = 7; - pub const ElectionsPhragmenPalletId: LockIdentifier = *b"phrelect"; + // phase durations. 1/4 of the last session for each. + pub const SignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS as u32 / 4; + pub const UnsignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS as u32 / 4; + + // signed config + pub const SignedRewardBase: Balance = 1 * UNIT; + pub const SignedDepositBase: Balance = 1 * UNIT; + pub const SignedDepositByte: Balance = 1 * CENTS; + + pub BetterUnsignedThreshold: Perbill = Perbill::from_rational(1u32, 10_000); + + // miner configs + pub const MultiPhaseUnsignedPriority: TransactionPriority = StakingUnsignedPriority::get() - 1u64; + pub MinerMaxWeight: Weight = RuntimeBlockWeights::get() + .get(DispatchClass::Normal) + .max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed") + .saturating_sub(BlockExecutionWeight::get()); + // Solution can occupy 90% of normal block size + pub MinerMaxLength: u32 = Perbill::from_rational(9u32, 10) * + *RuntimeBlockLength::get() + .max + .get(DispatchClass::Normal); } -// Make sure that there are no more than `MaxMembers` members elected via -// elections-phragmen. -const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); +frame_election_provider_support::generate_solution_type!( + #[compact] + pub struct NposSolution16::< + VoterIndex = u32, + TargetIndex = u16, + Accuracy = sp_runtime::PerU16, + MaxVoters = MaxElectingVoters, + >(16) +); -impl pallet_elections_phragmen::Config for Runtime { - type CandidacyBond = CandidacyBond; - type ChangeMembers = Council; - type Currency = Balances; - type CurrencyToVote = U128CurrencyToVote; - type DesiredMembers = DesiredMembers; - type DesiredRunnersUp = DesiredRunnersUp; - type Event = Event; - // NOTE: this implies that council's genesis members cannot be set directly and - // must come from this module. - type InitializeMembers = Council; - type KickedMember = (); - type LoserCandidate = (); - type PalletId = ElectionsPhragmenPalletId; - type TermDuration = TermDuration; - type VotingBondBase = VotingBondBase; - type VotingBondFactor = VotingBondFactor; - type WeightInfo = pallet_elections_phragmen::weights::SubstrateWeight; +parameter_types! { + pub MaxNominations: u32 = ::LIMIT as u32; + pub MaxElectingVoters: u32 = 10_000; } /// The numbers configured here could always be more than the the maximum limits of staking pallet @@ -750,17 +691,14 @@ impl pallet_election_provider_multi_phase::BenchmarkingConfig for ElectionProvid const MAXIMUM_TARGETS: u32 = 300; } -/// Maximum number of iterations for balancing that will be executed in the -/// embedded OCW miner of election provider multi phase. +/// Maximum number of iterations for balancing that will be executed in the embedded OCW +/// miner of election provider multi phase. pub const MINER_MAX_ITERATIONS: u32 = 10; -/// A source of random balance for NposSolver, which is meant to be run by the -/// OCW election miner. +/// A source of random balance for NposSolver, which is meant to be run by the OCW election miner. pub struct OffchainRandomBalancing; -impl frame_support::pallet_prelude::Get> - for OffchainRandomBalancing -{ - fn get() -> Option<(usize, sp_npos_elections::ExtendedBalance)> { +impl Get> for OffchainRandomBalancing { + fn get() -> Option<(usize, ExtendedBalance)> { use sp_runtime::traits::TrailingZeroInput; let iters = match MINER_MAX_ITERATIONS { 0 => 0, @@ -777,38 +715,20 @@ impl frame_support::pallet_prelude::Get(sp_std::marker::PhantomData); - -#[cfg(feature = "integration-tests")] -use frame_election_provider_support::ElectionDataProvider; -#[cfg(feature = "integration-tests")] -use sp_npos_elections::Support; - -use frame_election_provider_support::ElectionProvider; -use sp_npos_elections::Supports; - -impl ElectionProvider for Fallback { - type AccountId = T::AccountId; - type BlockNumber = T::BlockNumber; - type DataProvider = T::DataProvider; - type Error = &'static str; - - #[cfg(feature = "integration-tests")] - fn elect() -> Result, Self::Error> { - let targets = ::targets(None); - match targets { - Ok(candidates) => Ok(candidates - .iter() - .map(|x| (x.clone(), Support::::default())) - .collect::>()), - Err(_) => Err("No fallback"), - } - } +pub struct OnChainSeqPhragmen; +impl onchain::Config for OnChainSeqPhragmen { + type System = Runtime; + type Solver = SequentialPhragmen< + AccountId, + pallet_election_provider_multi_phase::SolutionAccuracyOf, + >; + type DataProvider = ::DataProvider; + type WeightInfo = frame_election_provider_support::weights::SubstrateWeight; +} - #[cfg(not(feature = "integration-tests"))] - fn elect() -> Result, Self::Error> { - Err("No fallback") - } +impl onchain::BoundedConfig for OnChainSeqPhragmen { + type VotersBound = MaxElectingVoters; + type TargetsBound = ConstU32<2_000>; } impl pallet_election_provider_multi_phase::Config for Runtime { @@ -817,7 +737,8 @@ impl pallet_election_provider_multi_phase::Config for Runtime { type EstimateCallFee = TransactionPayment; type SignedPhase = SignedPhase; type UnsignedPhase = UnsignedPhase; - type SolutionImprovementThreshold = SolutionImprovementThreshold; + type BetterUnsignedThreshold = BetterUnsignedThreshold; + type BetterSignedThreshold = (); type OffchainRepeat = OffchainRepeat; type MinerMaxWeight = MinerMaxWeight; type MinerMaxLength = MinerMaxLength; @@ -826,27 +747,65 @@ impl pallet_election_provider_multi_phase::Config for Runtime { type SignedRewardBase = SignedRewardBase; type SignedDepositBase = SignedDepositBase; type SignedDepositByte = SignedDepositByte; + type SignedMaxRefunds = ConstU32<3>; type SignedDepositWeight = (); type SignedMaxWeight = MinerMaxWeight; type SlashHandler = (); // burn slashes type RewardHandler = (); // nothing to do upon rewards type DataProvider = Staking; type Solution = NposSolution16; - type Fallback = Fallback; - type GovernanceFallback = - frame_election_provider_support::onchain::OnChainSequentialPhragmen; - type Solver = frame_election_provider_support::SequentialPhragmen< - AccountId, - pallet_election_provider_multi_phase::SolutionAccuracyOf, - OffchainRandomBalancing, - >; - type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight; - type ForceOrigin = EnsureRoot; + type Fallback = onchain::BoundedExecution; + type GovernanceFallback = onchain::BoundedExecution; + type Solver = SequentialPhragmen, OffchainRandomBalancing>; + type ForceOrigin = EnsureRootOrHalfCouncil; + type MaxElectableTargets = ConstU16<{ u16::MAX }>; + type MaxElectingVoters = MaxElectingVoters; type BenchmarkingConfig = ElectionProviderBenchmarkConfig; - // BagsList allows a practically unbounded count of nominators to participate in NPoS elections. - // To ensure we respect memory limits when using the BagsList this must be set to a number of - // voters we know can fit into a single vec allocation. - type VoterSnapshotPerBlock = ConstU32<10_000>; + type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight; +} + +parameter_types! { + pub const BagThresholds: &'static [u64] = &voter_bags::THRESHOLDS; +} + +impl pallet_bags_list::Config for Runtime { + type Event = Event; + type ScoreProvider = Staking; + type WeightInfo = pallet_bags_list::weights::SubstrateWeight; + type BagThresholds = BagThresholds; + type Score = VoteWeight; +} + +parameter_types! { + pub const PostUnbondPoolsWindow: u32 = 4; + pub const NominationPoolsPalletId: PalletId = PalletId(*b"py/nopls"); + pub const MinPointsToBalance: u32 = 10; +} + +pub struct BalanceToU256; +impl Convert for BalanceToU256 { + fn convert(balance: Balance) -> sp_core::U256 { + sp_core::U256::from(balance) + } +} +pub struct U256ToBalance; +impl Convert for U256ToBalance { + fn convert(n: sp_core::U256) -> Balance { + n.try_into().unwrap_or(Balance::max_value()) + } +} + +impl pallet_nomination_pools::Config for Runtime { + type WeightInfo = (); + type Event = Event; + type Currency = Balances; + type BalanceToU256 = BalanceToU256; + type U256ToBalance = U256ToBalance; + type StakingInterface = pallet_staking::Pallet; + type PostUnbondingPoolsWindow = PostUnbondPoolsWindow; + type MaxMetadataLen = ConstU32<256>; + type MaxUnbonding = ConstU32<8>; + type PalletId = NominationPoolsPalletId; } parameter_types! { @@ -899,6 +858,16 @@ impl pallet_dkg_proposals::Config for Runtime { type WeightInfo = pallet_dkg_proposals::WebbWeight; } +parameter_types! { + pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); + /// We prioritize im-online heartbeats over election solution submission. + pub const StakingUnsignedPriority: TransactionPriority = TransactionPriority::max_value() / 2; + pub const MaxAuthorities: u32 = 100; + pub const MaxKeys: u32 = 10_000; + pub const MaxPeerInHeartbeats: u32 = 10_000; + pub const MaxPeerDataEncodingSize: u32 = 1_000; +} + impl frame_system::offchain::CreateSignedTransaction for Runtime where Call: From, @@ -920,6 +889,7 @@ where .saturating_sub(1); let era = Era::mortal(period, current_block); let extra = ( + frame_system::CheckNonZeroSender::::new(), frame_system::CheckSpecVersion::::new(), frame_system::CheckTxVersion::::new(), frame_system::CheckGenesis::::new(), @@ -930,18 +900,18 @@ where ); let raw_payload = SignedPayload::new(call, extra) .map_err(|e| { - frame_support::log::warn!("Unable to create signed payload: {:?}", e); + log::warn!("Unable to create signed payload: {:?}", e); }) .ok()?; let signature = raw_payload.using_encoded(|payload| C::sign(payload, public))?; - let address = AccountIdLookup::::unlookup(account); + let address = Indices::unlookup(account); let (call, extra, _) = raw_payload.deconstruct(); Some((call, (address, signature, extra))) } } impl frame_system::offchain::SigningTypes for Runtime { - type Public = ::Signer; + type Public = ::Signer; type Signature = Signature; } @@ -949,74 +919,124 @@ impl frame_system::offchain::SendTransactionTypes for Runtime where Call: From, { - type OverarchingCall = Call; type Extrinsic = UncheckedExtrinsic; + type OverarchingCall = Call; +} + +impl pallet_offences::Config for Runtime { + type Event = Event; + type IdentificationTuple = pallet_session::historical::IdentificationTuple; + type OnOffenceHandler = Staking; +} + +parameter_types! { + pub const CandidacyBond: Balance = 10 * UNIT; + // 1 storage item created, key size is 32 bytes, value size is 16+16. + pub const VotingBondBase: Balance = deposit(1, 64); + // additional data per vote is 32 bytes (account id). + pub const VotingBondFactor: Balance = deposit(0, 32); + pub const TermDuration: BlockNumber = 7 * DAYS; + pub const DesiredMembers: u32 = 13; + pub const DesiredRunnersUp: u32 = 7; + pub const ElectionsPhragmenPalletId: LockIdentifier = *b"phrelect"; +} + +// Make sure that there are no more than `MaxMembers` members elected via +// elections-phragmen. +const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); + +impl pallet_elections_phragmen::Config for Runtime { + type CandidacyBond = CandidacyBond; + type ChangeMembers = Council; + type Currency = Balances; + type CurrencyToVote = U128CurrencyToVote; + type DesiredMembers = DesiredMembers; + type DesiredRunnersUp = DesiredRunnersUp; + type Event = Event; + // NOTE: this implies that council's genesis members cannot be set directly and + // must come from this module. + type InitializeMembers = Council; + type KickedMember = (); + type LoserCandidate = (); + type PalletId = ElectionsPhragmenPalletId; + type TermDuration = TermDuration; + type VotingBondBase = VotingBondBase; + type VotingBondFactor = VotingBondFactor; + type WeightInfo = pallet_elections_phragmen::weights::SubstrateWeight; } parameter_types! { pub const ProposalBond: Permill = Permill::from_percent(5); - pub const ProposalBondMinimum: Balance = 1 * UNIT; - pub const SpendPeriod: BlockNumber = 1 * DAYS; + pub const ProposalBondMinimum: Balance = UNIT; + pub const SpendPeriod: BlockNumber = DAYS; pub const Burn: Permill = Permill::from_percent(50); - pub const TipCountdown: BlockNumber = 1 * DAYS; + pub const TipCountdown: BlockNumber = DAYS; pub const TipFindersFee: Percent = Percent::from_percent(20); pub const TipReportDepositBase: Balance = 1 * UNIT; pub const DataDepositPerByte: Balance = 1 * CENTS; - pub const BountyDepositBase: Balance = 1 * UNIT; - pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS; pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry"); - pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS; pub const MaximumReasonLength: u32 = 300; - pub const BountyCuratorDeposit: Permill = Permill::from_percent(50); - pub const BountyValueMinimum: Balance = 5 * UNIT; pub const MaxApprovals: u32 = 100; - pub const MaxActiveChildBountyCount: u32 = 5; - pub const ChildBountyValueMinimum: Balance = 1 * UNIT; - pub const ChildBountyCuratorDepositBase: Permill = Permill::from_percent(10); } impl pallet_treasury::Config for Runtime { + type PalletId = TreasuryPalletId; + type Currency = Balances; type ApproveOrigin = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_3, _5, AccountId, CouncilCollective>, + pallet_collective::EnsureProportionAtLeast, + >; + type RejectOrigin = EnsureOneOf< + EnsureRoot, + pallet_collective::EnsureProportionMoreThan, >; - type Burn = Burn; - type BurnDestination = (); - type Currency = Balances; type Event = Event; - type MaxApprovals = MaxApprovals; type OnSlash = (); - type PalletId = TreasuryPalletId; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; - type RejectOrigin = EnsureOneOf< - EnsureRoot, - pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>, - >; - type SpendFunds = Bounties; - type SpendPeriod = SpendPeriod; type ProposalBondMaximum = (); + type SpendPeriod = SpendPeriod; + type Burn = Burn; + type BurnDestination = (); + type SpendFunds = Bounties; type WeightInfo = pallet_treasury::weights::SubstrateWeight; + type MaxApprovals = MaxApprovals; +} + +parameter_types! { + pub const BountyCuratorDeposit: Permill = Permill::from_percent(50); + pub const BountyValueMinimum: Balance = 5 * UNIT; + pub const BountyDepositBase: Balance = 1 * UNIT; + pub const CuratorDepositMultiplier: Permill = Permill::from_percent(50); + pub const CuratorDepositMin: Balance = 1 * UNIT; + pub const CuratorDepositMax: Balance = 100 * UNIT; + pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS; + pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS; } impl pallet_bounties::Config for Runtime { - type BountyCuratorDeposit = BountyCuratorDeposit; + type Event = Event; type BountyDepositBase = BountyDepositBase; type BountyDepositPayoutDelay = BountyDepositPayoutDelay; type BountyUpdatePeriod = BountyUpdatePeriod; + type CuratorDepositMultiplier = CuratorDepositMultiplier; + type CuratorDepositMin = CuratorDepositMin; + type CuratorDepositMax = CuratorDepositMax; type BountyValueMinimum = BountyValueMinimum; - type ChildBountyManager = ChildBounties; type DataDepositPerByte = DataDepositPerByte; - type Event = Event; type MaximumReasonLength = MaximumReasonLength; type WeightInfo = pallet_bounties::weights::SubstrateWeight; + type ChildBountyManager = ChildBounties; +} + +parameter_types! { + pub const ChildBountyValueMinimum: Balance = 1 * UNIT; } impl pallet_child_bounties::Config for Runtime { - type ChildBountyCuratorDepositBase = ChildBountyCuratorDepositBase; - type ChildBountyValueMinimum = ChildBountyValueMinimum; type Event = Event; - type MaxActiveChildBountyCount = MaxActiveChildBountyCount; + type MaxActiveChildBountyCount = ConstU32<5>; + type ChildBountyValueMinimum = ChildBountyValueMinimum; type WeightInfo = pallet_child_bounties::weights::SubstrateWeight; } @@ -1040,6 +1060,7 @@ construct_runtime!( Aura: pallet_aura::{Pallet, Storage, Config}, Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned}, + Indices: pallet_indices::{Pallet, Call, Storage, Config, Event}, Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event}, Council: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config}, @@ -1052,6 +1073,7 @@ construct_runtime!( Bounties: pallet_bounties::{Pallet, Call, Storage, Event}, ChildBounties: pallet_child_bounties::{Pallet, Call, Storage, Event}, BagsList: pallet_bags_list::{Pallet, Call, Storage, Event}, + NominationPools: pallet_nomination_pools::{Pallet, Call, Storage, Event}, Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event}, Preimage: pallet_preimage::{Pallet, Call, Storage, Event}, @@ -1066,7 +1088,7 @@ construct_runtime!( HasherBn254: pallet_hasher::::{Pallet, Call, Storage, Event, Config}, AssetRegistry: pallet_asset_registry::{Pallet, Call, Storage, Event, Config}, - Currencies: orml_currencies::{Pallet, Call, Event}, + Currencies: orml_currencies::{Pallet, Call}, Tokens: orml_tokens::{Pallet, Storage, Call, Event}, TokenWrapper: pallet_token_wrapper::{Pallet, Storage, Call, Event}, diff --git a/standalone/runtime/src/protocol_substrate_config.rs b/standalone/runtime/src/protocol_substrate_config.rs index 2cf79b7b5..81dda6d84 100644 --- a/standalone/runtime/src/protocol_substrate_config.rs +++ b/standalone/runtime/src/protocol_substrate_config.rs @@ -1,7 +1,7 @@ use crate::*; use codec::{Decode, Encode}; -use frame_support::traits::Nothing; -use orml_currencies::BasicCurrencyAdapter; +use frame_support::{pallet_prelude::ConstU32, traits::Nothing}; +use orml_currencies::{BasicCurrencyAdapter, NativeCurrencyOf}; use webb_primitives::{ hashing::{ethereum::Keccak256HasherBn254, ArkworksPoseidonHasherBn254}, verifying::ArkworksVerifierBn254, @@ -109,12 +109,13 @@ impl pallet_asset_registry::Config for Runtime { type AssetNativeLocation = (); type Balance = Balance; type Event = Event; - type NativeAssetId = NativeCurrencyId; + type NativeAssetId = GetNativeCurrencyId; type RegistryOrigin = frame_system::EnsureRoot; type StringLimit = RegistryStringLimit; type WeightInfo = (); } +pub type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { type Amount = Amount; type Balance = Balance; @@ -122,29 +123,35 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = AssetRegistry; - type MaxLocks = (); type OnDust = (); type WeightInfo = (); + type MaxLocks = ConstU32<2>; + type MaxReserves = ConstU32<2>; + type ReserveIdentifier = ReserveIdentifier; } +parameter_types! { + pub const GetNativeCurrencyId: webb_primitives::AssetId = 0; +} + +pub type NativeCurrency = NativeCurrencyOf; +pub type AdaptedBasicCurrency = BasicCurrencyAdapter; impl orml_currencies::Config for Runtime { - type Event = Event; - type GetNativeCurrencyId = NativeCurrencyId; type MultiCurrency = Tokens; - type NativeCurrency = BasicCurrencyAdapter; + type NativeCurrency = AdaptedBasicCurrency; + type GetNativeCurrencyId = GetNativeCurrencyId; type WeightInfo = (); } parameter_types! { pub const MixerPalletId: PalletId = PalletId(*b"py/mixer"); - pub const NativeCurrencyId: u32 = 0; pub const RegistryStringLimit: u32 = 10; } impl pallet_mixer::Config for Runtime { type Currency = Currencies; type Event = Event; - type NativeCurrencyId = NativeCurrencyId; + type NativeCurrencyId = GetNativeCurrencyId; type PalletId = MixerPalletId; type Tree = MerkleTreeBn254; type Verifier = MixerVerifierBn254; @@ -174,7 +181,7 @@ impl pallet_anchor::Config for Runtime { type Currency = Currencies; type Event = Event; type LinkableTree = LinkableTreeBn254; - type NativeCurrencyId = NativeCurrencyId; + type NativeCurrencyId = GetNativeCurrencyId; type PalletId = AnchorPalletId; type PostDepositHook = (); type Verifier = AnchorVerifierBn254; From 8a52e6b49c5902014ebffca7fc7f8be4d751cdcc Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Sat, 28 May 2022 01:23:17 -0400 Subject: [PATCH 2/4] Add deps, attempt to fix error --- Cargo.lock | 6 ++++-- runtime/Cargo.toml | 1 + runtime/src/lib.rs | 24 +++++++++++++++++++++++- standalone/runtime/Cargo.toml | 1 + standalone/runtime/src/lib.rs | 14 +++++++++++++- 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a57227ece..b9f5df90f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2774,6 +2774,7 @@ dependencies = [ "pallet-hasher", "pallet-indices", "pallet-linkable-tree", + "pallet-linkable-tree-rpc-runtime-api", "pallet-mixer", "pallet-mt", "pallet-mt-rpc-runtime-api", @@ -2933,6 +2934,7 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-linkable-tree", + "pallet-linkable-tree-rpc-runtime-api", "pallet-mixer", "pallet-mt", "pallet-mt-rpc-runtime-api", @@ -13095,9 +13097,9 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "digest 0.10.3", - "rand 0.8.5", + "rand 0.4.6", "static_assertions", ] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index e493c7c39..d11e0745b 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -34,6 +34,7 @@ pallet-hasher = { git = "https://github.com/webb-tools/protocol-substrate.git", pallet-mt = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-linkable-tree = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-mt-rpc-runtime-api = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } +pallet-linkable-tree-rpc-runtime-api = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-verifier = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 927e9ee2b..9a38631c3 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -54,7 +54,8 @@ use pallet_transaction_payment::{ }; use polkadot_runtime_common::impls::DealWithFees; use sp_runtime::{FixedPointNumber, Perquintill}; -use webb_primitives::AccountIndex; +use webb_primitives::{AccountIndex, ChainId, LeafIndex}; +use pallet_linkable_tree::types::EdgeMetadata; // A few exports that help ease life for downstream crates. pub use dkg_runtime_primitives::crypto::AuthorityId as DKGId; @@ -793,6 +794,27 @@ impl_runtime_apis! { } } + // impl pallet_mt_rpc_runtime_api::MerkleTreeApi for Runtime { + // fn get_leaf(tree_id: u32, index: u32) -> Option { + // let v = MerkleTreeBn254::leaves(tree_id, index); + // if v == Element::default() { + // None + // } else { + // Some(v) + // } + // } + // } + + // impl pallet_linkable_tree_rpc_runtime_api::LinkableTreeApi for Runtime { + // fn get_neighbor_roots(tree_id: u32) -> Vec { + // LinkableTreeBn254::get_neighbor_roots(tree_id).ok().unwrap_or_default() + // } + + // fn get_neighbor_edges(tree_id: u32) -> Vec> { + // LinkableTreeBn254::get_neighbor_edges(tree_id).ok().unwrap_or_default() + // } + // } + #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( diff --git a/standalone/runtime/Cargo.toml b/standalone/runtime/Cargo.toml index 67f6144bd..46997f933 100644 --- a/standalone/runtime/Cargo.toml +++ b/standalone/runtime/Cargo.toml @@ -35,6 +35,7 @@ pallet-hasher = { git = "https://github.com/webb-tools/protocol-substrate.git", pallet-mt = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-linkable-tree = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-mt-rpc-runtime-api = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } +pallet-linkable-tree-rpc-runtime-api = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } pallet-verifier = { git = "https://github.com/webb-tools/protocol-substrate.git", default-features = false } orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false } diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index 7f3fcd730..25b22d72f 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -61,7 +61,9 @@ use sp_std::prelude::*; use sp_version::NativeVersion; use sp_version::RuntimeVersion; use static_assertions::const_assert; -use webb_primitives::AccountIndex; +use webb_primitives::{AccountIndex, ChainId, LeafIndex}; +use protocol_substrate_config::Element; +use pallet_linkable_tree::types::EdgeMetadata; // A few exports that help ease life for downstream crates. pub use dkg_runtime_primitives::crypto::AuthorityId as DKGId; @@ -1356,6 +1358,16 @@ impl_runtime_apis! { } } + impl pallet_linkable_tree_rpc_runtime_api::LinkableTreeApi for Runtime { + fn get_neighbor_roots(tree_id: u32) -> Vec { + LinkableTreeBn254::get_neighbor_roots(tree_id).ok().unwrap_or_default() + } + + fn get_neighbor_edges(tree_id: u32) -> Vec> { + LinkableTreeBn254::get_neighbor_edges(tree_id).ok().unwrap_or_default() + } + } + #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( From 6bb7431e103fc20b78cbd536f1f6dbf8b7aa25c5 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Sat, 28 May 2022 20:04:55 -0400 Subject: [PATCH 3/4] Update standalone node/runtime, working on parachain node/runtime --- Cargo.lock | 149 +++++++++++++++++-------- node/Cargo.toml | 23 ++-- node/src/rpc.rs | 2 +- node/src/service.rs | 20 +++- runtime/Cargo.toml | 1 + runtime/src/lib.rs | 25 +---- standalone/node/Cargo.toml | 6 +- standalone/node/src/chain_spec.rs | 8 +- standalone/node/src/cli.rs | 23 +++- standalone/node/src/command.rs | 104 ++++++++++++------ standalone/node/src/command_helper.rs | 131 ++++++++++++++++++++++ standalone/node/src/lib.rs | 1 + standalone/node/src/main.rs | 1 + standalone/node/src/rpc.rs | 152 ++++---------------------- standalone/node/src/service.rs | 112 ++++++------------- standalone/runtime/Cargo.toml | 1 + standalone/runtime/src/impls.rs | 34 ------ standalone/runtime/src/lib.rs | 19 ++-- 18 files changed, 433 insertions(+), 379 deletions(-) create mode 100644 standalone/node/src/command_helper.rs delete mode 100644 standalone/runtime/src/impls.rs diff --git a/Cargo.lock b/Cargo.lock index b9f5df90f..babafb07f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -689,6 +689,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom 0.2.6", + "instant", + "pin-project-lite 0.2.9", + "rand 0.8.5", + "tokio", +] + [[package]] name = "backtrace" version = "0.3.65" @@ -1415,9 +1429,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6b561dcf059c85bbe388e0a7b0a1469acb3934cc0cfa148613a830629e3049" +checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b" dependencies = [ "glob", "libc", @@ -2210,6 +2224,35 @@ dependencies = [ "xcm", ] +[[package]] +name = "cumulus-relay-chain-inprocess-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures 0.3.21", + "futures-timer", + "parking_lot 0.12.0", + "polkadot-client", + "polkadot-service", + "sc-client-api", + "sc-consensus-babe", + "sc-network", + "sc-service", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-state-machine", + "tracing", +] + [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" @@ -2234,6 +2277,32 @@ dependencies = [ "thiserror", ] +[[package]] +name = "cumulus-relay-chain-rpc-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +dependencies = [ + "async-trait", + "backoff", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures 0.3.21", + "futures-timer", + "jsonrpsee", + "parity-scale-codec", + "parking_lot 0.12.0", + "polkadot-service", + "sc-client-api", + "sc-rpc-api", + "sp-api", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "tracing", + "url", +] + [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" @@ -2683,7 +2752,9 @@ dependencies = [ "cumulus-client-service", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", + "cumulus-relay-chain-rpc-interface", "derive_more", "dkg-gadget", "dkg-primitives", @@ -2692,7 +2763,7 @@ dependencies = [ "frame-benchmarking", "frame-benchmarking-cli", "hex-literal 0.3.4", - "jsonrpc-core", + "jsonrpsee", "log", "pallet-transaction-payment-rpc", "parity-scale-codec", @@ -2716,6 +2787,7 @@ dependencies = [ "sc-telemetry", "sc-tracing", "sc-transaction-pool", + "sc-transaction-pool-api", "serde", "sp-api", "sp-block-builder", @@ -2831,10 +2903,11 @@ dependencies = [ "egg-standalone-runtime", "frame-benchmarking", "frame-benchmarking-cli", + "frame-system", "futures 0.3.21", "hex-literal 0.2.2", "itertools 0.10.3", - "jsonrpc-core", + "jsonrpsee", "log", "pallet-im-online", "pallet-linkable-tree-rpc", @@ -2842,6 +2915,7 @@ dependencies = [ "pallet-mt", "pallet-mt-rpc", "pallet-mt-rpc-runtime-api", + "pallet-transaction-payment", "pallet-transaction-payment-rpc", "parity-scale-codec", "rand 0.7.3", @@ -2880,6 +2954,7 @@ dependencies = [ "sp-finality-grandpa", "sp-inherents", "sp-io", + "sp-keyring", "sp-keystore", "sp-offchain", "sp-runtime", @@ -2890,6 +2965,7 @@ dependencies = [ "substrate-build-script-utils 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", + "substrate-state-trie-migration-rpc", "webb-primitives", ] @@ -3378,13 +3454,11 @@ checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "flate2" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "libc", "libz-sys", "miniz_oxide", ] @@ -4412,21 +4486,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpc-core" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" -dependencies = [ - "futures 0.3.21", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "jsonrpsee" version = "0.13.1" @@ -5372,9 +5431,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "174c5e7b8fecdcbf27c63fc1d70c22a53f64bbd81c92c17b2b5723f52a3a24cf" +checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" dependencies = [ "cc", "pkg-config", @@ -6161,7 +6220,7 @@ dependencies = [ [[package]] name = "pallet-anchor" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6183,7 +6242,7 @@ dependencies = [ [[package]] name = "pallet-anchor-handler" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "frame-support", "frame-system", @@ -6209,7 +6268,7 @@ dependencies = [ [[package]] name = "pallet-asset-registry" version = "0.1.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6418,7 +6477,7 @@ dependencies = [ [[package]] name = "pallet-bridge" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "frame-support", "frame-system", @@ -6703,7 +6762,7 @@ dependencies = [ [[package]] name = "pallet-hasher" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6769,7 +6828,7 @@ dependencies = [ [[package]] name = "pallet-linkable-tree" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6789,7 +6848,7 @@ dependencies = [ [[package]] name = "pallet-linkable-tree-rpc" version = "0.1.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "jsonrpsee", "pallet-linkable-tree", @@ -6807,7 +6866,7 @@ dependencies = [ [[package]] name = "pallet-linkable-tree-rpc-runtime-api" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "pallet-linkable-tree", "parity-scale-codec", @@ -6836,7 +6895,7 @@ dependencies = [ [[package]] name = "pallet-mixer" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6892,7 +6951,7 @@ dependencies = [ [[package]] name = "pallet-mt" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6908,7 +6967,7 @@ dependencies = [ [[package]] name = "pallet-mt-rpc" version = "0.1.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "jsonrpsee", "pallet-mt", @@ -6926,7 +6985,7 @@ dependencies = [ [[package]] name = "pallet-mt-rpc-runtime-api" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "pallet-mt", "sp-api", @@ -7092,7 +7151,7 @@ dependencies = [ [[package]] name = "pallet-signature-bridge" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "frame-support", "frame-system", @@ -7215,7 +7274,7 @@ dependencies = [ [[package]] name = "pallet-token-wrapper" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -7307,7 +7366,7 @@ dependencies = [ [[package]] name = "pallet-verifier" version = "1.0.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "frame-support", "frame-system", @@ -7592,9 +7651,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" dependencies = [ "fixedbitset", "indexmap", @@ -13097,9 +13156,9 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "digest 0.10.3", - "rand 0.4.6", + "rand 0.8.5", "static_assertions", ] @@ -13634,7 +13693,7 @@ dependencies = [ [[package]] name = "webb-primitives" version = "0.1.0" -source = "git+https://github.com/webb-tools/protocol-substrate.git#8d3a0bca62f43f667ad258760dc7b272d7d98931" +source = "git+https://github.com/webb-tools/protocol-substrate.git#25c78fd4f8f40618401f971dfe93c05973a116a2" dependencies = [ "ark-bls12-377", "ark-bls12-381", diff --git a/node/Cargo.toml b/node/Cargo.toml index 60428fd50..872ebd5da 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -35,7 +35,7 @@ hex-literal = "0.3.1" clap = { version = "3.1", features = ["derive"] } # RPC related Dependencies -jsonrpc-core = "18.0.0" +jsonrpsee = { version = "0.13.0", features = ["server"] } # Local Dependencies egg-runtime = { path = "../runtime" } @@ -73,6 +73,7 @@ sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkad sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } ## Substrate Primitive Dependencies @@ -91,15 +92,17 @@ sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polk sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } # Cumulus dependencies -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22"} +cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22"} +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22"} +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22"} +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22"} +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22"} +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22"} +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22"} +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22"} +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22"} +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22"} # Polkadot dependencies polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22"} diff --git a/node/src/rpc.rs b/node/src/rpc.rs index 8b646a5f3..944c13dd3 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -7,7 +7,7 @@ use std::sync::Arc; -use egg_runtime::{opaque::Block, AccountId, Balance, Index as Nonce}; +use egg_runtime::{AccountId, Balance, Block, Index as Nonce}; use sc_client_api::AuxStore; pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor}; diff --git a/node/src/service.rs b/node/src/service.rs index b12051030..9c77f7afe 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -22,7 +22,7 @@ use jsonrpsee::RpcModule; use cumulus_client_cli::CollatorOptions; // Local Runtime Types -use egg_runtime::{opaque::Block, AccountId, Balance, Hash, Index as Nonce, RuntimeApi}; +use egg_runtime::{AccountId, Balance, Block, Hash, Index as Nonce, RuntimeApi}; // Cumulus Imports use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; @@ -40,7 +40,10 @@ use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; use sc_client_api::ExecutorProvider; use sc_executor::NativeElseWasmExecutor; use sc_network::NetworkService; -use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager}; +use sc_service::{ + config::BasePath, Configuration, PartialComponents, Role, TFullBackend, TFullClient, + TaskManager, +}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sp_api::ConstructRuntimeApi; use sp_keystore::SyncCryptoStorePtr; @@ -56,11 +59,11 @@ impl sc_executor::NativeExecutionDispatch for TemplateRuntimeExecutor { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { - parachain_template_runtime::api::dispatch(method, data) + egg_runtime::api::dispatch(method, data) } fn native_version() -> sc_executor::NativeVersion { - parachain_template_runtime::native_version() + egg_runtime::native_version() } } @@ -316,6 +319,15 @@ where warp_sync: None, })?; + let base_path = if parachain_config.base_path.is_some() { + match parachain_config.base_path.as_ref() { + Some(BasePath::Permanenent(path_buf)) => Some(path_buf.clone()), + _ => None, + } + } else { + None + }; + let rpc_builder = { let client = client.clone(); let transaction_pool = transaction_pool.clone(); diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index d11e0745b..ada5128f9 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -178,6 +178,7 @@ std = [ "pallet-mt/std", "pallet-linkable-tree/std", "pallet-mt-rpc-runtime-api/std", + "pallet-linkable-tree-rpc-runtime-api/std", "pallet-verifier/std", "orml-currencies/std", "orml-tokens/std", diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 9a38631c3..34c15bae8 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -49,13 +49,13 @@ use sp_version::RuntimeVersion; use frame_support::weights::{ ConstantMultiplier, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }; +use pallet_linkable_tree::types::EdgeMetadata; use pallet_transaction_payment::{ CurrencyAdapter, FeeDetails, Multiplier, RuntimeDispatchInfo, TargetedFeeAdjustment, }; use polkadot_runtime_common::impls::DealWithFees; use sp_runtime::{FixedPointNumber, Perquintill}; use webb_primitives::{AccountIndex, ChainId, LeafIndex}; -use pallet_linkable_tree::types::EdgeMetadata; // A few exports that help ease life for downstream crates. pub use dkg_runtime_primitives::crypto::AuthorityId as DKGId; @@ -68,6 +68,8 @@ pub use frame_support::{ }, PalletId, StorageValue, }; +#[cfg(any(feature = "std", test))] +pub use frame_system::Call as SystemCall; use frame_system::{ limits::{BlockLength, BlockWeights}, EnsureRoot, @@ -794,27 +796,6 @@ impl_runtime_apis! { } } - // impl pallet_mt_rpc_runtime_api::MerkleTreeApi for Runtime { - // fn get_leaf(tree_id: u32, index: u32) -> Option { - // let v = MerkleTreeBn254::leaves(tree_id, index); - // if v == Element::default() { - // None - // } else { - // Some(v) - // } - // } - // } - - // impl pallet_linkable_tree_rpc_runtime_api::LinkableTreeApi for Runtime { - // fn get_neighbor_roots(tree_id: u32) -> Vec { - // LinkableTreeBn254::get_neighbor_roots(tree_id).ok().unwrap_or_default() - // } - - // fn get_neighbor_edges(tree_id: u32) -> Vec> { - // LinkableTreeBn254::get_neighbor_edges(tree_id).ok().unwrap_or_default() - // } - // } - #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( diff --git a/standalone/node/Cargo.toml b/standalone/node/Cargo.toml index cfd1fe8f0..bd230d477 100644 --- a/standalone/node/Cargo.toml +++ b/standalone/node/Cargo.toml @@ -55,8 +55,10 @@ sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polka sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", features = ["wasmtime"] } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } @@ -92,11 +94,13 @@ sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } sp-transaction-storage-proof = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } # RPC related dependencies -jsonrpc-core = "18.0.0" +jsonrpsee = { version = "0.13.0", features = ["server"] } sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } diff --git a/standalone/node/src/chain_spec.rs b/standalone/node/src/chain_spec.rs index 09ccaa6f1..1242aa96f 100644 --- a/standalone/node/src/chain_spec.rs +++ b/standalone/node/src/chain_spec.rs @@ -16,9 +16,9 @@ use arkworks_setups::{common::setup_params, Curve}; use egg_runtime::{ AccountId, AnchorBn254Config, AnchorVerifierBn254Config, AssetRegistryConfig, Balance, BalancesConfig, DKGConfig, DKGId, DKGProposalsConfig, ElectionsConfig, GenesisConfig, - HasherBn254Config, MerkleTreeBn254Config, MixerBn254Config, MixerVerifierBn254Config, Perbill, - SessionConfig, Signature, StakerStatus, StakingConfig, SudoConfig, SystemConfig, - MAX_NOMINATIONS, UNIT, WASM_BINARY, + HasherBn254Config, MaxNominations, MerkleTreeBn254Config, MixerBn254Config, + MixerVerifierBn254Config, Perbill, SessionConfig, Signature, StakerStatus, StakingConfig, + SudoConfig, SystemConfig, UNIT, WASM_BINARY, }; use hex_literal::hex; use sc_network::config::MultiaddrWithPeerId; @@ -380,7 +380,7 @@ fn testnet_genesis( .map(|x| (x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator)) .chain(initial_nominators.iter().map(|x| { use rand::{seq::SliceRandom, Rng}; - let limit = (MAX_NOMINATIONS as usize).min(initial_authorities.len()); + let limit = (MaxNominations::get() as usize).min(initial_authorities.len()); let count = rng.gen::() % limit; let nominations = initial_authorities .as_slice() diff --git a/standalone/node/src/cli.rs b/standalone/node/src/cli.rs index 820479148..ee12ca15c 100644 --- a/standalone/node/src/cli.rs +++ b/standalone/node/src/cli.rs @@ -14,21 +14,23 @@ // You should have received a copy of the GNU General Public License // along with Cumulus. If not, see . +use sc_cli::RunCmd; + #[derive(Debug, clap::Parser)] pub struct Cli { #[clap(subcommand)] pub subcommand: Option, - #[allow(missing_docs)] #[clap(flatten)] - pub run: sc_cli::RunCmd, + pub run: RunCmd, } -#[derive(Debug, clap::Parser)] +#[derive(Debug, clap::Subcommand)] pub enum Subcommand { /// Key management cli utilities #[clap(subcommand)] Key(sc_cli::KeySubcommand), + /// Build a chain specification. BuildSpec(sc_cli::BuildSpecCmd), @@ -50,7 +52,18 @@ pub enum Subcommand { /// Revert the chain to a previous state. Revert(sc_cli::RevertCmd), - /// The custom benchmark subcommmand benchmarking runtime pallets. - #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] + /// Sub-commands concerned with benchmarking. + #[clap(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), + + /// Try some command against runtime state. + #[cfg(feature = "try-runtime")] + TryRuntime(try_runtime_cli::TryRuntimeCmd), + + /// Try some command against runtime state. Note: `try-runtime` feature must be enabled. + #[cfg(not(feature = "try-runtime"))] + TryRuntime, + + /// Db meta columns information. + ChainInfo(sc_cli::ChainInfoCmd), } diff --git a/standalone/node/src/command.rs b/standalone/node/src/command.rs index ff5d92bb2..a015ff412 100644 --- a/standalone/node/src/command.rs +++ b/standalone/node/src/command.rs @@ -1,32 +1,18 @@ -// This file is part of Substrate. - -// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - use crate::{ chain_spec, cli::{Cli, Subcommand}, + command_helper::{inherent_benchmark_data, BenchmarkExtrinsicBuilder}, service, }; use egg_runtime::Block; +use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use sc_cli::{ChainSpec, RuntimeVersion, SubstrateCli}; use sc_service::PartialComponents; +use std::sync::Arc; impl SubstrateCli for Cli { fn impl_name() -> String { - "Substrate Node".into() + "Egg Standalone Substrate Node".into() } fn impl_version() -> String { @@ -53,7 +39,6 @@ impl SubstrateCli for Cli { Ok(match id { "dev" => Box::new(chain_spec::development_config()?), "" | "local" => Box::new(chain_spec::local_testnet_config()?), - "testnet-conf" => Box::new(chain_spec::arana_testnet_config()?), path => Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?), }) @@ -113,26 +98,79 @@ pub fn run() -> sc_cli::Result<()> { runner.async_run(|config| { let PartialComponents { client, task_manager, backend, .. } = service::new_partial(&config)?; - Ok((cmd.run(client, backend), task_manager)) + let aux_revert = Box::new(|client, _, blocks| { + sc_finality_grandpa::revert(client, blocks)?; + Ok(()) + }); + Ok((cmd.run(client, backend, Some(aux_revert)), task_manager)) }) }, - Some(Subcommand::Benchmark(cmd)) => - if cfg!(feature = "runtime-benchmarks") { - let runner = cli.create_runner(cmd)?; + Some(Subcommand::Benchmark(cmd)) => { + let runner = cli.create_runner(cmd)?; + + runner.sync_run(|config| { + // This switch needs to be in the client, since the client decides + // which sub-commands it wants to support. + match cmd { + BenchmarkCmd::Pallet(cmd) => { + if !cfg!(feature = "runtime-benchmarks") { + return Err( + "Runtime benchmarking wasn't enabled when building the node. \ + You can enable it with `--features runtime-benchmarks`." + .into(), + ) + } - runner.sync_run(|config| cmd.run::(config)) - } else { - Err("Benchmarking wasn't enabled when building the node. You can enable it with \ - `--features runtime-benchmarks`." - .into()) - }, + cmd.run::(config) + }, + BenchmarkCmd::Block(cmd) => { + let PartialComponents { client, .. } = service::new_partial(&config)?; + cmd.run(client) + }, + BenchmarkCmd::Storage(cmd) => { + let PartialComponents { client, backend, .. } = + service::new_partial(&config)?; + let db = backend.expose_db(); + let storage = backend.expose_storage(); + + cmd.run(config, client, db, storage) + }, + BenchmarkCmd::Overhead(cmd) => { + let PartialComponents { client, .. } = service::new_partial(&config)?; + let ext_builder = BenchmarkExtrinsicBuilder::new(client.clone()); + + cmd.run(config, client, inherent_benchmark_data()?, Arc::new(ext_builder)) + }, + BenchmarkCmd::Machine(cmd) => + cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()), + } + }) + }, + #[cfg(feature = "try-runtime")] + Some(Subcommand::TryRuntime(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.async_run(|config| { + // we don't need any of the components of new_partial, just a runtime, or a task + // manager to do `async_run`. + let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); + let task_manager = + sc_service::TaskManager::new(config.tokio_handle.clone(), registry) + .map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?; + Ok((cmd.run::(config), task_manager)) + }) + }, + #[cfg(not(feature = "try-runtime"))] + Some(Subcommand::TryRuntime) => Err("TryRuntime wasn't enabled when building the node. \ + You can enable it with `--features try-runtime`." + .into()), + Some(Subcommand::ChainInfo(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.sync_run(|config| cmd.run::(&config)) + }, None => { let runner = cli.create_runner(&cli.run)?; runner.run_node_until_exit(|config| async move { - match config.role { - _ => service::new_full(config), - } - .map_err(sc_cli::Error::Service) + service::new_full(config).map_err(sc_cli::Error::Service) }) }, } diff --git a/standalone/node/src/command_helper.rs b/standalone/node/src/command_helper.rs new file mode 100644 index 000000000..33c6761f4 --- /dev/null +++ b/standalone/node/src/command_helper.rs @@ -0,0 +1,131 @@ +// This file is part of Substrate. + +// Copyright (C) 2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +//! Contains code to setup the command invocations in [`super::command`] which would +//! otherwise bloat that module. + +use crate::service::FullClient; + +use egg_runtime as runtime; +use runtime::SystemCall; +use sc_cli::Result; +use sc_client_api::BlockBackend; +use sp_core::{Encode, Pair}; +use sp_inherents::{InherentData, InherentDataProvider}; +use sp_keyring::Sr25519Keyring; +use sp_runtime::{OpaqueExtrinsic, SaturatedConversion}; + +use std::{sync::Arc, time::Duration}; + +/// Generates extrinsics for the `benchmark overhead` command. +/// +/// Note: Should only be used for benchmarking. +pub struct BenchmarkExtrinsicBuilder { + client: Arc, +} + +impl BenchmarkExtrinsicBuilder { + /// Creates a new [`Self`] from the given client. + pub fn new(client: Arc) -> Self { + Self { client } + } +} + +impl frame_benchmarking_cli::ExtrinsicBuilder for BenchmarkExtrinsicBuilder { + fn remark(&self, nonce: u32) -> std::result::Result { + let acc = Sr25519Keyring::Bob.pair(); + let extrinsic: OpaqueExtrinsic = create_benchmark_extrinsic( + self.client.as_ref(), + acc, + SystemCall::remark { remark: vec![] }.into(), + nonce, + ) + .into(); + + Ok(extrinsic) + } +} + +/// Create a transaction using the given `call`. +/// +/// Note: Should only be used for benchmarking. +pub fn create_benchmark_extrinsic( + client: &FullClient, + sender: sp_core::sr25519::Pair, + call: runtime::Call, + nonce: u32, +) -> runtime::UncheckedExtrinsic { + let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"); + let best_hash = client.chain_info().best_hash; + let best_block = client.chain_info().best_number; + + let period = runtime::BlockHashCount::get() + .checked_next_power_of_two() + .map(|c| c / 2) + .unwrap_or(2) as u64; + let extra: runtime::SignedExtra = ( + frame_system::CheckNonZeroSender::::new(), + frame_system::CheckSpecVersion::::new(), + frame_system::CheckTxVersion::::new(), + frame_system::CheckGenesis::::new(), + frame_system::CheckEra::::from(sp_runtime::generic::Era::mortal( + period, + best_block.saturated_into(), + )), + frame_system::CheckNonce::::from(nonce), + frame_system::CheckWeight::::new(), + pallet_transaction_payment::ChargeTransactionPayment::::from(0), + ); + + let raw_payload = runtime::SignedPayload::from_raw( + call.clone(), + extra.clone(), + ( + (), + runtime::VERSION.spec_version, + runtime::VERSION.transaction_version, + genesis_hash, + best_hash, + (), + (), + (), + ), + ); + let signature = raw_payload.using_encoded(|e| sender.sign(e)); + + runtime::UncheckedExtrinsic::new_signed( + call.clone(), + sp_runtime::AccountId32::from(sender.public()).into(), + runtime::Signature::Sr25519(signature.clone()), + extra.clone(), + ) +} + +/// Generates inherent data for the `benchmark overhead` command. +/// +/// Note: Should only be used for benchmarking. +pub fn inherent_benchmark_data() -> Result { + let mut inherent_data = InherentData::new(); + let d = Duration::from_millis(0); + let timestamp = sp_timestamp::InherentDataProvider::new(d.into()); + + timestamp + .provide_inherent_data(&mut inherent_data) + .map_err(|e| format!("creating inherent data: {:?}", e))?; + Ok(inherent_data) +} diff --git a/standalone/node/src/lib.rs b/standalone/node/src/lib.rs index f117b8aae..ef50d0e37 100644 --- a/standalone/node/src/lib.rs +++ b/standalone/node/src/lib.rs @@ -1,3 +1,4 @@ pub mod chain_spec; +pub mod command_helper; pub mod rpc; pub mod service; diff --git a/standalone/node/src/main.rs b/standalone/node/src/main.rs index 4449d28b9..0f2fbd5a9 100644 --- a/standalone/node/src/main.rs +++ b/standalone/node/src/main.rs @@ -6,6 +6,7 @@ mod chain_spec; mod service; mod cli; mod command; +mod command_helper; mod rpc; fn main() -> sc_cli::Result<()> { diff --git a/standalone/node/src/rpc.rs b/standalone/node/src/rpc.rs index 31385a8d7..50e41dbfc 100644 --- a/standalone/node/src/rpc.rs +++ b/standalone/node/src/rpc.rs @@ -1,167 +1,57 @@ -// This file is part of Substrate. - -// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - //! A collection of node-specific RPC methods. -//! -//! Since `substrate` core functionality makes no assumptions -//! about the modules used inside the runtime, so do -//! RPC methods defined in `sc-rpc` crate. -//! It means that `client/rpc` can't have any methods that -//! need some strong assumptions about the particular runtime. -//! -//! The RPCs available in this crate however can make some assumptions -//! about how the runtime is constructed and what FRAME pallets -//! are part of it. Therefore all node-runtime-specific RPCs can -//! be placed here or imported from corresponding FRAME RPC definitions. +//! Substrate provides the `sc-rpc` crate, which defines the core RPC layer +//! used by Substrate nodes. This file extends those RPC definitions with +//! capabilities that are specific to this project's runtime configuration. #![warn(missing_docs)] -#![warn(unused_crate_dependencies)] use std::sync::Arc; -use egg_runtime::Element; +use egg_runtime::{opaque::Block, AccountId, Balance, Index}; use jsonrpsee::RpcModule; -use sc_client_api::AuxStore; -use sc_consensus_epochs::SharedEpochChanges; -use sc_finality_grandpa::{ - FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState, -}; -use sc_finality_grandpa_rpc::GrandpaRpc; -use sc_rpc::SubscriptionTaskExecutor; -pub use sc_rpc_api::DenyUnsafe; use sc_transaction_pool_api::TransactionPool; use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; -use sp_consensus::SelectChain; -use sp_keystore::SyncCryptoStorePtr; -use webb_primitives::{ - opaque::Block, AccountId, Balance, BlockNumber, ChainId, Hash, Index, LeafIndex, -}; - -pub use jsonrpc_core::IoHandler; -use pallet_linkable_tree_rpc::LinkableTreeClient; -use pallet_mt_rpc::MerkleTreeClient; - -/// Extra dependencies for GRANDPA -pub struct GrandpaDeps { - /// Voting round info. - pub shared_voter_state: SharedVoterState, - /// Authority set info. - pub shared_authority_set: SharedAuthoritySet, - /// Receives notifications about justification events from Grandpa. - pub justification_stream: GrandpaJustificationStream, - /// Executor to drive the subscription manager in the Grandpa RPC handler. - pub subscription_executor: SubscriptionTaskExecutor, - /// Finality proof provider. - pub finality_provider: Arc>, -} +pub use sc_rpc_api::DenyUnsafe; /// Full client dependencies. -pub struct FullDeps { +pub struct FullDeps { /// The client instance to use. pub client: Arc, /// Transaction pool instance. pub pool: Arc

, - /// The SelectChain Strategy - pub select_chain: SC, - /// A copy of the chain spec. - pub chain_spec: Box, /// Whether to deny unsafe calls pub deny_unsafe: DenyUnsafe, - /// GRANDPA specific dependencies. - pub grandpa: GrandpaDeps, } -/// Instantiate all Full RPC extensions. -pub fn create_full( - deps: FullDeps, - backend: Arc, +/// Instantiate all full RPC extensions. +pub fn create_full( + deps: FullDeps, ) -> Result, Box> where - C: ProvideRuntimeApi - + sc_client_api::BlockBackend - + HeaderBackend - + AuxStore - + HeaderMetadata - + Sync - + Send - + 'static, + C: ProvideRuntimeApi, + C: HeaderBackend + HeaderMetadata + 'static, + C: Send + Sync + 'static, C::Api: substrate_frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, C::Api: BlockBuilder, - C::Api: pallet_mt_rpc_runtime_api::MerkleTreeApi, - C::Api: - pallet_linkable_tree_rpc_runtime_api::LinkableTreeApi, P: TransactionPool + 'static, - SC: SelectChain + 'static, - B: sc_client_api::Backend + Send + Sync + 'static, - B::State: sc_client_api::backend::StateBackend>, { - use pallet_linkable_tree_rpc::LinkableTreeRpcApiServer; - use pallet_mt_rpc::MerkleTreeRpcApiServer; use pallet_transaction_payment_rpc::{TransactionPaymentApiServer, TransactionPaymentRpc}; - use sc_consensus_babe_rpc::BabeApiServer; - use sc_finality_grandpa_rpc::GrandpaApiServer; - use sc_rpc::dev::{Dev, DevApiServer}; - use sc_sync_state_rpc::{SyncStateRpc, SyncStateRpcApiServer}; use substrate_frame_rpc_system::{SystemApiServer, SystemRpc}; - use substrate_state_trie_migration_rpc::StateMigrationApiServer; - - let mut io = RpcModule::new(()); - let FullDeps { client, pool, select_chain, chain_spec, deny_unsafe, babe, grandpa } = deps; - - let GrandpaDeps { - shared_voter_state, - shared_authority_set, - justification_stream, - subscription_executor, - finality_provider, - } = grandpa; - io.merge(SystemRpc::new(client.clone(), pool, deny_unsafe).into_rpc())?; - // Making synchronous calls in light client freezes the browser currently, - // more context: https://github.com/paritytech/substrate/pull/3480 - // These RPCs should use an asynchronous caller instead. - io.merge(TransactionPaymentRpc::new(client.clone()).into_rpc())?; - io.merge( - GrandpaRpc::new( - subscription_executor, - shared_authority_set.clone(), - shared_voter_state, - justification_stream, - finality_provider, - ) - .into_rpc(), - )?; + let mut module = RpcModule::new(()); + let FullDeps { client, pool, deny_unsafe } = deps; - io.merge( - SyncStateRpc::new(chain_spec, client.clone(), shared_authority_set, shared_epoch_changes)? - .into_rpc(), - )?; + module.merge(SystemRpc::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?; + module.merge(TransactionPaymentRpc::new(client).into_rpc())?; - io.merge( - substrate_state_trie_migration_rpc::MigrationRpc::new(client.clone(), backend, deny_unsafe) - .into_rpc(), - )?; - io.merge(Dev::new(client.clone(), deny_unsafe).into_rpc())?; + // Extend this RPC with a custom API by using the following syntax. + // `YourRpcStruct` should have a reference to a client, which is needed + // to call into the runtime. + // `module.merge(YourRpcTrait::into_rpc(YourRpcStruct::new(ReferenceToClient, ...)))?;` - io.merge(MerkleTreeClient::new(client.clone(), deny_unsafe).into_rpc())?; - io.merge(LinkableTreeClient::new(client, deny_unsafe).into_rpc())?; - Ok(io) + Ok(module) } diff --git a/standalone/node/src/service.rs b/standalone/node/src/service.rs index b9158df17..ce8eae6ea 100644 --- a/standalone/node/src/service.rs +++ b/standalone/node/src/service.rs @@ -20,9 +20,8 @@ use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; pub use sc_executor::NativeElseWasmExecutor; use sc_finality_grandpa::SharedVoterState; use sc_keystore::LocalKeystore; -use sc_service::{error::Error as ServiceError, BasePath, Configuration, TaskManager}; +use sc_service::{config::BasePath, error::Error as ServiceError, Configuration, TaskManager}; use sc_telemetry::{Telemetry, TelemetryWorker}; -use sp_consensus::SlotData; use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use std::{sync::Arc, time::Duration}; @@ -61,20 +60,13 @@ pub fn new_partial( sc_consensus::DefaultImportQueue, sc_transaction_pool::FullPool, ( - impl Fn( - crate::rpc::DenyUnsafe, - sc_rpc::SubscriptionTaskExecutor, - ) -> Result, - ( - sc_finality_grandpa::GrandpaBlockImport< - FullBackend, - Block, - FullClient, - FullSelectChain, - >, - sc_finality_grandpa::LinkHalf, - ), - sc_finality_grandpa::SharedVoterState, + sc_finality_grandpa::GrandpaBlockImport< + FullBackend, + Block, + FullClient, + FullSelectChain, + >, + sc_finality_grandpa::LinkHalf, Option, ), >, @@ -104,7 +96,7 @@ pub fn new_partial( let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::( - &config, + config, telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), executor, )?; @@ -143,9 +135,9 @@ pub fn new_partial( let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *timestamp, - slot_duration.slot_duration(), + slot_duration, ); Ok((timestamp, slot)) @@ -159,48 +151,6 @@ pub fn new_partial( telemetry: telemetry.as_ref().map(|x| x.handle()), })?; - let import_setup = (grandpa_block_import, grandpa_link); - - let (rpc_extensions_builder, rpc_setup) = { - let (_, grandpa_link) = &import_setup; - let justification_stream = grandpa_link.justification_stream(); - let shared_authority_set = grandpa_link.shared_authority_set().clone(); - let shared_voter_state = sc_finality_grandpa::SharedVoterState::empty(); - let rpc_setup = shared_voter_state.clone(); - - let finality_proof_provider = sc_finality_grandpa::FinalityProofProvider::new_for_service( - backend.clone(), - Some(shared_authority_set.clone()), - ); - - let client = client.clone(); - let pool = transaction_pool.clone(); - let select_chain = select_chain.clone(); - let chain_spec = config.chain_spec.cloned_box(); - - let rpc_backend = backend.clone(); - let rpc_extensions_builder = move |deny_unsafe, subscription_executor| { - let deps = crate::rpc::FullDeps { - client: client.clone(), - pool: pool.clone(), - select_chain: select_chain.clone(), - chain_spec: chain_spec.cloned_box(), - deny_unsafe, - grandpa: crate::rpc::GrandpaDeps { - shared_voter_state: shared_voter_state.clone(), - shared_authority_set: shared_authority_set.clone(), - justification_stream: justification_stream.clone(), - subscription_executor, - finality_provider: finality_proof_provider.clone(), - }, - }; - - crate::rpc::create_full(deps, rpc_backend.clone()).map_err(Into::into) - }; - - (rpc_extensions_builder, rpc_setup) - }; - Ok(sc_service::PartialComponents { client, backend, @@ -209,7 +159,7 @@ pub fn new_partial( keystore_container, select_chain, transaction_pool, - other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry), + other: (grandpa_block_import, grandpa_link, telemetry), }) } @@ -230,9 +180,9 @@ pub fn new_full(mut config: Configuration) -> Result mut keystore_container, select_chain, transaction_pool, - other: (rpc_extensions_builder, import_setup, _rpc_setup, mut telemetry), + other: (block_import, grandpa_link, mut telemetry), } = new_partial(&config)?; - let (block_import, grandpa_link) = import_setup; + if let Some(url) = &config.keystore_remote { match remote_keystore(url) { Ok(k) => keystore_container.set_remote_keystore(k), @@ -295,23 +245,27 @@ pub fn new_full(mut config: Configuration) -> Result None }; - if role.is_authority() { - dkg_primitives::utils::insert_controller_account_keys_into_keystore( - &config, - Some(keystore_container.sync_keystore()), - ); - } + let rpc_extensions_builder = { + let client = client.clone(); + let pool = transaction_pool.clone(); + + Box::new(move |deny_unsafe, _| { + let deps = + crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), deny_unsafe }; + crate::rpc::create_full(deps).map_err(Into::into) + }) + }; let _rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams { - config, - backend: backend.clone(), + network: network.clone(), client: client.clone(), keystore: keystore_container.sync_keystore(), - network: network.clone(), - rpc_extensions_builder: Box::new(rpc_extensions_builder), - transaction_pool: transaction_pool.clone(), task_manager: &mut task_manager, + transaction_pool: transaction_pool.clone(), + rpc_builder: rpc_extensions_builder, + backend: backend.clone(), system_rpc_tx, + config, telemetry: telemetry.as_mut(), })?; @@ -333,7 +287,9 @@ pub fn new_full(mut config: Configuration) -> Result None, dkg_gadget::start_dkg_gadget::<_, _, _>(dkg_params), ); + } + if role.is_authority() { let proposer_factory = sc_basic_authorship::ProposerFactory::new( task_manager.spawn_handle(), client.clone(), @@ -350,7 +306,7 @@ pub fn new_full(mut config: Configuration) -> Result let aura = sc_consensus_aura::start_aura::( StartAuraParams { slot_duration, - client: client.clone(), + client, select_chain, block_import, proposer_factory, @@ -358,9 +314,9 @@ pub fn new_full(mut config: Configuration) -> Result let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *timestamp, - slot_duration.slot_duration(), + slot_duration, ); Ok((timestamp, slot)) diff --git a/standalone/runtime/Cargo.toml b/standalone/runtime/Cargo.toml index 46997f933..c91cc479d 100644 --- a/standalone/runtime/Cargo.toml +++ b/standalone/runtime/Cargo.toml @@ -190,6 +190,7 @@ std = [ "pallet-mt/std", "pallet-linkable-tree/std", "pallet-mt-rpc-runtime-api/std", + "pallet-linkable-tree-rpc-runtime-api/std", "pallet-verifier/std", "orml-currencies/std", "orml-tokens/std", diff --git a/standalone/runtime/src/impls.rs b/standalone/runtime/src/impls.rs deleted file mode 100644 index 97664c693..000000000 --- a/standalone/runtime/src/impls.rs +++ /dev/null @@ -1,34 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! Some configurable implementations as associated type for the substrate runtime. - -use crate::{AccountId, Authorship, Balances, NegativeImbalance, Runtime}; -use frame_support::traits::{ - fungibles::{Balanced, CreditOf}, - Currency, OnUnbalanced, -}; -use pallet_asset_tx_payment::HandleCredit; - -pub struct Author; -impl OnUnbalanced for Author { - fn on_nonzero_unbalanced(amount: NegativeImbalance) { - if let Some(author) = Authorship::author() { - Balances::resolve_creating(&author, amount); - } - } -} diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index 25b22d72f..9024be430 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -20,7 +20,6 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); -pub mod impls; pub mod protocol_substrate_config; pub mod voter_bags; @@ -30,13 +29,12 @@ use frame_election_provider_support::{onchain, ExtendedBalance, SequentialPhragm use frame_support::weights::{ ConstantMultiplier, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }; -use impls::*; use pallet_dkg_proposals::DKGEcdsaToEthereum; use pallet_election_provider_multi_phase::SolutionAccuracyOf; use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, }; -use pallet_im_online::sr25519::AuthorityId as ImOnlineId; +use pallet_linkable_tree::types::EdgeMetadata; use pallet_session::historical as pallet_session_historical; pub use pallet_staking::StakerStatus; use pallet_transaction_payment::{ @@ -50,8 +48,8 @@ use sp_runtime::{ curve::PiecewiseLinear, generic, impl_opaque_keys, traits::{ - self, AccountIdLookup, BlakeTwo256, Block as BlockT, Convert, IdentifyAccount, NumberFor, - OpaqueKeys, StaticLookup, Verify, + self, BlakeTwo256, Block as BlockT, Convert, IdentifyAccount, NumberFor, OpaqueKeys, + StaticLookup, Verify, }, transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity}, ApplyExtrinsicResult, FixedPointNumber, MultiSignature, Perquintill, SaturatedConversion, @@ -61,14 +59,15 @@ use sp_std::prelude::*; use sp_version::NativeVersion; use sp_version::RuntimeVersion; use static_assertions::const_assert; -use webb_primitives::{AccountIndex, ChainId, LeafIndex}; -use protocol_substrate_config::Element; -use pallet_linkable_tree::types::EdgeMetadata; +use webb_primitives::{linkable_tree::LinkableTreeInspector, AccountIndex, ChainId, LeafIndex}; + +#[cfg(any(feature = "std", test))] +pub use frame_system::Call as SystemCall; // A few exports that help ease life for downstream crates. pub use dkg_runtime_primitives::crypto::AuthorityId as DKGId; pub use frame_support::{ - construct_runtime, match_type, + construct_runtime, pallet_prelude::Get, parameter_types, traits::{ @@ -348,8 +347,6 @@ parameter_types! { pub const MaxReserves: u32 = 50; } -type NegativeImbalance = >::NegativeImbalance; - impl pallet_balances::Config for Runtime { /// The type for recording an account's balance. type Balance = Balance; From 613da9e3399ee369ef0c977e038449d4c09fe812 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Sat, 28 May 2022 21:43:20 -0400 Subject: [PATCH 4/4] Fix parachain build --- Cargo.lock | 1 + node/Cargo.toml | 1 + node/src/cli.rs | 50 ++++++++-------- node/src/command.rs | 136 ++++++++++++++++++++++++++++++++------------ node/src/rpc.rs | 2 +- node/src/service.rs | 23 +++++--- runtime/src/lib.rs | 35 +++++++++--- 7 files changed, 172 insertions(+), 76 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index babafb07f..29b5cdfd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2806,6 +2806,7 @@ dependencies = [ "substrate-build-script-utils 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22)", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", + "try-runtime-cli", ] [[package]] diff --git a/node/Cargo.toml b/node/Cargo.toml index 872ebd5da..3895b21e9 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -75,6 +75,7 @@ sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polk sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } ## Substrate Primitive Dependencies sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } diff --git a/node/src/cli.rs b/node/src/cli.rs index 725bc8c72..fb9de8f90 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -14,12 +14,10 @@ use crate::chain_spec; use clap::Parser; -use cumulus_client_cli; -use sc_cli::{self, KeySubcommand}; use std::path::PathBuf; /// Sub-commands supported by the collator. -#[derive(Debug, clap::Parser)] +#[derive(Debug, clap::Subcommand)] pub enum Subcommand { /// Export the genesis state of the parachain. #[clap(name = "export-genesis-state")] @@ -29,10 +27,6 @@ pub enum Subcommand { #[clap(name = "export-genesis-wasm")] ExportGenesisWasm(ExportGenesisWasmCommand), - /// Key management cli utilities - #[clap(subcommand)] - Key(KeySubcommand), - /// Build a chain specification. BuildSpec(sc_cli::BuildSpecCmd), @@ -54,35 +48,33 @@ pub enum Subcommand { /// Revert the chain to a previous state. Revert(sc_cli::RevertCmd), - /// The custom benchmark subcommmand benchmarking runtime pallets. - #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] + /// Sub-commands concerned with benchmarking. + /// The pallet benchmarking moved to the `pallet` sub-command. + #[clap(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), + + /// Try some testing command against a specified runtime state. + TryRuntime(try_runtime_cli::TryRuntimeCmd), } /// Command for exporting the genesis state of the parachain -#[derive(Debug, clap::Parser)] +#[derive(Debug, Parser)] pub struct ExportGenesisStateCommand { /// Output file name or stdout if unspecified. #[clap(parse(from_os_str))] pub output: Option, - /// Id of the parachain this state is for. - /// - /// Default: 100 - #[clap(long, conflicts_with = "chain")] - pub parachain_id: Option, - /// Write output in binary. Default is to write in hex. #[clap(short, long)] pub raw: bool, /// The name of the chain for that the genesis state should be exported. - #[clap(long, conflicts_with = "parachain-id")] + #[clap(long)] pub chain: Option, } /// Command for exporting the genesis wasm file. -#[derive(Debug, clap::Parser)] +#[derive(Debug, Parser)] pub struct ExportGenesisWasmCommand { /// Output file name or stdout if unspecified. #[clap(parse(from_os_str))] @@ -97,12 +89,12 @@ pub struct ExportGenesisWasmCommand { pub chain: Option, } -#[derive(Debug, clap::Parser)] -#[clap(settings = &[ - clap::AppSettings::GlobalVersion, - clap::AppSettings::ArgsNegateSubcommands, - clap::AppSettings::SubcommandsNegateReqs, -])] +#[derive(Debug, Parser)] +#[clap( + propagate_version = true, + args_conflicts_with_subcommands = true, + subcommand_negates_reqs = true +)] pub struct Cli { #[clap(subcommand)] pub subcommand: Option, @@ -110,6 +102,16 @@ pub struct Cli { #[clap(flatten)] pub run: cumulus_client_cli::RunCmd, + /// Disable automatic hardware benchmarks. + /// + /// By default these benchmarks are automatically ran at startup and measure + /// the CPU speed, the memory bandwidth and the disk speed. + /// + /// The results are then printed out in the logs, and also sent as part of + /// telemetry, if telemetry is enabled. + #[clap(long)] + pub no_hardware_benchmarks: bool, + /// Relay chain arguments #[clap(raw = true)] pub relay_chain_args: Vec, diff --git a/node/src/command.rs b/node/src/command.rs index 4687ebfb1..abaed40d9 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -15,19 +15,23 @@ use crate::{ chain_spec, cli::{Cli, RelayChainCli, Subcommand}, - service::{new_partial, RuntimeExecutor}, + service::{new_partial, TemplateRuntimeExecutor}, }; use codec::Encode; use cumulus_client_service::genesis::generate_genesis_block; use cumulus_primitives_core::ParaId; use egg_runtime::{Block, RuntimeApi}; +use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use log::info; use polkadot_parachain::primitives::AccountIdConversion; use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli, }; -use sc_service::config::{BasePath, PrometheusConfig}; +use sc_service::{ + config::{BasePath, PrometheusConfig}, + TaskManager, +}; use sp_core::hexdisplay::HexDisplay; use sp_runtime::traits::Block as BlockT; use std::{io::Write, net::SocketAddr}; @@ -44,7 +48,7 @@ fn load_spec(id: &str) -> std::result::Result, St impl SubstrateCli for Cli { fn impl_name() -> String { - "Webb Protocol Egg Network Collator".into() + "Parachain Collator Template".into() } fn impl_version() -> String { @@ -52,13 +56,11 @@ impl SubstrateCli for Cli { } fn description() -> String { - format!( - "Webb Protocol Egg Network Collator\n\nThe command-line arguments provided first will be \ + "Parachain Collator Template\n\nThe command-line arguments provided first will be \ passed to the parachain node, while the arguments provided after -- will be passed \ - to the relaychain node.\n\n\ - {} [parachain-args] -- [relaychain-args]", - Self::executable_name() - ) + to the relay chain node.\n\n\ + parachain-collator -- " + .into() } fn author() -> String { @@ -66,11 +68,11 @@ impl SubstrateCli for Cli { } fn support_url() -> String { - "https://github.com/substrate-developer-hub/substrate-parachain-template/issues/new".into() + "https://github.com/paritytech/cumulus/issues/new".into() } fn copyright_start_year() -> i32 { - 2017 + 2020 } fn load_spec(&self, id: &str) -> std::result::Result, String> { @@ -84,7 +86,7 @@ impl SubstrateCli for Cli { impl SubstrateCli for RelayChainCli { fn impl_name() -> String { - "Webb Protocol Egg Network Collator".into() + "Parachain Collator Template".into() } fn impl_version() -> String { @@ -92,10 +94,10 @@ impl SubstrateCli for RelayChainCli { } fn description() -> String { - "Webb Protocol Egg Network Collator\n\nThe command-line arguments provided first will be \ + "Parachain Collator Template\n\nThe command-line arguments provided first will be \ passed to the parachain node, while the arguments provided after -- will be passed \ - to the relaychain node.\n\n\ - dkg_node [parachain-args] -- [relaychain-args]" + to the relay chain node.\n\n\ + parachain-collator -- " .into() } @@ -104,16 +106,15 @@ impl SubstrateCli for RelayChainCli { } fn support_url() -> String { - "https://github.com/substrate-developer-hub/substrate-parachain-template/issues/new".into() + "https://github.com/paritytech/cumulus/issues/new".into() } fn copyright_start_year() -> i32 { - 2017 + 2020 } fn load_spec(&self, id: &str) -> std::result::Result, String> { - polkadot_cli::Cli::from_iter([RelayChainCli::executable_name().to_string()].iter()) - .load_spec(id) + polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id) } fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { @@ -121,6 +122,7 @@ impl SubstrateCli for RelayChainCli { } } +#[allow(clippy::borrowed_box)] fn extract_genesis_wasm(chain_spec: &Box) -> Result> { let mut storage = chain_spec.build_storage()?; @@ -136,7 +138,7 @@ macro_rules! construct_async_run { runner.async_run(|$config| { let $components = new_partial::< RuntimeApi, - RuntimeExecutor, + TemplateRuntimeExecutor, _ >( &$config, @@ -196,9 +198,11 @@ pub fn run() -> Result<()> { cmd.run(config, polkadot_config) }) }, - Some(Subcommand::Revert(cmd)) => construct_async_run!(|components, cli, cmd, config| { - Ok(cmd.run(components.client, components.backend)) - }), + Some(Subcommand::Revert(cmd)) => { + construct_async_run!(|components, cli, cmd, config| { + Ok(cmd.run(components.client, components.backend, None)) + }) + }, Some(Subcommand::ExportGenesisState(params)) => { let mut builder = sc_cli::LoggerBuilder::new(""); builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); @@ -243,21 +247,71 @@ pub fn run() -> Result<()> { Ok(()) }, - Some(Subcommand::Benchmark(cmd)) => - if cfg!(feature = "runtime-benchmarks") { + Some(Subcommand::Benchmark(cmd)) => { + let runner = cli.create_runner(cmd)?; + // Switch on the concrete benchmark sub-command- + match cmd { + BenchmarkCmd::Pallet(cmd) => + if cfg!(feature = "runtime-benchmarks") { + runner.sync_run(|config| cmd.run::(config)) + } else { + Err("Benchmarking wasn't enabled when building the node. \ + You can enable it with `--features runtime-benchmarks`." + .into()) + }, + BenchmarkCmd::Block(cmd) => runner.sync_run(|config| { + let partials = new_partial::( + &config, + crate::service::parachain_build_import_queue, + )?; + cmd.run(partials.client) + }), + BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| { + let partials = new_partial::( + &config, + crate::service::parachain_build_import_queue, + )?; + let db = partials.backend.expose_db(); + let storage = partials.backend.expose_storage(); + + cmd.run(config, partials.client.clone(), db, storage) + }), + BenchmarkCmd::Overhead(_) => Err("Unsupported benchmarking command".into()), + BenchmarkCmd::Machine(cmd) => + runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone())), + } + }, + Some(Subcommand::TryRuntime(cmd)) => { + if cfg!(feature = "try-runtime") { let runner = cli.create_runner(cmd)?; - runner.sync_run(|config| cmd.run::(config)) + // grab the task manager. + let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry); + let task_manager = + TaskManager::new(runner.config().tokio_handle.clone(), *registry) + .map_err(|e| format!("Error: {:?}", e))?; + + runner.async_run(|config| { + Ok((cmd.run::(config), task_manager)) + }) } else { - Err("Benchmarking wasn't enabled when building the node. \ - You can enable it with `--features runtime-benchmarks`." - .into()) - }, - Some(Subcommand::Key(cmd)) => cmd.run(&cli), + Err("Try-runtime must be enabled by `--features try-runtime`.".into()) + } + }, None => { let runner = cli.create_runner(&cli.run.normalize())?; + let collator_options = cli.run.collator_options(); runner.run_node_until_exit(|config| async move { + let hwbench = if !cli.no_hardware_benchmarks { + config.database.path().map(|database_path| { + let _ = std::fs::create_dir_all(&database_path); + sc_sysinfo::gather_hwbench(Some(database_path)) + }) + } else { + None + }; + let para_id = chain_spec::Extensions::try_get(&*config.chain_spec) .map(|e| e.para_id) .ok_or_else(|| "Could not find parachain ID in chain-spec.")?; @@ -270,7 +324,7 @@ pub fn run() -> Result<()> { let id = ParaId::from(para_id); let parachain_account = - AccountIdConversion::::into_account(&id); + AccountIdConversion::::into_account(&id); let state_version = RelayChainCli::native_runtime_version(&config.chain_spec).state_version(); @@ -288,10 +342,16 @@ pub fn run() -> Result<()> { info!("Parachain genesis state: {}", genesis_state); info!("Is collating: {}", if config.role.is_authority() { "yes" } else { "no" }); - crate::service::start_parachain_node(config, polkadot_config, id) - .await - .map(|r| r.0) - .map_err(Into::into) + crate::service::start_parachain_node( + config, + polkadot_config, + collator_options, + id, + hwbench, + ) + .await + .map(|r| r.0) + .map_err(Into::into) }) }, } @@ -428,4 +488,8 @@ impl CliConfiguration for RelayChainCli { ) -> Result> { self.base.base.telemetry_endpoints(chain_spec) } + + fn node_name(&self) -> Result { + self.base.base.node_name() + } } diff --git a/node/src/rpc.rs b/node/src/rpc.rs index 944c13dd3..8b646a5f3 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -7,7 +7,7 @@ use std::sync::Arc; -use egg_runtime::{AccountId, Balance, Block, Index as Nonce}; +use egg_runtime::{opaque::Block, AccountId, Balance, Index as Nonce}; use sc_client_api::AuxStore; pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor}; diff --git a/node/src/service.rs b/node/src/service.rs index 9c77f7afe..b64f8c19a 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -22,7 +22,7 @@ use jsonrpsee::RpcModule; use cumulus_client_cli::CollatorOptions; // Local Runtime Types -use egg_runtime::{AccountId, Balance, Block, Hash, Index as Nonce, RuntimeApi}; +use egg_runtime::{opaque::Block, AccountId, Balance, Hash, Index as Nonce, RuntimeApi}; // Cumulus Imports use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; @@ -47,7 +47,7 @@ use sc_service::{ use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sp_api::ConstructRuntimeApi; use sp_keystore::SyncCryptoStorePtr; -use sp_runtime::traits::BlakeTwo256; +use sp_runtime::traits::{BlakeTwo256, NumberFor}; use substrate_prometheus_endpoint::Registry; use polkadot_service::CollatorPair; @@ -235,7 +235,12 @@ where + sp_block_builder::BlockBuilder + cumulus_primitives_core::CollectCollationInfo + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + substrate_frame_rpc_system::AccountNonceApi, + + substrate_frame_rpc_system::AccountNonceApi + + dkg_runtime_primitives::DKGApi< + Block, + dkg_runtime_primitives::crypto::AuthorityId, + NumberFor, + >, sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, Executor: sc_executor::NativeExecutionDispatch + 'static, RB: Fn( @@ -328,6 +333,13 @@ where None }; + if validator { + dkg_primitives::utils::insert_controller_account_keys_into_keystore( + ¶chain_config, + Some(params.keystore_container.sync_keystore()), + ); + } + let rpc_builder = { let client = client.clone(); let transaction_pool = transaction_pool.clone(); @@ -377,11 +389,6 @@ where let relay_chain_slot_duration = Duration::from_secs(6); if validator { - dkg_primitives::utils::insert_controller_account_keys_into_keystore( - ¶chain_config, - Some(params.keystore_container.sync_keystore()), - ); - let dkg_params = dkg_gadget::DKGParams { client: client.clone(), backend: backend.clone(), diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 34c15bae8..0085c0ae9 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -127,6 +127,7 @@ pub type SignedExtra = ( pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Extrinsic type that has already been checked. pub type CheckedExtrinsic = generic::CheckedExtrinsic; +/// Signed payload pub type SignedPayload = generic::SignedPayload; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< @@ -145,6 +146,23 @@ impl frame_support::traits::OnRuntimeUpgrade for OnRuntimeUpgrade { } } +/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know +/// the specifics of the runtime. They can then be made to be agnostic over specific formats +/// of data like extrinsics, allowing for them to continue syncing the network through upgrades +/// to even the core data structures. +pub mod opaque { + use super::*; + use sp_runtime::{generic, traits::BlakeTwo256}; + + pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic; + /// Opaque block header type. + pub type Header = generic::Header; + /// Opaque block type. + pub type Block = generic::Block; + /// Opaque block identifier type. + pub type BlockId = generic::BlockId; +} + /// Handles converting a weight scalar to a fee value, based on the scale and granularity of the /// node's balance type. /// @@ -532,7 +550,7 @@ where construct_runtime!( pub enum Runtime where Block = Block, - NodeBlock = generic::Block, + NodeBlock = opaque::Block, UncheckedExtrinsic = UncheckedExtrinsic, { System: frame_system::{Pallet, Call, Storage, Config, Event}, @@ -784,14 +802,17 @@ impl_runtime_apis! { } } - impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi< - Block, - Balance, - > for Runtime { - fn query_info(uxt: ::Extrinsic, len: u32) -> RuntimeDispatchInfo { + impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi for Runtime { + fn query_info( + uxt: ::Extrinsic, + len: u32, + ) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo { TransactionPayment::query_info(uxt, len) } - fn query_fee_details(uxt: ::Extrinsic, len: u32) -> FeeDetails { + fn query_fee_details( + uxt: ::Extrinsic, + len: u32, + ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } }