From 9e00d98964b6c81e1c5be286230ef3e0ac436071 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Jul 2022 13:12:55 +0300 Subject: [PATCH 01/19] Update deps to v0.9.26 Signed-off-by: Georgi Zlatarev --- Cargo.lock | 2031 +++++++---------- node/Cargo.toml | 110 +- node/src/cli.rs | 56 +- node/src/command.rs | 88 +- node/src/rpc/common.rs | 8 +- node/src/rpc/dolphin.rs | 8 +- node/src/service.rs | 4 +- pallets/asset-manager/Cargo.toml | 22 +- pallets/asset-manager/src/lib.rs | 10 +- pallets/collator-selection/Cargo.toml | 34 +- pallets/collator-selection/src/lib.rs | 4 +- pallets/manta-pay/Cargo.toml | 26 +- pallets/manta-pay/src/lib.rs | 2 +- pallets/tx-pause/Cargo.toml | 16 +- pallets/vesting/Cargo.toml | 22 +- primitives/manta/Cargo.toml | 20 +- primitives/session-keys/Cargo.toml | 10 +- runtime/calamari/Cargo.toml | 114 +- runtime/calamari/src/lib.rs | 18 +- .../calamari/src/weights/pallet_treasury.rs | 7 + runtime/calamari/src/xcm_config.rs | 1 + runtime/common/Cargo.toml | 55 +- runtime/dolphin/Cargo.toml | 118 +- runtime/dolphin/src/lib.rs | 16 +- .../dolphin/src/weights/pallet_treasury.rs | 7 + runtime/dolphin/src/xcm_config.rs | 1 + runtime/manta/Cargo.toml | 100 +- runtime/manta/src/lib.rs | 10 +- 28 files changed, 1305 insertions(+), 1613 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f31472b99..0e979d146 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -513,15 +513,6 @@ dependencies = [ "pin-project-lite 0.2.9", ] -[[package]] -name = "atomic" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg", -] - [[package]] name = "atomic-waker" version = "1.0.0" @@ -585,7 +576,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.28.4", + "object", "rustc-demangle", ] @@ -625,11 +616,11 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-primitives", "fnv", - "futures 0.3.21", + "futures", "futures-timer", "hex", "log", @@ -659,11 +650,11 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-gadget", "beefy-primitives", - "futures 0.3.21", + "futures", "jsonrpsee", "log", "parity-scale-codec", @@ -679,12 +670,16 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "beefy-primitives", + "sp-api", +] [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -783,17 +778,6 @@ dependencies = [ "constant_time_eq", ] -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq", -] - [[package]] name = "blake2b_simd" version = "1.0.0" @@ -899,160 +883,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bp-header-chain" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "bp-runtime", - "finality-grandpa", - "frame-support", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-message-dispatch" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "bp-runtime", - "frame-support", - "parity-scale-codec", - "scale-info", - "sp-std", -] - -[[package]] -name = "bp-messages" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "bitvec", - "bp-runtime", - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "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.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "bp-messages", - "bp-runtime", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-core", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-rococo" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "bp-messages", - "bp-polkadot-core", - "bp-runtime", - "frame-support", - "parity-scale-codec", - "smallvec", - "sp-api", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-runtime" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "frame-support", - "hash-db", - "num-traits", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", -] - -[[package]] -name = "bp-test-utils" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "bp-header-chain", - "ed25519-dalek", - "finality-grandpa", - "parity-scale-codec", - "sp-application-crypto", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-wococo" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "bp-messages", - "bp-polkadot-core", - "bp-rococo", - "bp-runtime", - "parity-scale-codec", - "sp-api", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bridge-runtime-common" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?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", - "scale-info", - "sp-api", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", -] - [[package]] name = "bs58" version = "0.4.0" @@ -1392,16 +1222,16 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.18" +version = "3.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" +checksum = "44bbe24bbd31a185bc2c4f7c2abe80bea13a20d57ee4e55be70ac512bdc76417" dependencies = [ "atty", "bitflags", "clap_derive", "clap_lex", "indexmap", - "lazy_static", + "once_cell", "strsim", "termcolor", "textwrap 0.15.0", @@ -1409,9 +1239,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.18" +version = "3.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" +checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -1422,13 +1252,22 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" dependencies = [ "os_str_bytes", ] +[[package]] +name = "cmake" +version = "0.1.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +dependencies = [ + "cc", +] + [[package]] name = "coarsetime" version = "0.1.22" @@ -1441,6 +1280,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "comfy-table" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b103d85ca6e209388771bfb7aa6b68a7aeec4afbf6f0a0264bfbf50360e5212e" +dependencies = [ + "strum 0.23.0", + "strum_macros 0.23.1", + "unicode-width", +] + [[package]] name = "concurrent-queue" version = "1.2.2" @@ -1513,59 +1363,60 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75" +checksum = "749d0d6022c9038dccf480bdde2a38d435937335bf2bb0f14e815d94517cdce8" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b" +checksum = "e94370cc7b37bf652ccd8bb8f09bd900997f7ccf97520edfc75554bb5c4abbea" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", + "cranelift-isle", "gimli", "log", - "regalloc", + "regalloc2", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24" +checksum = "e0a3cea8fdab90e44018c5b9a1dfd460d8ee265ac354337150222a354628bdb6" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc" +checksum = "5ac72f76f2698598951ab26d8c96eaa854810e693e7dd52523958b5909fde6b2" [[package]] name = "cranelift-entity" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf" +checksum = "09eaeacfcd2356fe0e66b295e8f9d59fdd1ac3ace53ba50de14d628ec902f72d" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce" +checksum = "dba69c9980d5ffd62c18a2bde927855fcd7c8dc92f29feaf8636052662cbd99c" dependencies = [ "cranelift-codegen", "log", @@ -1573,11 +1424,17 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cranelift-isle" +version = "0.85.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2920dc1e05cac40304456ed3301fde2c09bd6a9b0210bcfa2f101398d628d5b" + [[package]] name = "cranelift-native" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501241b0cdf903412ec9075385ac9f2b1eb18a89044d1538e97fab603231f70c" +checksum = "f04dfa45f9b2a6f587c564d6b63388e00cd6589d2df6ea2758cf79e1a13285e6" dependencies = [ "cranelift-codegen", "libc", @@ -1586,9 +1443,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d9e4211bbc3268042a96dd4de5bd979cda22434991d035f5f8eacba987fad2" +checksum = "31a46513ae6f26f3f267d8d75b5373d555fbbd1e68681f348d99df43f747ec54" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1770,15 +1627,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct 0.6.1", -] - [[package]] name = "ctor" version = "0.1.22" @@ -1812,24 +1660,28 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ - "clap 3.1.18", + "clap 3.2.15", + "parity-scale-codec", + "sc-chain-spec", "sc-cli", "sc-service", + "sp-core", + "sp-runtime", "url", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures 0.3.21", + "futures", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", @@ -1847,12 +1699,12 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", - "futures 0.3.21", + "futures", "parity-scale-codec", "sc-client-api", "sc-consensus", @@ -1876,12 +1728,12 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "dyn-clone", - "futures 0.3.21", + "futures", "parity-scale-codec", "polkadot-primitives", "sc-client-api", @@ -1897,13 +1749,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures 0.3.21", + "futures", "parking_lot 0.12.1", "sc-client-api", "sc-consensus", @@ -1921,12 +1773,12 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "derive_more", - "futures 0.3.21", + "futures", "futures-timer", "parity-scale-codec", "parking_lot 0.12.1", @@ -1946,11 +1798,11 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures 0.3.21", + "futures", "futures-timer", "parity-scale-codec", "polkadot-node-primitives", @@ -1970,7 +1822,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -1978,11 +1830,9 @@ dependencies = [ "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "parity-scale-codec", "parking_lot 0.12.1", "polkadot-overseer", "polkadot-primitives", - "sc-chain-spec", "sc-client-api", "sc-consensus", "sc-consensus-babe", @@ -2000,7 +1850,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-executive", "frame-support", @@ -2018,7 +1868,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2036,7 +1886,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -2066,7 +1916,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2077,7 +1927,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-benchmarking", "frame-support", @@ -2091,7 +1941,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2108,7 +1958,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -2127,7 +1977,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-support", "parity-scale-codec", @@ -2143,7 +1993,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2166,10 +2016,10 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", - "futures 0.3.21", + "futures", "parity-scale-codec", "sp-inherents", "sp-std", @@ -2179,7 +2029,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2196,20 +2046,21 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures 0.3.21", + "futures", "futures-timer", "parking_lot 0.12.1", + "polkadot-cli", "polkadot-client", "polkadot-service", + "sc-cli", "sc-client-api", "sc-consensus-babe", "sc-network", - "sc-service", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -2225,19 +2076,18 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-primitives-core", "derive_more", - "futures 0.3.21", + "futures", "jsonrpsee-core", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-overseer", "polkadot-service", "sc-client-api", - "sc-service", "sp-api", "sp-blockchain", "sp-core", @@ -2249,13 +2099,13 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "backoff", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures 0.3.21", + "futures", "futures-timer", "jsonrpsee", "parity-scale-codec", @@ -2275,7 +2125,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2466,17 +2316,6 @@ 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" @@ -2484,7 +2323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "redox_users 0.4.3", + "redox_users", "winapi", ] @@ -2495,7 +2334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.3", + "redox_users", "winapi", ] @@ -2622,9 +2461,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" +checksum = "9d07a982d1fb29db01e5a59b1918e03da4df7297eaeee7686ac45542fd4e59c8" [[package]] name = "ecdsa" @@ -2685,12 +2524,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - [[package]] name = "encoding_rs" version = "0.8.31" @@ -2795,7 +2628,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.21", + "futures", ] [[package]] @@ -2898,19 +2731,31 @@ dependencies = [ "log", ] +[[package]] +name = "filetime" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "windows-sys", +] + [[package]] name = "finality-grandpa" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9def033d8505edf199f6a5d07aa7e6d2d6185b164293b77f0efd108f4f3e11d" +checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" dependencies = [ "either", - "futures 0.3.21", + "futures", "futures-timer", "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "scale-info", ] @@ -2967,7 +2812,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", ] @@ -2985,7 +2830,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -3007,14 +2852,16 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "Inflector", "chrono", - "clap 3.1.18", + "clap 3.2.15", + "comfy-table", "frame-benchmarking", "frame-support", "frame-system", + "gethostname", "handlebars", "hash-db", "hex", @@ -3025,7 +2872,6 @@ dependencies = [ "log", "memory-db", "parity-scale-codec", - "prettytable-rs", "rand 0.8.5", "rand_pcg 0.3.1", "sc-block-builder", @@ -3057,7 +2903,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3068,7 +2914,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3084,7 +2930,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -3112,7 +2958,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "bitflags", "frame-metadata", @@ -3142,7 +2988,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -3154,7 +3000,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -3166,7 +3012,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro2", "quote", @@ -3176,7 +3022,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "log", @@ -3193,7 +3039,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -3208,7 +3054,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sp-api", @@ -3217,7 +3063,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "sp-api", @@ -3265,12 +3111,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - [[package]] name = "futures" version = "0.3.21" @@ -3353,8 +3193,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01fe9932a224b72b45336d96040aa86386d674a31d0af27d800ea7bc8ca97fe" dependencies = [ "futures-io", - "rustls 0.20.6", - "webpki 0.22.0", + "rustls", + "webpki", ] [[package]] @@ -3381,7 +3221,6 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ - "futures 0.1.31", "futures-channel", "futures-core", "futures-io", @@ -3394,6 +3233,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generic-array" version = "0.12.4" @@ -3413,6 +3261,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "getrandom" version = "0.1.16" @@ -3722,19 +3580,17 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ - "ct-logs", - "futures-util", + "http", "hyper", "log", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", + "rustls", + "rustls-native-certs", "tokio", - "tokio-rustls 0.22.0", - "webpki 0.21.4", + "tokio-rustls", ] [[package]] @@ -3786,7 +3642,7 @@ dependencies = [ "async-io", "core-foundation", "fnv", - "futures 0.3.21", + "futures", "if-addrs", "ipnet", "log", @@ -3826,12 +3682,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.11.2", + "hashbrown 0.12.1", "serde", ] @@ -3871,6 +3727,12 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" +[[package]] +name = "io-lifetimes" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb" + [[package]] name = "ip_network" version = "0.4.1" @@ -3936,9 +3798,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f2ab5a60e558e74ea93bcf5164ebc47939a7fff8938fa9b5233bbc63e16061" +checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-server", @@ -3951,20 +3813,20 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d682f4a55081a2be3e639280c640523070e4aeb8ee2fd8dd9168fdae57a9db" +checksum = "ce395539a14d3ad4ec1256fde105abd36a2da25d578a291cabe98f45adfdb111" dependencies = [ "futures-util", "http", "jsonrpsee-core", "jsonrpsee-types", - "pin-project 1.0.10", - "rustls-native-certs 0.6.2", + "pin-project", + "rustls-native-certs", "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tokio-util", "tracing", "webpki-roots", @@ -3972,9 +3834,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e27462b21279edf9a6a91f46ffbe125e9cdc58b901d2e08bf59b31a47d7d0ab" +checksum = "16efcd4477de857d4a2195a45769b2fe9ebb54f3ef5a4221d3b014a4fe33ec0b" dependencies = [ "anyhow", "arrayvec 0.7.2", @@ -3984,8 +3846,10 @@ dependencies = [ "futures-channel", "futures-timer", "futures-util", + "globset", "hyper", "jsonrpsee-types", + "lazy_static", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -3995,32 +3859,31 @@ dependencies = [ "thiserror", "tokio", "tracing", + "unicase", ] [[package]] name = "jsonrpsee-http-server" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7178f16eabd7154c094e24d295b9ee355ec1e5f24c328759c56255ff7bbd4548" +checksum = "bdd69efeb3ce2cba767f126872f4eeb4624038a29098e75d77608b2b4345ad03" dependencies = [ "futures-channel", "futures-util", - "globset", "hyper", "jsonrpsee-core", "jsonrpsee-types", - "lazy_static", + "serde", "serde_json", "tokio", "tracing", - "unicase", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8d7f449cab3b747f12c3efc27f5cad537f3b597c6a3838b0fac628f4bf730a" +checksum = "874cf3f6a027cebf36cae767feca9aa2e8a8f799880e49eb5540819fcbd8eada" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4030,9 +3893,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd11763134104122ddeb0f97e4bbe393058017dfb077db63fbf44b4dd0dd86e" +checksum = "3bcf76cd316f5d3ad48138085af1f45e2c58c98e02f0779783dbb034d43f7c86" dependencies = [ "anyhow", "beef", @@ -4044,9 +3907,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f15180afb3761c7a3a32c0a8b680788176dcfdfe725b24c1758c90b1d1595b" +checksum = "ee043cb5dd0d51d3eb93432e998d5bae797691a7b10ec4a325e036bcdb48c48a" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -4055,9 +3918,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-server" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb6c21556c551582b56e4e8e6e6249b0bbdb69bb7fa39efe9b9a6b54af9f206" +checksum = "2bd2e4d266774a671f8def3794255b28eddd09b18d76e0b913fa439f34588c0a" dependencies = [ "futures-channel", "futures-util", @@ -4066,6 +3929,7 @@ dependencies = [ "serde_json", "soketto", "tokio", + "tokio-stream", "tokio-util", "tracing", ] @@ -4090,8 +3954,8 @@ checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "kusama-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", "bitvec", @@ -4125,7 +3989,6 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-multisig", - "pallet-nicks", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", "pallet-offences", @@ -4183,8 +4046,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "polkadot-primitives", @@ -4287,13 +4150,12 @@ checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" [[package]] name = "libp2p" -version = "0.44.0" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475ce2ac4a9727e53a519f6ee05b38abfcba8f0d39c4d24f103d184e36fd5b0f" +checksum = "81327106887e42d004fbdab1fef93675be2e2e07c1b95fce45e2cc813485611d" dependencies = [ - "atomic", "bytes", - "futures 0.3.21", + "futures", "futures-timer", "getrandom 0.2.6", "instant", @@ -4325,19 +4187,19 @@ dependencies = [ "libp2p-yamux", "multiaddr", "parking_lot 0.12.1", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "smallvec", ] [[package]] name = "libp2p-autonat" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13b690e65046af6a09c0b27bd9508fa1cab0efce889de74b0b643b9d2a98f9a" +checksum = "4decc51f3573653a9f4ecacb31b1b922dd20c25a6322bb15318ec04287ec46f9" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "futures-timer", "instant", "libp2p-core", @@ -4351,16 +4213,16 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.32.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db5b02602099fb75cb2d16f9ea860a320d6eb82ce41e95ab680912c454805cd5" +checksum = "fbf9b94cefab7599b2d3dff2f93bee218c6621d68590b23ede4485813cbcece6" dependencies = [ "asn1_der", "bs58", "ed25519-dalek", "either", "fnv", - "futures 0.3.21", + "futures", "futures-timer", "instant", "lazy_static", @@ -4370,7 +4232,7 @@ dependencies = [ "multihash", "multistream-select", "parking_lot 0.12.1", - "pin-project 1.0.10", + "pin-project", "prost", "prost-build", "rand 0.8.5", @@ -4386,38 +4248,39 @@ dependencies = [ [[package]] name = "libp2p-deflate" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d37f042f748e224f04785d0e987ae09a2aa518d6401d82d412dad83e360ed" +checksum = "d0183dc2a3da1fbbf85e5b6cf51217f55b14f5daea0c455a9536eef646bfec71" dependencies = [ "flate2", - "futures 0.3.21", + "futures", "libp2p-core", ] [[package]] name = "libp2p-dns" -version = "0.32.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066e33e854e10b5c93fc650458bf2179c7e0d143db260b0963e44a94859817f1" +checksum = "6cbf54723250fa5d521383be789bf60efdabe6bacfb443f87da261019a49b4b5" dependencies = [ "async-std-resolver", - "futures 0.3.21", + "futures", "libp2p-core", "log", + "parking_lot 0.12.1", "smallvec", "trust-dns-resolver", ] [[package]] name = "libp2p-floodsub" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733d3ea6ebe7a7a85df2bc86678b93f24b015fae5fe3b3acc4c400e795a55d2d" +checksum = "98a4b6ffd53e355775d24b76f583fdda54b3284806f678499b57913adb94f231" dependencies = [ "cuckoofilter", "fnv", - "futures 0.3.21", + "futures", "libp2p-core", "libp2p-swarm", "log", @@ -4429,16 +4292,16 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.37.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90c989a7c0969c2ab63e898da9bc735e3be53fb4f376e9c045ce516bcc9f928" +checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0" dependencies = [ "asynchronous-codec", "base64", "byteorder", "bytes", "fnv", - "futures 0.3.21", + "futures", "hex_fmt", "instant", "libp2p-core", @@ -4457,33 +4320,37 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ef5a5b57904c7c33d6713ef918d239dc6b7553458f3475d87f8a18e9c651c8" +checksum = "c50b585518f8efd06f93ac2f976bd672e17cdac794644b3117edd078e96bda06" dependencies = [ - "futures 0.3.21", + "asynchronous-codec", + "futures", "futures-timer", "libp2p-core", "libp2p-swarm", "log", - "lru 0.7.6", + "lru 0.7.8", "prost", "prost-build", + "prost-codec", "smallvec", + "thiserror", + "void", ] [[package]] name = "libp2p-kad" -version = "0.36.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "564e6bd64d177446399ed835b9451a8825b07929d6daa6a94e6405592974725e" +checksum = "740862893bb5f06ac24acc9d49bdeadc3a5e52e51818a30a25c1f3519da2c851" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.7.2", "asynchronous-codec", "bytes", "either", "fnv", - "futures 0.3.21", + "futures", "futures-timer", "instant", "libp2p-core", @@ -4502,14 +4369,14 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.36.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611ae873c8e280ccfab0d57c7a13cac5644f364529e233114ff07863946058b0" +checksum = "66e5e5919509603281033fd16306c61df7a4428ce274b67af5e14b07de5cdcb2" dependencies = [ "async-io", "data-encoding", "dns-parser", - "futures 0.3.21", + "futures", "if-watch", "lazy_static", "libp2p-core", @@ -4523,9 +4390,9 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985be799bb3796e0c136c768208c3c06604a38430571906a13dcfeda225a3b9d" +checksum = "ef8aff4a1abef42328fbb30b17c853fff9be986dc39af17ee39f9c5f755c5e0c" dependencies = [ "libp2p-core", "libp2p-gossipsub", @@ -4539,13 +4406,13 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442eb0c9fff0bf22a34f015724b4143ce01877e079ed0963c722d94c07c72160" +checksum = "61fd1b20638ec209c5075dfb2e8ce6a7ea4ec3cd3ad7b77f7a477c06d53322e2" dependencies = [ "asynchronous-codec", "bytes", - "futures 0.3.21", + "futures", "libp2p-core", "log", "nohash-hasher", @@ -4557,13 +4424,13 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd7e0c94051cda67123be68cf6b65211ba3dde7277be9068412de3e7ffd63ef" +checksum = "762408cb5d84b49a600422d7f9a42c18012d8da6ebcd570f9a4a4290ba41fb6f" dependencies = [ "bytes", "curve25519-dalek 3.2.0", - "futures 0.3.21", + "futures", "lazy_static", "libp2p-core", "log", @@ -4579,11 +4446,11 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf57a3c2e821331dda9fe612d4654d676ab6e33d18d9434a18cced72630df6ad" +checksum = "100a6934ae1dbf8a693a4e7dd1d730fd60b774dafc45688ed63b554497c6c925" dependencies = [ - "futures 0.3.21", + "futures", "futures-timer", "instant", "libp2p-core", @@ -4595,13 +4462,13 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962c0fb0e7212fb96a69b87f2d09bcefd317935239bdc79cda900e7a8897a3fe" +checksum = "be27bf0820a6238a4e06365b096d428271cce85a129cf16f2fe9eb1610c4df86" dependencies = [ "asynchronous-codec", "bytes", - "futures 0.3.21", + "futures", "libp2p-core", "log", "prost", @@ -4616,9 +4483,9 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c" dependencies = [ - "futures 0.3.21", + "futures", "log", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "salsa20", "sha3 0.9.1", @@ -4626,39 +4493,39 @@ dependencies = [ [[package]] name = "libp2p-relay" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa754cb7bccef51ebc3c458c6bbcef89d83b578a9925438389be841527d408f" +checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3" dependencies = [ "asynchronous-codec", "bytes", "either", - "futures 0.3.21", + "futures", "futures-timer", "instant", "libp2p-core", "libp2p-swarm", "log", - "pin-project 1.0.10", + "pin-project", "prost", "prost-build", + "prost-codec", "rand 0.8.5", "smallvec", "static_assertions", "thiserror", - "unsigned-varint", "void", ] [[package]] name = "libp2p-rendezvous" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd0baab894c5b84da510b915d53264d566c3c35889f09931fe9edbd2a773bee" +checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e" dependencies = [ "asynchronous-codec", "bimap", - "futures 0.3.21", + "futures", "futures-timer", "instant", "libp2p-core", @@ -4675,13 +4542,13 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6a6fc6c9ad95661f46989473b34bd2993d14a4de497ff3b2668a910d4b869" +checksum = "508a189e2795d892c8f5c1fa1e9e0b1845d32d7b0b249dbf7b05b18811361843" dependencies = [ "async-trait", "bytes", - "futures 0.3.21", + "futures", "instant", "libp2p-core", "libp2p-swarm", @@ -4693,18 +4560,18 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0c69ad9e8f7c5fc50ad5ad9c7c8b57f33716532a2b623197f69f93e374d14c" +checksum = "95ac5be6c2de2d1ff3f7693fda6faf8a827b1f3e808202277783fea9f527d114" dependencies = [ "either", "fnv", - "futures 0.3.21", + "futures", "futures-timer", "instant", "libp2p-core", "log", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "smallvec", "thiserror", @@ -4713,9 +4580,9 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f693c8c68213034d472cbb93a379c63f4f307d97c06f1c41e4985de481687a5" +checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76" dependencies = [ "quote", "syn", @@ -4723,12 +4590,12 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193447aa729c85aac2376828df76d171c1a589c9e6b58fcc7f9d9a020734122c" +checksum = "8a6771dc19aa3c65d6af9a8c65222bfc8fcd446630ddca487acd161fa6096f3b" dependencies = [ "async-io", - "futures 0.3.21", + "futures", "futures-timer", "if-watch", "ipnet", @@ -4740,23 +4607,23 @@ dependencies = [ [[package]] name = "libp2p-uds" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24bdab114f7f2701757d6541266e1131b429bbae382008f207f2114ee4222dcb" +checksum = "d125e3e5f0d58f3c6ac21815b20cf4b6a88b8db9dc26368ea821838f4161fd4d" dependencies = [ "async-std", - "futures 0.3.21", + "futures", "libp2p-core", "log", ] [[package]] name = "libp2p-wasm-ext" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6ea0f84a967ef59a16083f222c18115ae2e91db69809dce275df62e101b279" +checksum = "ec894790eec3c1608f8d1a8a0bdf0dbeb79ed4de2dce964222011c2896dfa05a" dependencies = [ - "futures 0.3.21", + "futures", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -4766,15 +4633,16 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c932834c3754501c368d1bf3d0fb458487a642b90fc25df082a3a2f3d3b32e37" +checksum = "9808e57e81be76ff841c106b4c5974fb4d41a233a7bdd2afbf1687ac6def3818" dependencies = [ "either", - "futures 0.3.21", + "futures", "futures-rustls", "libp2p-core", "log", + "parking_lot 0.12.1", "quicksink", "rw-stream-sink", "soketto", @@ -4784,11 +4652,11 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.36.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be902ebd89193cd020e89e89107726a38cfc0d16d18f613f4a37d046e92c7517" +checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c" dependencies = [ - "futures 0.3.21", + "futures", "libp2p-core", "parking_lot 0.12.1", "thiserror", @@ -4900,6 +4768,12 @@ version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" +[[package]] +name = "linux-raw-sys" +version = "0.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" + [[package]] name = "lock_api" version = "0.4.7" @@ -4931,11 +4805,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8015d95cb7b2ddd3c0d32ca38283ceb1eea09b4713ee380bceb942d85a244228" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" dependencies = [ - "hashbrown 0.11.2", + "hashbrown 0.12.1", ] [[package]] @@ -4983,7 +4857,7 @@ dependencies = [ "async-trait", "calamari-runtime", "cfg-if 1.0.0", - "clap 3.1.18", + "clap 3.2.15", "cumulus-client-cli", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", @@ -4998,7 +4872,7 @@ dependencies = [ "dolphin-runtime", "frame-benchmarking", "frame-benchmarking-cli", - "futures 0.3.21", + "futures", "jsonrpsee", "log", "manta-primitives", @@ -5067,7 +4941,7 @@ source = "git+https://github.com/manta-network/manta-rs.git?tag=v0.5.1#ac8e929f4 dependencies = [ "derivative", "derive_more", - "futures 0.3.21", + "futures", "indexmap", "manta-crypto 0.5.1", "manta-util 0.5.1", @@ -5305,6 +5179,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memfd" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" +dependencies = [ + "libc", +] + [[package]] name = "memmap2" version = "0.2.3" @@ -5370,28 +5253,13 @@ dependencies = [ "zeroize", ] -[[package]] -name = "metered-channel" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "coarsetime", - "crossbeam-queue", - "derive_more", - "futures 0.3.21", - "futures-timer", - "nanorand", - "thiserror", - "tracing-gum", -] - [[package]] name = "mick-jaeger" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ - "futures 0.3.21", + "futures", "rand 0.8.5", "thrift", ] @@ -5470,7 +5338,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689" dependencies = [ - "blake2b_simd 1.0.0", + "blake2b_simd", "blake2s_simd", "blake3", "core2", @@ -5508,9 +5376,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" dependencies = [ "bytes", - "futures 0.3.21", + "futures", "log", - "pin-project 1.0.10", + "pin-project", "smallvec", "unsigned-varint", ] @@ -5622,7 +5490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef8785b8141e8432aa45fceb922a7e876d7da3fad37fa7e7ec702ace3aa0826b" dependencies = [ "bytes", - "futures 0.3.21", + "futures", "log", "netlink-packet-core", "netlink-sys", @@ -5637,7 +5505,7 @@ checksum = "3e4c9f9547a08241bee7b6558b9b98e1f290d187de8b7cfca2bbb4937bcaa8f8" dependencies = [ "async-io", "bytes", - "futures 0.3.21", + "futures", "libc", "log", ] @@ -5645,7 +5513,7 @@ dependencies = [ [[package]] name = "nimbus-primitives" version = "0.9.0" -source = "git+https://github.com/manta-network/nimbus.git?branch=polkadot-v0.9.22#84161bc6e71ee10ea34a50bb839b2c24f64760a5" +source = "git+https://github.com/manta-network/nimbus.git?branch=garandor/polkadot-v0.9.26#90a9c0453117b215dcb28714999fc9d716b02bf5" dependencies = [ "async-trait", "frame-support", @@ -5788,23 +5656,15 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" -dependencies = [ - "crc32fast", - "indexmap", - "memchr", -] - [[package]] name = "object" version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ + "crc32fast", + "hashbrown 0.11.2", + "indexmap", "memchr", ] @@ -5877,6 +5737,36 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "orchestra" +version = "0.0.1" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" +dependencies = [ + "async-trait", + "dyn-clonable", + "futures", + "futures-timer", + "orchestra-proc-macro", + "pin-project", + "prioritized-metered-channel", + "thiserror", + "tracing", +] + +[[package]] +name = "orchestra-proc-macro" +version = "0.0.1" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" +dependencies = [ + "expander 0.0.6", + "itertools", + "petgraph", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ordered-float" version = "1.1.1" @@ -5889,7 +5779,7 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/manta-network/open-runtime-module-library.git?rev=cc26ffa#cc26ffa9e110e2cd88276cd05c3fd1c8a8a56af6" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -5907,7 +5797,7 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/manta-network/open-runtime-module-library.git?rev=cc26ffa#cc26ffa9e110e2cd88276cd05c3fd1c8a8a56af6" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "frame-support", "parity-scale-codec", @@ -5921,7 +5811,7 @@ dependencies = [ [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/manta-network/open-runtime-module-library.git?rev=cc26ffa#cc26ffa9e110e2cd88276cd05c3fd1c8a8a56af6" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "frame-support", "orml-traits", @@ -5935,13 +5825,14 @@ dependencies = [ [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/manta-network/open-runtime-module-library.git?rev=cc26ffa#cc26ffa9e110e2cd88276cd05c3fd1c8a8a56af6" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "orml-traits", "orml-xcm-support", + "pallet-xcm", "parity-scale-codec", "scale-info", "serde", @@ -5991,7 +5882,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6005,7 +5896,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -6021,7 +5912,7 @@ dependencies = [ [[package]] name = "pallet-author-inherent" version = "0.9.0" -source = "git+https://github.com/manta-network/nimbus.git?branch=polkadot-v0.9.22#84161bc6e71ee10ea34a50bb839b2c24f64760a5" +source = "git+https://github.com/manta-network/nimbus.git?branch=garandor/polkadot-v0.9.26#90a9c0453117b215dcb28714999fc9d716b02bf5" dependencies = [ "frame-benchmarking", "frame-support", @@ -6041,7 +5932,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -6057,7 +5948,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -6072,7 +5963,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6096,7 +5987,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6116,7 +6007,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6131,7 +6022,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-primitives", "frame-support", @@ -6147,7 +6038,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -6170,7 +6061,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6185,70 +6076,10 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-bridge-dispatch" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "bp-message-dispatch", - "bp-runtime", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-bridge-grandpa" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "bp-header-chain", - "bp-runtime", - "bp-test-utils", - "finality-grandpa", - "frame-support", - "frame-system", - "log", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", - "sp-trie", -] - -[[package]] -name = "pallet-bridge-messages" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "bitvec", - "bp-message-dispatch", - "bp-messages", - "bp-runtime", - "frame-support", - "frame-system", - "log", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6267,7 +6098,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-benchmarking", "frame-support", @@ -6287,7 +6118,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6304,7 +6135,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6320,7 +6151,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6343,7 +6174,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6356,7 +6187,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6374,7 +6205,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6389,7 +6220,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6412,7 +6243,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6428,7 +6259,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6448,7 +6279,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6500,7 +6331,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6517,7 +6348,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -6535,7 +6366,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -6550,7 +6381,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6562,30 +6393,18 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-nicks" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-io", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-core", + "sp-io", "sp-runtime", "sp-staking", "sp-std", @@ -6594,7 +6413,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6613,7 +6432,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -6630,7 +6449,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6653,7 +6472,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6669,7 +6488,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6684,7 +6503,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6699,7 +6518,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6715,7 +6534,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -6736,7 +6555,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6752,7 +6571,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -6766,7 +6585,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6789,7 +6608,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6800,7 +6619,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "sp-arithmetic", @@ -6809,7 +6628,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -6823,7 +6642,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6841,7 +6660,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6860,14 +6679,13 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", - "smallvec", "sp-core", "sp-io", "sp-runtime", @@ -6877,7 +6695,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6892,7 +6710,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6903,7 +6721,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6937,7 +6755,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6953,7 +6771,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6967,8 +6785,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "frame-system", @@ -6985,8 +6803,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-benchmarking", "frame-support", @@ -7003,7 +6821,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.22#ebdfbea0029dd3349ce0e9c758acc73acce04d18" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -7034,9 +6852,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.1.2" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" +checksum = "9182e4a71cae089267ab03e67c99368db7cd877baf50f931e5d6d4b71e195ac0" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -7048,9 +6866,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.2" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" +checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7142,7 +6960,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "smallvec", "winapi", ] @@ -7155,7 +6973,7 @@ checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "smallvec", "windows-sys", ] @@ -7249,33 +7067,13 @@ dependencies = [ "indexmap", ] -[[package]] -name = "pin-project" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" -dependencies = [ - "pin-project-internal 0.4.29", -] - [[package]] name = "pin-project" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ - "pin-project-internal 1.0.10", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "pin-project-internal", ] [[package]] @@ -7349,10 +7147,10 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.21", + "futures", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7364,10 +7162,10 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.21", + "futures", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7378,13 +7176,13 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", "fatality", - "futures 0.3.21", - "lru 0.7.6", + "futures", + "lru 0.7.8", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7401,12 +7199,12 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "fatality", - "futures 0.3.21", - "lru 0.7.6", + "futures", + "lru 0.7.8", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7422,12 +7220,12 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "clap 3.1.18", + "clap 3.2.15", "frame-benchmarking-cli", - "futures 0.3.21", + "futures", "log", "polkadot-client", "polkadot-node-core-pvf", @@ -7447,8 +7245,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -7487,12 +7285,12 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "always-assert", "fatality", - "futures 0.3.21", + "futures", "futures-timer", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7508,8 +7306,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -7521,13 +7319,13 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", "fatality", - "futures 0.3.21", - "lru 0.7.6", + "futures", + "lru 0.7.8", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7544,8 +7342,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -7558,10 +7356,10 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.21", + "futures", "futures-timer", "polkadot-node-network-protocol", "polkadot-node-subsystem", @@ -7578,13 +7376,13 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "always-assert", "async-trait", "bytes", - "futures 0.3.21", + "futures", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-network-protocol", @@ -7599,10 +7397,10 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.21", + "futures", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7617,15 +7415,15 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitvec", "derive_more", - "futures 0.3.21", + "futures", "futures-timer", "kvdb", - "lru 0.7.6", + "lru 0.7.8", "merlin", "parity-scale-codec", "polkadot-node-jaeger", @@ -7646,11 +7444,11 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitvec", - "futures 0.3.21", + "futures", "futures-timer", "kvdb", "parity-scale-codec", @@ -7666,12 +7464,12 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitvec", "fatality", - "futures 0.3.21", + "futures", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7685,10 +7483,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.21", + "futures", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", @@ -7700,11 +7498,11 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "parity-scale-codec", "polkadot-node-core-pvf", "polkadot-node-primitives", @@ -7718,10 +7516,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.21", + "futures", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", @@ -7733,10 +7531,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.21", + "futures", "futures-timer", "kvdb", "parity-scale-codec", @@ -7750,13 +7548,13 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "fatality", - "futures 0.3.21", + "futures", "kvdb", - "lru 0.7.6", + "lru 0.7.8", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7769,11 +7567,11 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "futures-timer", "polkadot-node-subsystem", "polkadot-primitives", @@ -7786,12 +7584,12 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitvec", "fatality", - "futures 0.3.21", + "futures", "futures-timer", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7804,21 +7602,22 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "always-assert", "assert_matches", "async-process", "async-std", - "futures 0.3.21", + "futures", "futures-timer", "parity-scale-codec", - "pin-project 1.0.10", + "pin-project", "polkadot-core-primitives", "polkadot-node-subsystem-util", "polkadot-parachain", "rand 0.8.5", + "rayon", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", @@ -7829,15 +7628,16 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-tracing", "sp-wasm-interface", + "tempfile", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.21", + "futures", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7850,10 +7650,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.21", + "futures", "memory-lru", "parity-util-mem", "polkadot-node-subsystem", @@ -7862,14 +7662,13 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-consensus-babe", - "sp-core", "tracing-gum", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-std", "lazy_static", @@ -7886,16 +7685,16 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bs58", - "futures 0.3.21", + "futures", "futures-timer", "log", - "metered-channel", "parity-scale-codec", "polkadot-primitives", + "prioritized-metered-channel", "sc-cli", "sc-service", "sc-tracing", @@ -7905,13 +7704,13 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "derive_more", "fatality", - "futures 0.3.21", + "futures", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", @@ -7921,15 +7720,16 @@ dependencies = [ "sc-network", "strum 0.24.0", "thiserror", + "tracing-gum", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bounded-vec", - "futures 0.3.21", + "futures", "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", @@ -7947,8 +7747,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7957,15 +7757,15 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", - "futures 0.3.21", + "futures", + "orchestra", "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", - "polkadot-overseer-gen", "polkadot-primitives", "polkadot-statement-table", "sc-network", @@ -7976,22 +7776,21 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "derive_more", "fatality", - "futures 0.3.21", + "futures", "itertools", "kvdb", - "lru 0.7.6", - "metered-channel", + "lru 0.7.8", "parity-db", "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.2", - "pin-project 1.0.10", + "pin-project", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -7999,6 +7798,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", + "prioritized-metered-channel", "rand 0.8.5", "sp-application-crypto", "sp-core", @@ -8009,58 +7809,30 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.21", + "futures", "futures-timer", - "lru 0.7.6", + "lru 0.7.8", + "orchestra", "parity-util-mem", "parking_lot 0.12.1", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem-types", - "polkadot-overseer-gen", "polkadot-primitives", "sc-client-api", "sp-api", + "sp-core", "tracing-gum", ] -[[package]] -name = "polkadot-overseer-gen" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "async-trait", - "futures 0.3.21", - "futures-timer", - "metered-channel", - "pin-project 1.0.10", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-overseer-gen-proc-macro", - "thiserror", - "tracing-gum", -] - -[[package]] -name = "polkadot-overseer-gen-proc-macro" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "expander 0.0.6", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "polkadot-parachain" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", "frame-support", @@ -8076,8 +7848,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "env_logger", "kusama-runtime", @@ -8091,8 +7863,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitvec", "frame-system", @@ -8121,8 +7893,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -8153,8 +7925,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", "bitvec", @@ -8186,7 +7958,6 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-multisig", - "pallet-nicks", "pallet-offences", "pallet-offences-benchmarking", "pallet-preimage", @@ -8239,8 +8010,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", "bitvec", @@ -8286,8 +8057,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "polkadot-primitives", @@ -8298,8 +8069,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bs58", "parity-scale-codec", @@ -8310,8 +8081,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitflags", "bitvec", @@ -8353,19 +8124,19 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "beefy-gadget", "beefy-primitives", "frame-system-rpc-runtime-api", - "futures 0.3.21", + "futures", "hex-literal", "kusama-runtime", "kvdb", "kvdb-rocksdb", - "lru 0.7.6", + "lru 0.7.8", "pallet-babe", "pallet-im-online", "pallet-staking", @@ -8396,6 +8167,7 @@ dependencies = [ "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-parachain", @@ -8455,12 +8227,12 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "arrayvec 0.5.2", "fatality", - "futures 0.3.21", + "futures", "indexmap", "parity-scale-codec", "polkadot-node-network-protocol", @@ -8476,8 +8248,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -8526,20 +8298,6 @@ 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.11.1" @@ -8553,6 +8311,21 @@ dependencies = [ "uint", ] +[[package]] +name = "prioritized-metered-channel" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" +dependencies = [ + "coarsetime", + "crossbeam-queue", + "derive_more", + "futures", + "futures-timer", + "nanorand", + "thiserror", + "tracing", +] + [[package]] name = "proc-macro-crate" version = "1.1.3" @@ -8589,9 +8362,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" dependencies = [ "unicode-ident", ] @@ -8612,9 +8385,9 @@ dependencies = [ [[package]] name = "prometheus-client" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a896938cc6018c64f279888b8c7559d3725210d5db9a3a1ee6bc7188d51d34" +checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825" dependencies = [ "dtoa", "itoa 1.0.2", @@ -8635,9 +8408,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" dependencies = [ "bytes", "prost-derive", @@ -8645,12 +8418,14 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" dependencies = [ "bytes", - "heck 0.3.3", + "cfg-if 1.0.0", + "cmake", + "heck 0.4.0", "itertools", "lazy_static", "log", @@ -8663,11 +8438,24 @@ dependencies = [ "which", ] +[[package]] +name = "prost-codec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007" +dependencies = [ + "asynchronous-codec", + "bytes", + "prost", + "thiserror", + "unsigned-varint", +] + [[package]] name = "prost-derive" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", "itertools", @@ -8678,9 +8466,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" +checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" dependencies = [ "bytes", "prost", @@ -8714,9 +8502,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -8857,12 +8645,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.13" @@ -8872,17 +8654,6 @@ 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" @@ -8890,7 +8661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.6", - "redox_syscall 0.2.13", + "redox_syscall", "thiserror", ] @@ -8928,13 +8699,14 @@ dependencies = [ ] [[package]] -name = "regalloc" -version = "0.0.34" +name = "regalloc2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" +checksum = "4a8d23b35d7177df3b9d31ed8a9ab4bf625c668be77a319d4f5efd4a5257701c" dependencies = [ + "fxhash", "log", - "rustc-hash", + "slice-group-by", "smallvec", ] @@ -8979,7 +8751,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "env_logger", "jsonrpsee", @@ -9092,16 +8864,11 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-merkle-tree", "beefy-primitives", - "bp-messages", - "bp-rococo", - "bp-runtime", - "bp-wococo", - "bridge-runtime-common", "frame-benchmarking", "frame-executive", "frame-support", @@ -9116,9 +8883,6 @@ dependencies = [ "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", "pallet-collective", "pallet-grandpa", "pallet-im-online", @@ -9169,8 +8933,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "polkadot-primitives", @@ -9196,7 +8960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f54290e54521dac3de4149d83ddf9f62a359b3cc93bcb494a794a41e6f4744b" dependencies = [ "async-global-executor", - "futures 0.3.21", + "futures", "log", "netlink-packet-route", "netlink-proto", @@ -9235,25 +8999,12 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "syn", "xcm", "xcm-builder", "xcm-executor", "xcm-simulator", ] -[[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]] name = "rustc-demangle" version = "0.1.21" @@ -9298,23 +9049,24 @@ checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.5.3", "libc", - "linux-raw-sys", + "linux-raw-sys 0.0.42", "winapi", ] [[package]] -name = "rustls" -version = "0.19.1" +name = "rustix" +version = "0.35.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "d51cc38aa10f6bbb377ed28197aa052aa4e2b762c22be9d3153d01822587e787" dependencies = [ - "base64", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", + "bitflags", + "errno", + "io-lifetimes 0.7.2", + "libc", + "linux-raw-sys 0.0.46", + "windows-sys", ] [[package]] @@ -9325,20 +9077,8 @@ checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -dependencies = [ - "openssl-probe", - "rustls 0.19.1", - "schannel", - "security-framework", + "sct", + "webpki", ] [[package]] @@ -9370,12 +9110,12 @@ checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" [[package]] name = "rw-stream-sink" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" +checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" dependencies = [ - "futures 0.3.21", - "pin-project 0.4.29", + "futures", + "pin-project", "static_assertions", ] @@ -9406,7 +9146,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "sp-core", @@ -9417,10 +9157,10 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "futures-timer", "ip_network", "libp2p", @@ -9444,9 +9184,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "futures-timer", "log", "parity-scale-codec", @@ -9467,7 +9207,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9483,7 +9223,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.4", @@ -9500,7 +9240,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9511,12 +9251,12 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "chrono", - "clap 3.1.18", + "clap 3.2.15", "fdlimit", - "futures 0.3.21", + "futures", "hex", "libp2p", "log", @@ -9550,10 +9290,10 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "fnv", - "futures 0.3.21", + "futures", "hash-db", "log", "parity-scale-codec", @@ -9578,7 +9318,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "kvdb", @@ -9603,10 +9343,10 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "futures-timer", "libp2p", "log", @@ -9627,10 +9367,10 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "log", "parity-scale-codec", "sc-block-builder", @@ -9656,11 +9396,11 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "fork-tree", - "futures 0.3.21", + "futures", "log", "merlin", "num-bigint 0.2.6", @@ -9699,9 +9439,9 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "jsonrpsee", "sc-consensus-babe", "sc-consensus-epochs", @@ -9721,7 +9461,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9734,10 +9474,10 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "futures-timer", "log", "parity-scale-codec", @@ -9759,7 +9499,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "sc-client-api", "sp-authorship", @@ -9770,10 +9510,10 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "lazy_static", - "lru 0.7.6", + "lru 0.7.8", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", @@ -9797,7 +9537,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "environmental", "parity-scale-codec", @@ -9814,7 +9554,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "parity-scale-codec", @@ -9829,13 +9569,15 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "cfg-if 1.0.0", "libc", "log", + "once_cell", "parity-scale-codec", "parity-wasm 0.42.2", + "rustix 0.35.7", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -9847,14 +9589,14 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ahash", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", - "futures 0.3.21", + "futures", "futures-timer", "hex", "log", @@ -9887,10 +9629,10 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "finality-grandpa", - "futures 0.3.21", + "futures", "jsonrpsee", "log", "parity-scale-codec", @@ -9908,10 +9650,10 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ansi_term", - "futures 0.3.21", + "futures", "futures-timer", "log", "parity-util-mem", @@ -9925,7 +9667,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "hex", @@ -9940,7 +9682,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "asynchronous-codec", @@ -9950,7 +9692,7 @@ dependencies = [ "either", "fnv", "fork-tree", - "futures 0.3.21", + "futures", "futures-timer", "hex", "ip_network", @@ -9958,10 +9700,10 @@ dependencies = [ "linked-hash-map", "linked_hash_set", "log", - "lru 0.7.6", + "lru 0.7.8", "parity-scale-codec", "parking_lot 0.12.1", - "pin-project 1.0.10", + "pin-project", "prost", "prost-build", "rand 0.7.3", @@ -9969,6 +9711,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-network-common", + "sc-network-light", "sc-network-sync", "sc-peerset", "sc-utils", @@ -9991,9 +9734,9 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "libp2p", "parity-scale-codec", "prost-build", @@ -10004,32 +9747,52 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ahash", - "futures 0.3.21", + "futures", "futures-timer", "libp2p", "log", - "lru 0.7.6", + "lru 0.7.8", "sc-network", "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] +[[package]] +name = "sc-network-light" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "futures", + "libp2p", + "log", + "parity-scale-codec", + "prost", + "prost-build", + "sc-client-api", + "sc-network-common", + "sc-peerset", + "sp-blockchain", + "sp-core", + "sp-runtime", + "thiserror", +] + [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "bitflags", "either", "fork-tree", - "futures 0.3.21", + "futures", "libp2p", "log", - "lru 0.7.6", + "lru 0.7.8", "parity-scale-codec", "prost", "prost-build", @@ -10050,11 +9813,11 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "bytes", "fnv", - "futures 0.3.21", + "futures", "futures-timer", "hex", "hyper", @@ -10078,9 +9841,9 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "libp2p", "log", "sc-utils", @@ -10091,7 +9854,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10100,9 +9863,9 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "hash-db", "jsonrpsee", "log", @@ -10130,9 +9893,9 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "jsonrpsee", "log", "parity-scale-codec", @@ -10153,9 +9916,9 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "jsonrpsee", "log", "serde_json", @@ -10166,12 +9929,12 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.3.21", + "futures", "futures-timer", "hash-db", "jsonrpsee", @@ -10179,7 +9942,7 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.1", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "sc-block-builder", "sc-chain-spec", @@ -10231,7 +9994,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "parity-scale-codec", @@ -10245,7 +10008,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10264,9 +10027,9 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "libc", "log", "rand 0.7.3", @@ -10283,14 +10046,14 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "chrono", - "futures 0.3.21", + "futures", "libp2p", "log", "parking_lot 0.12.1", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "serde", "serde_json", @@ -10301,7 +10064,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ansi_term", "atty", @@ -10332,7 +10095,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10343,9 +10106,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "futures-timer", "linked-hash-map", "log", @@ -10370,9 +10133,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "log", "serde", "sp-blockchain", @@ -10383,9 +10146,9 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "futures-timer", "lazy_static", "log", @@ -10453,16 +10216,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sct" version = "0.7.0" @@ -10820,10 +10573,16 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" +[[package]] +name = "slice-group-by" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" + [[package]] name = "slot-range-helper" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "enumn", "parity-scale-codec", @@ -10889,7 +10648,7 @@ dependencies = [ "base64", "bytes", "flate2", - "futures 0.3.21", + "futures", "httparse", "log", "rand 0.8.5", @@ -10899,7 +10658,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "log", @@ -10916,7 +10675,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "blake2 0.10.4", "proc-macro-crate", @@ -10928,7 +10687,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -10941,7 +10700,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "integer-sqrt", "num-traits", @@ -10956,7 +10715,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -10969,7 +10728,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "parity-scale-codec", @@ -10981,7 +10740,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sp-api", @@ -10993,11 +10752,11 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "log", - "lru 0.7.6", + "lru 0.7.8", "parity-scale-codec", "parking_lot 0.12.1", "sp-api", @@ -11011,10 +10770,10 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "futures-timer", "log", "parity-scale-codec", @@ -11030,7 +10789,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "parity-scale-codec", @@ -11048,7 +10807,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "merlin", @@ -11071,7 +10830,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -11085,7 +10844,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -11098,7 +10857,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "base58", "bitflags", @@ -11106,7 +10865,7 @@ dependencies = [ "byteorder", "dyn-clonable", "ed25519-dalek", - "futures 0.3.21", + "futures", "hash-db", "hash256-std-hasher", "hex", @@ -11144,7 +10903,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "blake2 0.10.4", "byteorder", @@ -11158,7 +10917,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro2", "quote", @@ -11169,7 +10928,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -11178,7 +10937,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro2", "quote", @@ -11188,7 +10947,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "environmental", "parity-scale-codec", @@ -11199,7 +10958,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "finality-grandpa", "log", @@ -11217,7 +10976,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -11231,9 +10990,9 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.21", + "futures", "hash-db", "libsecp256k1", "log", @@ -11256,7 +11015,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "lazy_static", "sp-core", @@ -11267,10 +11026,10 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "merlin", "parity-scale-codec", "parking_lot 0.12.1", @@ -11284,7 +11043,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "thiserror", "zstd", @@ -11293,7 +11052,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "parity-scale-codec", @@ -11308,7 +11067,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -11322,7 +11081,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "sp-api", "sp-core", @@ -11332,7 +11091,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "backtrace", "lazy_static", @@ -11342,7 +11101,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "rustc-hash", "serde", @@ -11352,7 +11111,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "either", "hash256-std-hasher", @@ -11374,7 +11133,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11391,7 +11150,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "Inflector", "proc-macro-crate", @@ -11403,7 +11162,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "parity-scale-codec", @@ -11417,7 +11176,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "serde", "serde_json", @@ -11426,7 +11185,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -11440,7 +11199,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -11451,7 +11210,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "log", @@ -11473,12 +11232,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11491,7 +11250,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "sp-core", @@ -11504,7 +11263,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "futures-timer", @@ -11520,7 +11279,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sp-std", @@ -11532,7 +11291,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "sp-api", "sp-runtime", @@ -11541,7 +11300,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "log", @@ -11557,7 +11316,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "memory-db", @@ -11573,7 +11332,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11590,7 +11349,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -11601,7 +11360,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-trait-for-tuples", "log", @@ -11748,7 +11507,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "platforms", ] @@ -11756,10 +11515,10 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.21", + "futures", "jsonrpsee", "log", "parity-scale-codec", @@ -11777,7 +11536,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures-util", "hyper", @@ -11790,7 +11549,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "jsonrpsee", "log", @@ -11811,11 +11570,12 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", + "filetime", "sp-maybe-compressed-blob", "strum 0.23.0", "tempfile", @@ -11832,9 +11592,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.96" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", @@ -11895,22 +11655,11 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "remove_dir_all", "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]] name = "termcolor" version = "1.1.3" @@ -12101,24 +11850,24 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.22.0" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.19.1", + "rustls", "tokio", - "webpki 0.21.4", + "webpki", ] [[package]] -name = "tokio-rustls" -version = "0.23.4" +name = "tokio-stream" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" dependencies = [ - "rustls 0.20.6", + "futures-core", + "pin-project-lite 0.2.9", "tokio", - "webpki 0.22.0", ] [[package]] @@ -12190,14 +11939,14 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.10", + "pin-project", "tracing", ] [[package]] name = "tracing-gum" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -12207,8 +11956,8 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -12226,7 +11975,7 @@ dependencies = [ "ahash", "lazy_static", "log", - "lru 0.7.6", + "lru 0.7.8", "tracing-core", ] @@ -12337,9 +12086,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "clap 3.1.18", + "clap 3.2.15", "jsonrpsee", "log", "parity-scale-codec", @@ -12660,7 +12409,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.21", + "futures", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -12696,15 +12445,18 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.83.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" +checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7" +dependencies = [ + "indexmap", +] [[package]] name = "wasmtime" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ffb4705016d5ca91e18a72ed6822dab50e6d5ddd7045461b17ef19071cdef1" +checksum = "1f50eadf868ab6a04b7b511460233377d0bfbb92e417b2f6a98b98fef2e098f5" dependencies = [ "anyhow", "backtrace", @@ -12714,7 +12466,7 @@ dependencies = [ "lazy_static", "libc", "log", - "object 0.27.1", + "object", "once_cell", "paste", "psm", @@ -12733,9 +12485,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c6ab24291fa7cb3a181f5669f6c72599b7ef781669759b45c7828c5999d0c0" +checksum = "d1df23c642e1376892f3b72f311596976979cbf8b85469680cdd3a8a063d12a2" dependencies = [ "anyhow", "base64", @@ -12743,7 +12495,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix", + "rustix 0.33.7", "serde", "sha2 0.9.9", "toml", @@ -12753,9 +12505,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04c810078a491b7bc4866ebe045f714d2b95e6b539e1f64009a4a7606be11de" +checksum = "f264ff6b4df247d15584f2f53d009fbc90032cfdc2605b52b961bffc71b6eccd" dependencies = [ "anyhow", "cranelift-codegen", @@ -12766,7 +12518,7 @@ dependencies = [ "gimli", "log", "more-asserts", - "object 0.27.1", + "object", "target-lexicon", "thiserror", "wasmparser", @@ -12775,9 +12527,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61448266ea164b1ac406363cdcfac81c7c44db4d94c7a81c8620ac6c5c6cdf59" +checksum = "839d2820e4b830f4b9e7aa08d4c0acabf4a5036105d639f6dfa1c6891c73bdc6" dependencies = [ "anyhow", "cranelift-entity", @@ -12785,7 +12537,7 @@ dependencies = [ "indexmap", "log", "more-asserts", - "object 0.27.1", + "object", "serde", "target-lexicon", "thiserror", @@ -12795,9 +12547,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "156b4623c6b0d4b8c24afb846c20525922f538ef464cc024abab7ea8de2109a2" +checksum = "ef0a0bcbfa18b946d890078ba0e1bc76bcc53eccfb40806c0020ec29dcd1bd49" dependencies = [ "addr2line", "anyhow", @@ -12806,10 +12558,10 @@ dependencies = [ "cpp_demangle", "gimli", "log", - "object 0.27.1", + "object", "region", "rustc-demangle", - "rustix", + "rustix 0.33.7", "serde", "target-lexicon", "thiserror", @@ -12821,20 +12573,20 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5dc31f811760a6c76b2672c404866fd19b75e5fb3b0075a3e377a6846490654" +checksum = "4f4779d976206c458edd643d1ac622b6c37e4a0800a8b1d25dfbf245ac2f2cac" dependencies = [ "lazy_static", - "object 0.27.1", - "rustix", + "object", + "rustix 0.33.7", ] [[package]] name = "wasmtime-runtime" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f907beaff69d4d920fa4688411ee4cc75c0f01859e424677f9e426e2ef749864" +checksum = "b7eb6ffa169eb5dcd18ac9473c817358cd57bc62c244622210566d473397954a" dependencies = [ "anyhow", "backtrace", @@ -12844,11 +12596,12 @@ dependencies = [ "libc", "log", "mach", + "memfd", "memoffset", "more-asserts", "rand 0.8.5", "region", - "rustix", + "rustix 0.33.7", "thiserror", "wasmtime-environ", "wasmtime-jit-debug", @@ -12857,9 +12610,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514ef0e5fd197b9609dc9eb74beba0c84d5a12b2417cbae55534633329ba4852" +checksum = "8d932b0ac5336f7308d869703dd225610a6a3aeaa8e968c52b43eed96cefb1c2" dependencies = [ "cranelift-entity", "serde", @@ -12877,16 +12630,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki" version = "0.22.0" @@ -12903,7 +12646,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" dependencies = [ - "webpki 0.22.0", + "webpki", ] [[package]] @@ -12917,8 +12660,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", "bitvec", @@ -12948,7 +12691,6 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-multisig", - "pallet-nicks", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", "pallet-offences", @@ -13006,8 +12748,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "polkadot-primitives", @@ -13196,21 +12938,22 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derivative", "impl-trait-for-tuples", "log", "parity-scale-codec", "scale-info", + "sp-runtime", "xcm-procedural", ] [[package]] name = "xcm-builder" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "frame-system", @@ -13229,8 +12972,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-benchmarking", "frame-support", @@ -13248,7 +12991,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "Inflector", "proc-macro2", @@ -13258,8 +13001,8 @@ dependencies = [ [[package]] name = "xcm-simulator" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "parity-scale-codec", @@ -13279,7 +13022,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c0608f53c1dc0bad505d03a34bbd49fbf2ad7b51eb036123e896365532745a1" dependencies = [ - "futures 0.3.21", + "futures", "log", "nohash-hasher", "parking_lot 0.12.1", @@ -13310,18 +13053,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.10.2+zstd.1.5.2" +version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.6+zstd.1.5.2" +version = "5.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" dependencies = [ "libc", "zstd-sys", @@ -13329,9 +13072,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.3+zstd.1.5.2" +version = "2.0.1+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" +checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" dependencies = [ "cc", "libc", diff --git a/node/Cargo.toml b/node/Cargo.toml index b2ce3bdd2..9e87804b0 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -8,7 +8,7 @@ homepage = 'https://manta.network' license = 'GPL-3.0' name = 'manta' repository = 'https://github.com/Manta-Network/Manta/' -rust-version = '1.59' +rust-version = '1.60' version = '3.2.1' [package.metadata.docs.rs] @@ -24,69 +24,69 @@ log = "0.4.16" serde = { version = "1.0.137", features = ["derive"] } # Substrate frames -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", optional = true } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +try-runtime-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", optional = true } # RPC related dependencies -frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } -jsonrpsee = { version = "0.13.0", features = ["server"] } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } +frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } +jsonrpsee = { version = "0.14.0", features = ["server"] } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } # Substrate client dependencies -sc-basic-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-chain-spec = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-cli = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-client-api = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-executor = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-network = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } -sc-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-rpc-api = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-service = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } -sc-telemetry = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-tracing = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sc-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } +sc-basic-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-chain-spec = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-cli = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-client-api = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-executor = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-network = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } +sc-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-rpc-api = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-service = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-sysinfo = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } +sc-telemetry = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-tracing = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sc-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } # Substrate primitives -sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-blockchain = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-inherents = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } -sp-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } -sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } +sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-blockchain = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-inherents = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } +sp-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } +sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } # Cumulus dependencies -cumulus-client-cli = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-client-consensus-aura = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-client-consensus-common = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-client-consensus-relay-chain = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-client-network = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-client-service = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-relay-chain-inprocess-interface = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-relay-chain-interface = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-relay-chain-rpc-interface = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } +cumulus-client-cli = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-client-consensus-aura = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-client-consensus-common = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-client-consensus-relay-chain = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-client-network = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-client-service = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-relay-chain-inprocess-interface = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-relay-chain-interface = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-relay-chain-rpc-interface = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } # Polkadot dependencies -polkadot-cli = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } -polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } -polkadot-service = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } -xcm = { git = "https://github.com/paritytech/polkadot.git", branch = "release-v0.9.22" } +polkadot-cli = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } +polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } +polkadot-service = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } +xcm = { git = "https://github.com/paritytech/polkadot.git", branch = "release-v0.9.26" } # Self dependencies calamari-runtime = { path = '../runtime/calamari' } @@ -97,7 +97,7 @@ pallet-manta-pay = { path = '../pallets/manta-pay', features = ["rpc", "runtime" session-key-primitives = { path = '../primitives/session-keys' } [build-dependencies] -substrate-build-script-utils = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } +substrate-build-script-utils = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } [features] fast-runtime = [ diff --git a/node/src/cli.rs b/node/src/cli.rs index 4039da02b..6b15ee16e 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -23,14 +23,6 @@ use std::path::PathBuf; /// Sub-commands supported by the collator. #[derive(Debug, clap::Subcommand)] pub enum Subcommand { - /// Export the genesis state of the parachain. - #[clap(name = "export-genesis-state")] - ExportGenesisState(ExportGenesisStateCommand), - - /// Export the genesis wasm of the parachain. - #[clap(name = "export-genesis-wasm")] - ExportGenesisWasm(ExportGenesisWasmCommand), - /// Build a chain specification. BuildSpec(sc_cli::BuildSpecCmd), @@ -46,11 +38,17 @@ pub enum Subcommand { /// Import blocks. ImportBlocks(sc_cli::ImportBlocksCmd), + /// Revert the chain to a previous state. + Revert(sc_cli::RevertCmd), + /// Remove the whole chain. PurgeChain(cumulus_client_cli::PurgeChainCmd), - /// Revert the chain to a previous state. - Revert(sc_cli::RevertCmd), + /// Export the genesis state of the parachain. + ExportGenesisState(cumulus_client_cli::ExportGenesisStateCommand), + + /// Export the genesis wasm of the parachain. + ExportGenesisWasm(cumulus_client_cli::ExportGenesisWasmCommand), /// Sub-commands concerned with benchmarking. /// The pallet benchmarking moved to the `pallet` sub-command. @@ -67,44 +65,6 @@ pub enum Subcommand { TryRuntime, } -/// Command for exporting the genesis state of the parachain -#[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: 2084 - #[clap(long)] - 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)] - pub chain: Option, -} - -/// Command for exporting the genesis wasm file. -#[derive(Debug, Parser)] -pub struct ExportGenesisWasmCommand { - /// Output file name or stdout if unspecified. - #[clap(parse(from_os_str))] - pub output: 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 wasm file should be exported. - #[clap(long)] - pub chain: Option, -} - /// Node CLI #[derive(Debug, Parser)] #[clap( diff --git a/node/src/command.rs b/node/src/command.rs index c6b8359db..c673982ff 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -23,12 +23,11 @@ use crate::{ service::{new_partial, CalamariRuntimeExecutor, DolphinRuntimeExecutor, MantaRuntimeExecutor}, }; use codec::Encode; -use cumulus_client_service::genesis::generate_genesis_block; +use cumulus_client_cli::generate_genesis_block; use cumulus_primitives_core::ParaId; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use log::info; use manta_primitives::types::Header; -use polkadot_parachain::primitives::AccountIdConversion; use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, RuntimeVersion, SharedParams, SubstrateCli, @@ -36,8 +35,12 @@ use sc_cli::{ use sc_service::config::{BasePath, PrometheusConfig}; use session_key_primitives::AuraId; use sp_core::hexdisplay::HexDisplay; -use sp_runtime::{generic, traits::Block as BlockT, OpaqueExtrinsic}; -use std::{io::Write, net::SocketAddr}; +use sp_runtime::{ + generic, + traits::{AccountIdConversion, Block as BlockT}, + OpaqueExtrinsic, +}; +use std::net::SocketAddr; pub use sc_cli::Error; @@ -214,15 +217,6 @@ impl SubstrateCli for RelayChainCli { } } -#[allow(clippy::borrowed_box)] -fn extract_genesis_wasm(chain_spec: &Box) -> Result> { - let mut storage = chain_spec.build_storage()?; - storage - .top - .remove(sp_core::storage::well_known_keys::CODE) - .ok_or_else(|| "Could not find wasm file in genesis state!".into()) -} - /// Creates partial components for the runtimes that are supported by the benchmarks. macro_rules! construct_benchmark_partials { ($config:expr, |$partials:ident| $code:expr) => { @@ -313,6 +307,11 @@ pub fn run_with(cli: Cli) -> Result { Ok(cmd.run(components.client, components.import_queue)) }) } + Some(Subcommand::Revert(cmd)) => { + construct_async_run!(|components, cli, cmd, config| { + Ok(cmd.run(components.client, components.backend, None)) + }) + } Some(Subcommand::PurgeChain(cmd)) => { let runner = cli.create_runner(cmd)?; @@ -334,53 +333,20 @@ pub fn run_with(cli: Cli) -> Result { cmd.run(config, polkadot_config) }) } - 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, ""); - let _ = builder.init(); - - let spec = load_spec(¶ms.chain.clone().unwrap_or_default())?; - let state_version = Cli::native_runtime_version(&spec).state_version(); - - let block: crate::service::Block = generate_genesis_block(&spec, state_version)?; - let raw_header = block.header().encode(); - let output_buf = if params.raw { - raw_header - } else { - format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes() - }; - - if let Some(output) = ¶ms.output { - std::fs::write(output, output_buf)?; - } else { - std::io::stdout().write_all(&output_buf)?; - } - - Ok(()) + Some(Subcommand::ExportGenesisState(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.sync_run(|_config| { + let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?; + let state_version = Cli::native_runtime_version(&spec).state_version(); + cmd.run::(&*spec, state_version) + }) } - Some(Subcommand::ExportGenesisWasm(params)) => { - let mut builder = sc_cli::LoggerBuilder::new(""); - builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); - let _ = builder.init(); - - let raw_wasm_blob = - extract_genesis_wasm(&cli.load_spec(¶ms.chain.clone().unwrap_or_default())?)?; - let output_buf = if params.raw { - raw_wasm_blob - } else { - format!("0x{:?}", HexDisplay::from(&raw_wasm_blob)).into_bytes() - }; - - if let Some(output) = ¶ms.output { - std::fs::write(output, output_buf)?; - } else { - std::io::stdout().write_all(&output_buf)?; - } - - Ok(()) + Some(Subcommand::ExportGenesisWasm(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.sync_run(|_config| { + let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?; + cmd.run(&*spec) + }) } Some(Subcommand::Benchmark(cmd)) => { let runner = cli.create_runner(cmd)?; @@ -483,13 +449,13 @@ pub fn run_with(cli: Cli) -> Result { let id = ParaId::from(para_id); let parachain_account = - AccountIdConversion::::into_account(&id); + AccountIdConversion::::into_account_truncating(&id); let state_version = RelayChainCli::native_runtime_version(&config.chain_spec).state_version(); let block: crate::service::Block = - generate_genesis_block(&config.chain_spec, state_version) + generate_genesis_block(&*config.chain_spec, state_version) .map_err(|e| format!("{:?}", e))?; let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); diff --git a/node/src/rpc/common.rs b/node/src/rpc/common.rs index 6b361d4f9..e5cb93c0d 100644 --- a/node/src/rpc/common.rs +++ b/node/src/rpc/common.rs @@ -33,8 +33,8 @@ where C::Api: BlockBuilder, P: TransactionPool + Sync + Send + 'static, { - use frame_rpc_system::{SystemApiServer, SystemRpc}; - use pallet_transaction_payment_rpc::{TransactionPaymentApiServer, TransactionPaymentRpc}; + use frame_rpc_system::{System, SystemApiServer}; + use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; let mut module = RpcExtension::new(()); let FullDeps { @@ -44,10 +44,10 @@ where } = deps; module - .merge(SystemRpc::new(client.clone(), pool, deny_unsafe).into_rpc()) + .merge(System::new(client.clone(), pool, deny_unsafe).into_rpc()) .map_err(|e| sc_service::Error::Other(e.to_string()))?; module - .merge(TransactionPaymentRpc::new(client).into_rpc()) + .merge(TransactionPayment::new(client).into_rpc()) .map_err(|e| sc_service::Error::Other(e.to_string()))?; Ok(module) diff --git a/node/src/rpc/dolphin.rs b/node/src/rpc/dolphin.rs index 20690d4b7..606d20a81 100644 --- a/node/src/rpc/dolphin.rs +++ b/node/src/rpc/dolphin.rs @@ -38,8 +38,8 @@ where C::Api: PullLedgerDiffApi, P: TransactionPool + Sync + Send + 'static, { - use frame_rpc_system::{SystemApiServer, SystemRpc}; - use pallet_transaction_payment_rpc::{TransactionPaymentApiServer, TransactionPaymentRpc}; + use frame_rpc_system::{System, SystemApiServer}; + use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; let mut module = RpcExtension::new(()); let FullDeps { @@ -49,10 +49,10 @@ where } = deps; module - .merge(SystemRpc::new(client.clone(), pool, deny_unsafe).into_rpc()) + .merge(System::new(client.clone(), pool, deny_unsafe).into_rpc()) .map_err(|e| sc_service::Error::Other(e.to_string()))?; module - .merge(TransactionPaymentRpc::new(client.clone()).into_rpc()) + .merge(TransactionPayment::new(client.clone()).into_rpc()) .map_err(|e| sc_service::Error::Other(e.to_string()))?; let manta_pay_rpc: jsonrpsee::RpcModule> = Pull::new(client).into_rpc(); diff --git a/node/src/service.rs b/node/src/service.rs index 46b2320fd..5917b0829 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -247,7 +247,7 @@ async fn start_node_impl( polkadot_config: Configuration, collator_options: CollatorOptions, id: ParaId, - full_rpc: FullRpc, + _full_rpc: FullRpc, build_import_queue: BIQ, build_consensus: BIC, hwbench: Option, @@ -348,7 +348,7 @@ where deny_unsafe, }; - full_rpc(deps) + crate::rpc::create_common_full(deps).map_err(Into::into) }) }; diff --git a/pallets/asset-manager/Cargo.toml b/pallets/asset-manager/Cargo.toml index 5a3f312bc..32dcc7ceb 100644 --- a/pallets/asset-manager/Cargo.toml +++ b/pallets/asset-manager/Cargo.toml @@ -9,24 +9,24 @@ version = "3.2.1" [dependencies] codec = { package = "parity-scale-codec", version = '3.1.2', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } log = { version = "0.4.0", default-features = false } manta-primitives = { path = "../../primitives/manta", default-features = false } scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } -xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } # 3rd party dependencies -orml-traits = { git = "https://github.com/manta-network/open-runtime-module-library.git", default-features = false, rev = "cc26ffa" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" } [dev-dependencies] -pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } +pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/pallets/asset-manager/src/lib.rs b/pallets/asset-manager/src/lib.rs index 8c58a65ba..932cbd43d 100644 --- a/pallets/asset-manager/src/lib.rs +++ b/pallets/asset-manager/src/lib.rs @@ -484,7 +484,7 @@ pub mod pallet { /// The account ID of AssetManager pub fn account_id() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } /// Get para id from asset location @@ -548,13 +548,13 @@ pub mod pallet { } /// Get min-xcm-fee by multilocation. - impl GetByKey for Pallet { - fn get(location: &MultiLocation) -> u128 { + impl GetByKey> for Pallet { + fn get(location: &MultiLocation) -> Option { let location = >::AssetLocation::from(location.clone()); match MinXcmFee::::get(&location) { - Some(min_fee) => min_fee, - None => u128::MAX, + Some(min_fee) => Some(min_fee), + None => None, } } } diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml index 9b10741bd..e45636e8e 100644 --- a/pallets/collator-selection/Cargo.toml +++ b/pallets/collator-selection/Cargo.toml @@ -19,26 +19,26 @@ rand = { version = "0.8.5", default-features = false, optional = true } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.137", default-features = false } -frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-arithmetic = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-staking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } +frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-arithmetic = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-staking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22", optional = true } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26", optional = true } [dev-dependencies] -pallet-aura = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-tracing = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } +pallet-aura = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-tracing = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } [features] default = ['std'] diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index 61a85e74d..3b60d9f5a 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -531,7 +531,7 @@ pub mod pallet { impl Pallet { /// Get a unique, inaccessible account id from the `PotId`. pub fn account_id() -> T::AccountId { - T::PotId::get().into_account() + T::PotId::get().into_account_truncating() } /// Removes a candidate if they exist and sends them back their deposit @@ -635,7 +635,7 @@ pub mod pallet { /// Reset the performance map to the currently active validators at 0 blocks pub fn reset_collator_performance() { - >::remove_all(None); + let _ = >::clear(>::get(), None); let validators = T::ValidatorRegistration::validators(); for validator_id in validators { let account_id = T::AccountIdOf::convert(validator_id.clone().into()); diff --git a/pallets/manta-pay/Cargo.toml b/pallets/manta-pay/Cargo.toml index 27aa5dcf5..aa1c08a26 100644 --- a/pallets/manta-pay/Cargo.toml +++ b/pallets/manta-pay/Cargo.toml @@ -78,18 +78,18 @@ rand_chacha = { version = "0.3.1", optional = true, default-features = false } tempfile = { version = "3.3.0", optional = true } # substrate dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } scale-codec = { package = "parity-scale-codec", version = '3.1.2', default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22", optional = true, default-features = false } -sp-blockchain = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22", optional = true, default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22", default-features = false } +sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26", optional = true, default-features = false } +sp-blockchain = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26", optional = true, default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26", default-features = false } # JSON-RPC -jsonrpsee = { version = "0.13.0", features = ["server", "macros"], optional = true } +jsonrpsee = { version = "0.14.0", features = ["server", "macros"], optional = true } # manta dependencies manta-accounting = { git = "https://github.com/manta-network/manta-rs.git", tag = "v0.5.1", default-features = false } @@ -108,9 +108,9 @@ manta-crypto = { git = "https://github.com/manta-network/manta-rs.git", tag = "v manta-parameters = { git = "https://github.com/manta-network/manta-rs.git", tag = "v0.5.1", features = ["download"] } manta-util = { git = "https://github.com/manta-network/manta-rs.git", tag = "v0.5.1", features = ["std"] } pallet-asset-manager = { path = "../asset-manager" } -pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } +pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } tempfile = "3.3.0" -xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } +xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } diff --git a/pallets/manta-pay/src/lib.rs b/pallets/manta-pay/src/lib.rs index ebecaec6c..9386436b3 100644 --- a/pallets/manta-pay/src/lib.rs +++ b/pallets/manta-pay/src/lib.rs @@ -567,7 +567,7 @@ pub mod pallet { /// Returns the account ID of this pallet. #[inline] pub fn account_id() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } /// Posts the transaction encoded in `post` to the ledger, using `sources` and `sinks` as diff --git a/pallets/tx-pause/Cargo.toml b/pallets/tx-pause/Cargo.toml index c60d1596d..4e6e2e9fa 100644 --- a/pallets/tx-pause/Cargo.toml +++ b/pallets/tx-pause/Cargo.toml @@ -9,18 +9,18 @@ version = '3.2.1' [dependencies] codec = { package = "parity-scale-codec", version = '3.1.2', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } [dev-dependencies] manta-primitives = { path = '../../primitives/manta' } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/pallets/vesting/Cargo.toml b/pallets/vesting/Cargo.toml index 897bde324..32d988d49 100644 --- a/pallets/vesting/Cargo.toml +++ b/pallets/vesting/Cargo.toml @@ -11,20 +11,20 @@ version = '3.2.1' codec = { package = "parity-scale-codec", version = '3.1.2', default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22", optional = true } -frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22", optional = true } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22", optional = true } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26", optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26", optional = true } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26", optional = true } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } [dev-dependencies] chrono = "0.4" -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/primitives/manta/Cargo.toml b/primitives/manta/Cargo.toml index 6f1e68ad0..d20240e11 100644 --- a/primitives/manta/Cargo.toml +++ b/primitives/manta/Cargo.toml @@ -20,16 +20,16 @@ smallvec = "1.8.0" manta-accounting = { git = "https://github.com/manta-network/manta-rs.git", tag = "v0.5.0", default-features = false } # Substrate primitives -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22", default-features = false, optional = true } -frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-core = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-io = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26", default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-core = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-io = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } [features] default = ["std"] diff --git a/primitives/session-keys/Cargo.toml b/primitives/session-keys/Cargo.toml index 0807acc2f..5a15b8da8 100644 --- a/primitives/session-keys/Cargo.toml +++ b/primitives/session-keys/Cargo.toml @@ -8,13 +8,13 @@ version = "3.2.1" [dependencies] manta-primitives = { path = "../manta", default-features = false } -nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "polkadot-v0.9.22", default-features = false } +nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "garandor/polkadot-v0.9.26", default-features = false } parity-scale-codec = { version = "3.1.2", default-features = false, features = ["derive"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-core = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-core = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } [features] default = ["std"] diff --git a/runtime/calamari/Cargo.toml b/runtime/calamari/Cargo.toml index 78dac8c0f..cfc49d8b1 100644 --- a/runtime/calamari/Cargo.toml +++ b/runtime/calamari/Cargo.toml @@ -16,74 +16,74 @@ serde = { version = '1.0.137', features = ['derive'], optional = true } smallvec = "1.8.0" # Substrate primitives -sp-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-application-crypto = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-arithmetic = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-core = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-inherents = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-io = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-offchain = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-version = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } +sp-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-application-crypto = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-arithmetic = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-core = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-inherents = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-io = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-offchain = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-version = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } # Substrate frames -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.22" } -frame-executive = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.22" } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-try-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false, optional = true, branch = "polkadot-v0.9.22" } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.26" } +frame-executive = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.26" } +frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-try-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false, optional = true, branch = "polkadot-v0.9.26" } # Substrate pallets -pallet-assets = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-collective = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-democracy = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-membership = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-preimage = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-treasury = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-utility = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } +pallet-assets = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-collective = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-democracy = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-membership = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-preimage = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-treasury = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-utility = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-session-benchmarking = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, optional = true, branch = "polkadot-v0.9.22" } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -parachain-info = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } +cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-session-benchmarking = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, optional = true, branch = "polkadot-v0.9.26" } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +parachain-info = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } # Nimbus Dependencies -pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "garandor/polkadot-v0.9.26", default-features = false } # Polkadot dependencies -pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } +pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } # Third party (vendored) dependencies -orml-traits = { git = "https://github.com/manta-network/open-runtime-module-library.git", default-features = false, rev = "cc26ffa" } -orml-xtokens = { git = "https://github.com/manta-network/open-runtime-module-library.git", default-features = false, rev = "cc26ffa" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" } # Self dependencies calamari-vesting = { path = '../../pallets/vesting', default-features = false } @@ -98,7 +98,7 @@ session-key-primitives = { path = '../../primitives/session-keys', default-featu targets = ['x86_64-unknown-linux-gnu'] [build-dependencies] -substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } +substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } [dev-dependencies] reqwest = { version = "0.11", features = ["blocking"] } diff --git a/runtime/calamari/src/lib.rs b/runtime/calamari/src/lib.rs index 0b93e1ed4..b1f913255 100644 --- a/runtime/calamari/src/lib.rs +++ b/runtime/calamari/src/lib.rs @@ -39,7 +39,7 @@ use sp_version::RuntimeVersion; use frame_support::{ construct_runtime, parameter_types, - traits::{ConstU16, ConstU32, ConstU8, Contains, Currency, EnsureOneOf, PrivilegeCmp}, + traits::{ConstU16, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, PrivilegeCmp}, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, ConstantMultiplier, DispatchClass, Weight, @@ -180,7 +180,7 @@ parameter_types! { impl pallet_tx_pause::Config for Runtime { type Event = Event; - type UpdateOrigin = EnsureOneOf< + type UpdateOrigin = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionMoreThan, >; @@ -359,6 +359,7 @@ impl pallet_transaction_payment::Config for Runtime { type LengthToFee = ConstantMultiplier; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OperationalFeeMultiplier = ConstU8<5>; + type Event = Event; } parameter_types! { @@ -428,7 +429,7 @@ impl pallet_democracy::Config for Runtime { pallet_collective::EnsureProportionAtLeast; // To cancel a proposal before it has been passed, the technical committee must be unanimous or // Root must agree. - type CancelProposalOrigin = EnsureOneOf< + type CancelProposalOrigin = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; @@ -465,7 +466,7 @@ impl pallet_collective::Config for Runtime { type WeightInfo = weights::pallet_collective::SubstrateWeight; } -pub type EnsureRootOrThreeFourthsCouncil = EnsureOneOf< +pub type EnsureRootOrThreeFourthsCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; @@ -523,12 +524,12 @@ parameter_types! { pub const TreasuryPalletId: PalletId = TREASURY_PALLET_ID; } -type EnsureRootOrThreeFifthsCouncil = EnsureOneOf< +type EnsureRootOrThreeFifthsCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -type EnsureRootOrMoreThanHalfCouncil = EnsureOneOf< +type EnsureRootOrMoreThanHalfCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionMoreThan, >; @@ -549,6 +550,7 @@ impl pallet_treasury::Config for Runtime { type MaxApprovals = ConstU32<100>; type WeightInfo = weights::pallet_treasury::SubstrateWeight; type SpendFunds = (); + type SpendOrigin = frame_support::traits::NeverEnsureOrigin; } parameter_types! { @@ -650,7 +652,7 @@ parameter_types! { } /// We allow root and the Relay Chain council to execute privileged collator selection operations. -pub type CollatorSelectionUpdateOrigin = EnsureOneOf< +pub type CollatorSelectionUpdateOrigin = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; @@ -701,7 +703,7 @@ construct_runtime!( // Monetary stuff. Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 11, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event} = 11, // Governance stuff. Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event} = 14, diff --git a/runtime/calamari/src/weights/pallet_treasury.rs b/runtime/calamari/src/weights/pallet_treasury.rs index 31c103d9a..b0c2732c3 100644 --- a/runtime/calamari/src/weights/pallet_treasury.rs +++ b/runtime/calamari/src/weights/pallet_treasury.rs @@ -45,6 +45,7 @@ use sp_std::marker::PhantomData; /// Weight functions needed for pallet_treasury. pub trait WeightInfo { + fn spend() -> Weight; fn propose_spend() -> Weight; fn reject_proposal() -> Weight; fn approve_proposal(p: u32, ) -> Weight; @@ -55,6 +56,9 @@ pub trait WeightInfo { /// Weights for pallet_treasury using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); impl pallet_treasury::WeightInfo for SubstrateWeight { + fn spend() -> Weight { + (151_000 as Weight) + } // Storage: Treasury ProposalCount (r:1 w:1) // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { @@ -100,6 +104,9 @@ impl pallet_treasury::WeightInfo for SubstrateWeight // For backwards compatibility and tests impl WeightInfo for () { + fn spend() -> Weight { + (151_000 as Weight) + } // Storage: Treasury ProposalCount (r:1 w:1) // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { diff --git a/runtime/calamari/src/xcm_config.rs b/runtime/calamari/src/xcm_config.rs index 4eda6d942..db95d610e 100644 --- a/runtime/calamari/src/xcm_config.rs +++ b/runtime/calamari/src/xcm_config.rs @@ -73,6 +73,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; type OnSystemEvent = (); + type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; } impl parachain_info::Config for Runtime {} diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index edf48ae36..b83b0f09f 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -9,50 +9,49 @@ version = '3.2.1' [dependencies] # Substrate dependencies -frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22", default-features = false } -pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26", default-features = false } +pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26", default-features = false } # Self dependencies manta-primitives = { path = '../../primitives/manta', default-features = false } [dev-dependencies] -syn = { version = "=1.0.96" } # Workaround until polkadot-v0.9.24 for https://github.com/paritytech/substrate/issues/11706 # 3rd dependencies codec = { package = "parity-scale-codec", version = "3.1.2" } scale-info = { version = "2.1.2", features = ["derive"] } # Substrate dependencies -frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -pallet-utility = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } -sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } +frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +pallet-utility = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } +sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } # Polkadot dependencies -pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } -polkadot-core-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } -polkadot-runtime-parachains = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } -xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } -xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } -xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } -xcm-simulator = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.22" } +pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } +polkadot-core-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } +polkadot-runtime-parachains = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } +xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } +xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } +xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } +xcm-simulator = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } # Cumulus dependencies -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.22" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.22" } -parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.22" } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.26" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.26" } +parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } # Orml dependencies -orml-traits = { git = "https://github.com/manta-network/open-runtime-module-library.git", rev = "cc26ffa" } -orml-xtokens = { git = "https://github.com/manta-network/open-runtime-module-library.git", rev = "cc26ffa" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.26" } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.26" } # Self dependencies pallet-asset-manager = { path = '../../pallets/asset-manager' } diff --git a/runtime/dolphin/Cargo.toml b/runtime/dolphin/Cargo.toml index f188bd634..ea692e36a 100644 --- a/runtime/dolphin/Cargo.toml +++ b/runtime/dolphin/Cargo.toml @@ -16,72 +16,72 @@ serde = { version = '1.0.137', features = ['derive'], optional = true } smallvec = "1.8.0" # Substrate primitives -sp-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-application-crypto = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-arithmetic = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-core = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-inherents = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-io = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-offchain = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-version = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } +sp-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-application-crypto = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-arithmetic = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-core = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-inherents = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-io = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-offchain = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-version = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } # Substrate frames -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.22" } -frame-executive = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.22" } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-try-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false, optional = true, branch = "polkadot-v0.9.22" } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.26" } +frame-executive = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.26" } +frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-try-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false, optional = true, branch = "polkadot-v0.9.26" } # Substrate pallets -pallet-assets = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-collective = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-democracy = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-membership = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-preimage = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-sudo = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-treasury = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-utility = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } +pallet-assets = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-collective = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-democracy = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-membership = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-preimage = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-sudo = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-treasury = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-utility = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-session-benchmarking = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, optional = true, branch = "polkadot-v0.9.22" } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -parachain-info = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } +cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-session-benchmarking = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, optional = true, branch = "polkadot-v0.9.26" } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +parachain-info = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } # Nimbus Dependencies -pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "polkadot-v0.9.22", default-features = false } +pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "garandor/polkadot-v0.9.26", default-features = false } # Polkadot dependencies -pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -polkadot-core-primitives = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } +pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +polkadot-core-primitives = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } # Self dependencies manta-collator-selection = { path = '../../pallets/collator-selection', default-features = false } @@ -93,14 +93,14 @@ runtime-common = { path = '../common', default-features = false } session-key-primitives = { path = '../../primitives/session-keys', default-features = false } # Third party (vendored) dependencies -orml-traits = { git = "https://github.com/manta-network/open-runtime-module-library.git", default-features = false, rev = "cc26ffa" } -orml-xtokens = { git = "https://github.com/manta-network/open-runtime-module-library.git", default-features = false, rev = "cc26ffa" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" } [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] [build-dependencies] -substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } +substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } [features] default = ['std'] diff --git a/runtime/dolphin/src/lib.rs b/runtime/dolphin/src/lib.rs index 7985ba59a..9c178507c 100644 --- a/runtime/dolphin/src/lib.rs +++ b/runtime/dolphin/src/lib.rs @@ -40,7 +40,7 @@ use sp_version::NativeVersion; use frame_support::{ construct_runtime, parameter_types, - traits::{ConstU16, ConstU32, ConstU8, Contains, Currency, EnsureOneOf, PrivilegeCmp}, + traits::{ConstU16, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, PrivilegeCmp}, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, ConstantMultiplier, DispatchClass, Weight, @@ -357,6 +357,7 @@ impl pallet_transaction_payment::Config for Runtime { type LengthToFee = ConstantMultiplier; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OperationalFeeMultiplier = ConstU8<5>; + type Event = Event; } parameter_types! { @@ -431,7 +432,7 @@ impl pallet_democracy::Config for Runtime { pallet_collective::EnsureProportionAtLeast; // To cancel a proposal before it has been passed, the technical committee must be unanimous or // Root must agree. - type CancelProposalOrigin = EnsureOneOf< + type CancelProposalOrigin = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; @@ -468,7 +469,7 @@ impl pallet_collective::Config for Runtime { type WeightInfo = weights::pallet_collective::SubstrateWeight; } -pub type EnsureRootOrThreeFourthsCouncil = EnsureOneOf< +pub type EnsureRootOrThreeFourthsCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; @@ -526,12 +527,12 @@ parameter_types! { pub const TreasuryPalletId: PalletId = TREASURY_PALLET_ID; } -type EnsureRootOrThreeFifthsCouncil = EnsureOneOf< +type EnsureRootOrThreeFifthsCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -type EnsureRootOrMoreThanHalfCouncil = EnsureOneOf< +type EnsureRootOrMoreThanHalfCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionMoreThan, >; @@ -552,6 +553,7 @@ impl pallet_treasury::Config for Runtime { type MaxApprovals = ConstU32<100>; type WeightInfo = weights::pallet_treasury::SubstrateWeight; type SpendFunds = (); + type SpendOrigin = frame_support::traits::NeverEnsureOrigin; } parameter_types! { @@ -653,7 +655,7 @@ parameter_types! { } /// We allow root and the Relay Chain council to execute privileged collator selection operations. -pub type CollatorSelectionUpdateOrigin = EnsureOneOf< +pub type CollatorSelectionUpdateOrigin = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; @@ -690,7 +692,7 @@ construct_runtime!( // Monetary stuff. Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 11, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event} = 11, // Governance stuff. Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event} = 14, diff --git a/runtime/dolphin/src/weights/pallet_treasury.rs b/runtime/dolphin/src/weights/pallet_treasury.rs index ce22e1ad2..004742e3f 100644 --- a/runtime/dolphin/src/weights/pallet_treasury.rs +++ b/runtime/dolphin/src/weights/pallet_treasury.rs @@ -50,11 +50,15 @@ pub trait WeightInfo { fn approve_proposal(p: u32, ) -> Weight; fn remove_approval() -> Weight; fn on_initialize_proposals(p: u32, ) -> Weight; + fn spend() -> Weight; } /// Weights for pallet_treasury using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); impl pallet_treasury::WeightInfo for SubstrateWeight { + fn spend() -> Weight { + (151_000 as Weight) + } // Storage: Treasury ProposalCount (r:1 w:1) // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { @@ -100,6 +104,9 @@ impl pallet_treasury::WeightInfo for SubstrateWeight // For backwards compatibility and tests impl WeightInfo for () { + fn spend() -> Weight { + (151_000 as Weight) + } // Storage: Treasury ProposalCount (r:1 w:1) // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { diff --git a/runtime/dolphin/src/xcm_config.rs b/runtime/dolphin/src/xcm_config.rs index a071e5ebb..fb1855d12 100644 --- a/runtime/dolphin/src/xcm_config.rs +++ b/runtime/dolphin/src/xcm_config.rs @@ -72,6 +72,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; type OnSystemEvent = (); + type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; } impl parachain_info::Config for Runtime {} diff --git a/runtime/manta/Cargo.toml b/runtime/manta/Cargo.toml index f022d870d..a720f1846 100644 --- a/runtime/manta/Cargo.toml +++ b/runtime/manta/Cargo.toml @@ -15,63 +15,63 @@ serde = { version = '1.0.137', features = ['derive'], optional = true } smallvec = "1.8.0" # Substrate primitives -sp-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-core = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-inherents = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-io = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-offchain = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -sp-version = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } +sp-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-core = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-inherents = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-io = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-offchain = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-std = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +sp-version = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } # Substrate frames -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.22" } -frame-executive = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.22" } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -frame-try-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false, optional = true, branch = "polkadot-v0.9.22" } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.26" } +frame-executive = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, optional = true, branch = "polkadot-v0.9.26" } +frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +frame-try-runtime = { git = "https://github.com/paritytech/substrate.git", default-features = false, optional = true, branch = "polkadot-v0.9.26" } # Substrate pallets -pallet-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-preimage = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.22" } -pallet-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-sudo = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-utility = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.22" } +pallet-aura = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-preimage = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.26" } +pallet-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-sudo = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-utility = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-session-benchmarking = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, optional = true, branch = "polkadot-v0.9.22" } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } -parachain-info = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.22" } +cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-session-benchmarking = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, optional = true, branch = "polkadot-v0.9.26" } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } +parachain-info = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } # Polkadot dependencies -pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } -xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.22" } +pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } +xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } # Self dependencies manta-primitives = { path = '../../primitives/manta', default-features = false } @@ -83,7 +83,7 @@ session-key-primitives = { path = '../../primitives/session-keys', default-featu targets = ['x86_64-unknown-linux-gnu'] [build-dependencies] -substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" } +substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } [features] default = ['std'] diff --git a/runtime/manta/src/lib.rs b/runtime/manta/src/lib.rs index ae591c6c8..03efcbfa3 100644 --- a/runtime/manta/src/lib.rs +++ b/runtime/manta/src/lib.rs @@ -40,7 +40,9 @@ use sp_version::RuntimeVersion; use frame_support::{ construct_runtime, match_types, parameter_types, - traits::{ConstU16, ConstU32, ConstU8, Contains, Currency, EnsureOneOf, Everything, Nothing}, + traits::{ + ConstU16, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, Everything, Nothing, + }, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, ConstantMultiplier, DispatchClass, IdentityFee, Weight, @@ -293,6 +295,7 @@ impl pallet_transaction_payment::Config for Runtime { type LengthToFee = ConstantMultiplier; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OperationalFeeMultiplier = ConstU8<5>; + type Event = Event; } parameter_types! { @@ -380,6 +383,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type OutboundXcmpMessageSource = XcmpQueue; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; + type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; } impl parachain_info::Config for Runtime {} @@ -584,7 +588,7 @@ parameter_types! { /// We allow root and the Relay Chain council to execute privileged collator selection operations. pub type CollatorSelectionUpdateOrigin = - EnsureOneOf, EnsureXcm>>; + EitherOfDiverse, EnsureXcm>>; impl pallet_collator_selection::Config for Runtime { type Event = Event; @@ -618,7 +622,7 @@ construct_runtime!( TransactionPause: pallet_tx_pause::{Pallet, Call, Storage, Event} = 9, // Monetary stuff. Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 11, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event} = 11, // Collator support. the order of these 5 are important and shall not change. Authorship: pallet_authorship::{Pallet, Call, Storage} = 20, From b14a172f8bba750308424e69f531d168d87e93ea Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Jul 2022 13:59:16 +0300 Subject: [PATCH 02/19] Revert rust verison Signed-off-by: Georgi Zlatarev --- node/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/Cargo.toml b/node/Cargo.toml index 9e87804b0..e901fd47c 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -8,7 +8,7 @@ homepage = 'https://manta.network' license = 'GPL-3.0' name = 'manta' repository = 'https://github.com/Manta-Network/Manta/' -rust-version = '1.60' +rust-version = '1.59' version = '3.2.1' [package.metadata.docs.rs] From 45992a9730007bd31200020d5abdd4f619c52276 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Jul 2022 14:42:36 +0300 Subject: [PATCH 03/19] Clean up Signed-off-by: Georgi Zlatarev --- node/src/service.rs | 14 +++++++------- runtime/calamari/src/xcm_config.rs | 3 ++- runtime/dolphin/src/xcm_config.rs | 3 ++- runtime/manta/src/lib.rs | 4 +++- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/node/src/service.rs b/node/src/service.rs index 5917b0829..6e277fe44 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -242,12 +242,12 @@ async fn build_relay_chain_interface( /// This is the actual implementation that is abstract over the executor and the runtime api. #[sc_tracing::logging::prefix_logs_with("Parachain")] #[allow(clippy::too_many_arguments)] -async fn start_node_impl( +async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, collator_options: CollatorOptions, id: ParaId, - _full_rpc: FullRpc, + _rpc_ext_builder: RB, build_import_queue: BIQ, build_consensus: BIC, hwbench: Option, @@ -268,7 +268,7 @@ where + frame_rpc_system::AccountNonceApi, StateBackend: sp_api::StateBackend, Executor: NativeExecutionDispatch + 'static, - FullRpc: Fn( + RB: Fn( rpc::FullDeps, TransactionPool>, ) -> Result, Error> + 'static, @@ -604,13 +604,13 @@ where } /// Start a calamari/manta parachain node. -pub async fn start_parachain_node( +pub async fn start_parachain_node( parachain_config: Configuration, polkadot_config: Configuration, collator_options: CollatorOptions, id: ParaId, hwbench: Option, - full_rpc: FullRpc, + rpc_ext_builder: RB, ) -> sc_service::error::Result<( TaskManager, Arc>>, @@ -631,7 +631,7 @@ where Executor: NativeExecutionDispatch + 'static, <::Pair as Pair>::Signature: TryFrom> + std::hash::Hash + sp_runtime::traits::Member + Codec, - FullRpc: Fn( + RB: Fn( rpc::FullDeps, TransactionPool>, ) -> Result, Error> + 'static, @@ -641,7 +641,7 @@ where polkadot_config, collator_options, id, - full_rpc, + rpc_ext_builder, parachain_build_import_queue::<_, _, AuraId>, |client, prometheus_registry, diff --git a/runtime/calamari/src/xcm_config.rs b/runtime/calamari/src/xcm_config.rs index db95d610e..8c3e7f2c2 100644 --- a/runtime/calamari/src/xcm_config.rs +++ b/runtime/calamari/src/xcm_config.rs @@ -24,6 +24,7 @@ use super::{ use codec::{Decode, Encode}; use scale_info::TypeInfo; +use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; use sp_std::prelude::*; use frame_support::{ @@ -73,7 +74,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; type OnSystemEvent = (); - type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; + type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; } impl parachain_info::Config for Runtime {} diff --git a/runtime/dolphin/src/xcm_config.rs b/runtime/dolphin/src/xcm_config.rs index fb1855d12..16859450c 100644 --- a/runtime/dolphin/src/xcm_config.rs +++ b/runtime/dolphin/src/xcm_config.rs @@ -24,6 +24,7 @@ use super::{ use codec::{Decode, Encode}; use scale_info::TypeInfo; +use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; use sp_std::prelude::*; use frame_support::{ @@ -72,7 +73,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; type OnSystemEvent = (); - type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; + type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; } impl parachain_info::Config for Runtime {} diff --git a/runtime/manta/src/lib.rs b/runtime/manta/src/lib.rs index 03efcbfa3..3d2159ba6 100644 --- a/runtime/manta/src/lib.rs +++ b/runtime/manta/src/lib.rs @@ -64,6 +64,8 @@ use sp_runtime::Perbill; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; +use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; + // Polkadot imports use pallet_xcm::{EnsureXcm, IsMajorityOfBody, XcmPassthrough}; use polkadot_parachain::primitives::Sibling; @@ -383,7 +385,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type OutboundXcmpMessageSource = XcmpQueue; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; - type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; + type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; } impl parachain_info::Config for Runtime {} From 0b9b586f0dc89db76ee6b74feb71f50f5ce5016d Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Jul 2022 15:14:13 +0300 Subject: [PATCH 04/19] Allow deprecad in migrations Signed-off-by: Georgi Zlatarev --- pallets/collator-selection/src/migrations.rs | 9 +++------ runtime/calamari/src/migrations/sudo.rs | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pallets/collator-selection/src/migrations.rs b/pallets/collator-selection/src/migrations.rs index 5a8f5b0dc..c365432c8 100644 --- a/pallets/collator-selection/src/migrations.rs +++ b/pallets/collator-selection/src/migrations.rs @@ -15,10 +15,12 @@ // along with Manta. If not, see . #![cfg_attr(not(feature = "std"), no_std)] +#![allow(deprecated)] use super::*; use frame_support::{ dispatch::GetStorageVersion, + migration::{have_storage_value, remove_storage_prefix, storage_key_iter}, pallet_prelude::Weight, traits::{Get, PalletInfoAccess, StorageVersion}, Twox64Concat, @@ -27,9 +29,6 @@ use frame_support::{ /// This migrates the pallet from the standard version by parity to our modified storage. impl Pallet { pub fn migrate_v0_to_v1() -> frame_support::weights::Weight { - use frame_support::migration::{ - have_storage_value, remove_storage_prefix, storage_key_iter, - }; // Storage migrations should use storage versions for safety. if Self::on_chain_storage_version() < 1 { log::info!("Executing collator-selection V0->V1 migration!"); @@ -56,7 +55,7 @@ impl Pallet { remove_storage_prefix(Self::name().as_bytes(), b"KickThreshold", &[]); log::info!(" >>> Removed KickThreshold"); } else { - log::warn!(" !!! Chain did not have KickThreshold in storage. This is uenexpected but is possible if the genesis config was never changed"); + log::warn!(" !!! Chain did not have KickThreshold in storage. This is unexpected but is possible if the genesis config was never changed"); } // Return the weight consumed by the migration. @@ -67,7 +66,6 @@ impl Pallet { } } pub fn pre_migrate_v0_to_v1() -> Result<(), &'static str> { - use frame_support::migration::{have_storage_value, storage_key_iter}; let chainver = Self::on_chain_storage_version(); if chainver >= 1 { return Err("Migration to V1 does not apply"); @@ -88,7 +86,6 @@ impl Pallet { } pub fn post_migrate_v0_to_v1() -> Result<(), &'static str> { - use frame_support::migration::{have_storage_value, storage_key_iter}; if Self::on_chain_storage_version() != 1 { return Err("storage version not upgraded"); } diff --git a/runtime/calamari/src/migrations/sudo.rs b/runtime/calamari/src/migrations/sudo.rs index ca51e336f..64bade92f 100644 --- a/runtime/calamari/src/migrations/sudo.rs +++ b/runtime/calamari/src/migrations/sudo.rs @@ -15,6 +15,7 @@ // along with Manta. If not, see . #![allow(clippy::unnecessary_cast)] +#![allow(deprecated)] use core::marker::PhantomData; use frame_support::{ From 05ae8cdea783be62c0429e16c0629df13f8734e5 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Jul 2022 20:09:17 +0300 Subject: [PATCH 05/19] Fix tests Signed-off-by: Georgi Zlatarev --- pallets/asset-manager/src/tests.rs | 28 ++++++-- pallets/collator-selection/src/lib.rs | 4 +- pallets/vesting/src/mock.rs | 3 +- pallets/vesting/src/tests.rs | 12 ++-- runtime/calamari/src/fee.rs | 15 +++-- runtime/calamari/tests/integration_tests.rs | 4 +- runtime/common/tests/xcm_mock/mod.rs | 2 +- runtime/common/tests/xcm_mock/parachain.rs | 2 + runtime/common/tests/xcm_tests.rs | 74 +++++++++++---------- 9 files changed, 86 insertions(+), 58 deletions(-) diff --git a/pallets/asset-manager/src/tests.rs b/pallets/asset-manager/src/tests.rs index cc8a49369..2d27c15d0 100644 --- a/pallets/asset-manager/src/tests.rs +++ b/pallets/asset-manager/src/tests.rs @@ -23,6 +23,7 @@ use asset_manager::mock::*; use frame_support::{ assert_noop, assert_ok, traits::{fungibles::InspectMetadata, Contains}, + WeakBoundedVec, }; use manta_primitives::assets::{AssetConfig, AssetLocation, FungibleLedger}; use orml_traits::GetByKey; @@ -286,7 +287,10 @@ fn check_para_id_info_when_update_asset_location() { let mut manta_non_native_location = AssetLocation(VersionedMultiLocation::V1(MultiLocation::new( 1, - X2(Parachain(manta_para_id), GeneralKey(b"eMANTA".to_vec())), + X2( + Parachain(manta_para_id), + GeneralKey(WeakBoundedVec::force_from(b"eMANTA".to_vec(), None)), + ), ))); // registering manta non native asset should work. assert_ok!(AssetManager::register_asset( @@ -305,7 +309,10 @@ fn check_para_id_info_when_update_asset_location() { let new_para_id = manta_para_id + 1; manta_native_location = AssetLocation(VersionedMultiLocation::V1(MultiLocation::new( 1, - X2(Parachain(new_para_id), GeneralKey(b"MANTA".to_vec())), + X2( + Parachain(new_para_id), + GeneralKey(WeakBoundedVec::force_from(b"eMANTA".to_vec(), None)), + ), ))); assert_ok!(AssetManager::update_asset_location( Origin::root(), @@ -327,7 +334,10 @@ fn check_para_id_info_when_update_asset_location() { let new_para_id_again = new_para_id + 1; manta_non_native_location = AssetLocation(VersionedMultiLocation::V1(MultiLocation::new( 1, - X2(Parachain(new_para_id_again), GeneralKey(b"eMANTA".to_vec())), + X2( + Parachain(new_para_id_again), + GeneralKey(WeakBoundedVec::force_from(b"eMANTA".to_vec(), None)), + ), ))); assert_ok!(AssetManager::update_asset_location( Origin::root(), @@ -486,7 +496,10 @@ fn set_min_xcm_fee_should_work() { create_asset_metadata("Manta", "MANTA", 18, 1u128, None, false, false); let manta_location = AssetLocation(VersionedMultiLocation::V1(MultiLocation::new( 1, - X2(Parachain(2015), GeneralKey(b"MANTA".to_vec())), + X2( + Parachain(2015), + GeneralKey(WeakBoundedVec::force_from(b"MANTA".to_vec(), None)), + ), ))); new_test_ext().execute_with(|| { // Register a non native token. @@ -528,14 +541,17 @@ fn set_min_xcm_fee_should_work() { // that means your crosschain transaction will fail due to no one can pay u128::MAX. let calamari_location = AssetLocation(VersionedMultiLocation::V1(MultiLocation::new( 1, - X2(Parachain(2084), GeneralKey(b"KMA".to_vec())), + X2( + Parachain(2084), + GeneralKey(WeakBoundedVec::force_from(b"KMA".to_vec(), None)), + ), ))); assert_eq!( crate::Pallet::::get( &Into::>::into(calamari_location).unwrap() ), - u128::MAX + None ); }) } diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index 3b60d9f5a..817028515 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -590,7 +590,7 @@ pub mod pallet { // 2. get percentile by _exclusive_ nearest rank method https://en.wikipedia.org/wiki/Percentile#The_nearest-rank_method (rust percentile API is feature gated and unstable) let ordinal_rank = percentile_for_kick.mul_ceil(collator_count); - let index_at_ordinal_rank = ordinal_rank.saturating_sub(One::one()); // -1 to accomodate 0-index counting, should not saturate due to precondition check and round up multiplication + let index_at_ordinal_rank = ordinal_rank.saturating_sub(One::one()); // -1 to accommodate 0-index counting, should not saturate due to precondition check and round up multiplication // 3. Block number at rank is the percentile and our kick performance benchmark let blocks_created_at_baseline: BlockCount = @@ -705,7 +705,7 @@ pub mod pallet { DispatchClass::Mandatory, ); - Self::reset_collator_performance(); // Reset performance map for the now starting session's active validatorset + Self::reset_collator_performance(); // Reset performance map for the now starting session's active validator set Some(result) } fn start_session(_: SessionIndex) { diff --git a/pallets/vesting/src/mock.rs b/pallets/vesting/src/mock.rs index ef3987554..d27787fa6 100644 --- a/pallets/vesting/src/mock.rs +++ b/pallets/vesting/src/mock.rs @@ -107,13 +107,14 @@ impl pallet_timestamp::Config for Test { parameter_types! { pub const MinVestedTransfer: Balance = 2; pub static ExistentialDeposit: Balance = 1; + pub const MaxScheduleLength: u32 = 6; } impl Config for Test { type Currency = Balances; type Event = Event; type Timestamp = Timestamp; type MinVestedTransfer = MinVestedTransfer; - type MaxScheduleLength = ConstU32<6>; + type MaxScheduleLength = MaxScheduleLength; type WeightInfo = (); } diff --git a/pallets/vesting/src/tests.rs b/pallets/vesting/src/tests.rs index 5986726a7..6fbd41618 100644 --- a/pallets/vesting/src/tests.rs +++ b/pallets/vesting/src/tests.rs @@ -80,7 +80,7 @@ fn alice_vesting_for_bob_should_work() { assert_eq!(Balances::free_balance(BOB), unvested); // BOB cannot transfer more than 1th round of vested tokens. - // Bacause the rest of tokens are locked. + // Because the rest of tokens are locked. let vested = VestingSchedule::::get()[first_round].0 * unvested; // Check event System::assert_has_event(MockEvent::CalamariVesting(PalletEvent::VestingUpdated( @@ -211,7 +211,7 @@ fn alice_vesting_for_bob_claim_arbitrarily_should_work() { assert_eq!(Balances::free_balance(BOB), unvested); // BOB cannot transfer more than 1th round of vested tokens. - // Bacause the rest of tokens are locked. + // Because the rest of tokens are locked. let vested_1 = VestingSchedule::::get()[first_round].0 * unvested; // Check event System::assert_has_event(MockEvent::CalamariVesting(PalletEvent::VestingUpdated( @@ -337,8 +337,8 @@ fn partially_update_vesting_schedule_should_work() { .execute_with(|| { // Ensure current timestamp is bigger than the 1th round of schedule. // Now Bob can claim 1th round vested tokens. - let frist_round = 0; - let now = VestingSchedule::::get()[frist_round].1 * 1000 + 1; + let first_round = 0; + let now = VestingSchedule::::get()[first_round].1 * 1000 + 1; Timestamp::set_timestamp(now); // skip 2 round of old schedule. @@ -351,7 +351,7 @@ fn partially_update_vesting_schedule_should_work() { new_schedule.push(*schedule); continue; } - // odd means more early than old schedle but still later than now. + // odd means more early than old schedule but still later than now. // even means more late than old schedle but still later than now. if index % 2 == 0 { new_schedule.push(*schedule + 1); @@ -504,7 +504,7 @@ fn check_vesting_schedule() { .execute_with(|| { // Check current schedule. let schedule = VestingSchedule::::get(); - let schedule_len: u32 = ::MaxScheduleLength::get(); + let schedule_len = ::MaxScheduleLength::get(); assert_eq!(schedule.len(), schedule_len as usize); //Check percentage. diff --git a/runtime/calamari/src/fee.rs b/runtime/calamari/src/fee.rs index 9f042dc0a..fbd421c43 100644 --- a/runtime/calamari/src/fee.rs +++ b/runtime/calamari/src/fee.rs @@ -60,7 +60,7 @@ mod multiplier_tests { Call, Runtime, RuntimeBlockWeights as BlockWeights, System, TransactionPayment, KMA, }; use codec::Encode; - use frame_support::weights::{DispatchClass, Weight, WeightToFeePolynomial}; + use frame_support::weights::{DispatchClass, Weight, WeightToFee}; use frame_system::WeightInfo; use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment}; use runtime_common::{ @@ -145,11 +145,13 @@ mod multiplier_tests { ::SystemWeightInfo::remark(len); let max_number_of_remarks_per_block = (block_weight / remark_weight) as u128; let len_fee = max_number_of_remarks_per_block.saturating_mul( - ::LengthToFee::calc(&(len as Weight)), + ::LengthToFee::weight_to_fee( + &(len as Weight), + ), ); let base_fee = max_number_of_remarks_per_block - * ::WeightToFee::calc( + * ::WeightToFee::weight_to_fee( &frame_support::weights::constants::ExtrinsicBaseWeight::get(), ); @@ -168,9 +170,10 @@ mod multiplier_tests { panic!("The fee should ever increase"); } fee_adjustment = next; - let fee = ::WeightToFee::calc( - &block_weight, - ); + let fee = + ::WeightToFee::weight_to_fee( + &block_weight, + ); // base_fee and len_fee are not adjusted: // https://docs.substrate.io/main-docs/build/tx-weights-fees/#:~:text=A%20closer%20look%20at%20the%20inclusion%20fee diff --git a/runtime/calamari/tests/integration_tests.rs b/runtime/calamari/tests/integration_tests.rs index cf065e937..14108b1b0 100644 --- a/runtime/calamari/tests/integration_tests.rs +++ b/runtime/calamari/tests/integration_tests.rs @@ -844,14 +844,14 @@ fn verify_pallet_prefixes() { pallet_name: b"Balances".to_vec(), storage_name: b"Account".to_vec(), prefix: prefix(b"Balances", b"Account"), - max_values: Some(300_000), + max_values: None, max_size: Some(112), }, StorageInfo { pallet_name: b"Balances".to_vec(), storage_name: b"Locks".to_vec(), prefix: prefix(b"Balances", b"Locks"), - max_values: Some(300_000), + max_values: None, max_size: Some(1299), }, StorageInfo { diff --git a/runtime/common/tests/xcm_mock/mod.rs b/runtime/common/tests/xcm_mock/mod.rs index 8026c71c0..bafc0fab7 100644 --- a/runtime/common/tests/xcm_mock/mod.rs +++ b/runtime/common/tests/xcm_mock/mod.rs @@ -74,7 +74,7 @@ decl_test_network! { } pub fn para_account_id(id: u32) -> relay_chain::AccountId { - ParaId::from(id).into_account() + ParaId::from(id).into_account_truncating() } pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { diff --git a/runtime/common/tests/xcm_mock/parachain.rs b/runtime/common/tests/xcm_mock/parachain.rs index 9063679a1..3fab04f3d 100644 --- a/runtime/common/tests/xcm_mock/parachain.rs +++ b/runtime/common/tests/xcm_mock/parachain.rs @@ -17,6 +17,7 @@ //! Parachain runtime mock. use codec::{Decode, Encode}; +use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; use frame_support::{ assert_ok, construct_runtime, match_types, pallet_prelude::DispatchResult, @@ -455,6 +456,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; type OnSystemEvent = (); + type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; } pub type LocalOriginToLocation = (); diff --git a/runtime/common/tests/xcm_tests.rs b/runtime/common/tests/xcm_tests.rs index 3fe164682..541542f42 100644 --- a/runtime/common/tests/xcm_tests.rs +++ b/runtime/common/tests/xcm_tests.rs @@ -21,7 +21,9 @@ mod xcm_mock; use codec::Encode; -use frame_support::{assert_err, assert_noop, assert_ok, weights::constants::WEIGHT_PER_SECOND}; +use frame_support::{ + assert_err, assert_noop, assert_ok, weights::constants::WEIGHT_PER_SECOND, WeakBoundedVec, +}; use manta_primitives::assets::AssetLocation; use xcm::{latest::prelude::*, v2::Response, VersionedMultiLocation, WrapVersion}; use xcm_executor::traits::{Convert, WeightBounds}; @@ -456,10 +458,11 @@ fn send_para_a_native_asset_to_para_b_barriers_should_work() { use parachain::{Event, System}; assert!(System::events().iter().any(|r| matches!( r.event, - Event::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail( - Some(_), - xcm_simulator::XcmError::Barrier - )) + Event::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail { + message_hash: Some(_), + error: xcm_simulator::XcmError::Barrier, + weight: _ + }) ))); }); @@ -681,10 +684,11 @@ fn send_para_a_native_asset_to_para_b_must_fail_cases() { assert!(System::events().iter().any(|r| { matches!( r.event, - Event::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail( - Some(_), - xcm_simulator::XcmError::TooExpensive - )) + Event::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail { + message_hash: Some(_), + error: xcm_simulator::XcmError::TooExpensive, + weight: _ + }) ) })); }); @@ -2311,7 +2315,10 @@ fn less_than_min_xcm_fee_should_not_work() { let para_a_source_location = create_asset_location(1, PARA_A_ID); let para_b_source_location = AssetLocation(VersionedMultiLocation::V1(MultiLocation::new( 1, - X2(Parachain(PARA_B_ID), GeneralKey(b"ParaBToken".to_vec())), + X2( + Parachain(PARA_B_ID), + GeneralKey(WeakBoundedVec::force_from(b"ParaBToken".to_vec(), None)), + ), ))); let para_b_as_reserve_chain = create_asset_location(1, PARA_B_ID); @@ -2397,7 +2404,7 @@ fn less_than_min_xcm_fee_should_not_work() { // like `NonReserve` or `SelfReserve` with relay-chain fee is not support. // And our `MaxAssetsForTransfer` for xtokens is 1, // so `transfer_multicurrencies` is not supported on calamari. - // If min-xcm-fee is not set, no one can pay xcm fee(u129::MAX). + // If min-xcm-fee is not set, no one can pay xcm fee(MinXcmFeeNotDefined). ParaA::execute_with(|| { assert_noop!( parachain::XTokens::transfer_multicurrencies( @@ -2416,7 +2423,7 @@ fn less_than_min_xcm_fee_should_not_work() { Box::new(VersionedMultiLocation::V1(dest.clone())), 40, ), - orml_xtokens::Error::::FeeNotEnough + orml_xtokens::Error::::MinXcmFeeNotDefined ); }); @@ -2641,37 +2648,40 @@ fn transfer_multicurrencies_should_work_scenarios() { ); assert_eq!( relay_chain::Balances::free_balance(¶_b_sovereign_on_relay), - fee_amount - min_xcm_fee + // 0 because transfer_multicurrencies uses a Teleport for this case + 0 ); }); ParaB::execute_with(|| { assert_eq!( parachain::Balances::free_balance(&ALICE), - INITIAL_BALANCE - amount_to_a + amount_back_to_b + // because transfer_multicurrencies uses a Teleport for this case + // we no longer expect the amount_back_to_b to be in the sovereign account + INITIAL_BALANCE - amount_to_a ); - // Parachain A sovereign account on Parachain B should receive: - // (fee - min_xcm_fee) from the first to-non-reserve xcm message, reduced by the execution cost on the relay chain - // Then it will be again reduced by the min_xcm_fee to buy execution time for the second to-reserve xcm message + // Parachain A sovereign account on Parachain B should receive: 0 + // because transfer_multicurrencies uses Teleport in this case let para_a_sovereign_on_para_b = parachain::LocationToAccountId::convert_ref( MultiLocation::new(1, X1(Parachain(para_a_id))), ) .unwrap(); - let execution_cost_on_relay_chain = 0; assert_eq!( parachain::Assets::balance(relay_asset_id_on_b, ¶_a_sovereign_on_para_b), - (fee_amount - min_xcm_fee) - execution_cost_on_relay_chain - min_xcm_fee + 0 ); assert_eq!( - // The change from BuyExecution will then be deposited in Alice's account. + // min_xcm_fee will be just enough to pay for execution so + // no change from BuyExecution will be deposited in Alice's account. parachain::Assets::balance(relay_asset_id_on_b, &ALICE), - min_xcm_fee + 0 ); assert_eq!( parachain::Assets::total_supply(relay_asset_id_on_b), - fee_amount - min_xcm_fee + // Since all of the fee is used the total supply should be 0 + 0 ); }); } @@ -2998,24 +3008,21 @@ fn transfer_multicurrencies_should_fail_scenarios() { ); assert_eq!( relay_chain::Balances::free_balance(¶_b_sovereign_on_relay), - fee_amount - min_xcm_fee + // 0 because transfer_multicurrencies uses a Teleport for this case + 0 ); }); ParaB::execute_with(|| { - // Parachain A sovereign account on Parachain B should receive: - // (fee - min_xcm_fee) from the first to-non-reserve xcm message, reduced by the execution cost on the relay chain - // Then it will be again reduced by the min_xcm_fee to buy execution time for the second to-reserve xcm message - // But the latter should fail because the fee was not enough + // Parachain A sovereign account on Parachain B should receive: 0 + // because transfer_multicurrencies uses Teleport in this case let para_a_sovereign_on_para_b = parachain::LocationToAccountId::convert_ref( MultiLocation::new(1, X1(Parachain(para_a_id))), ) .unwrap(); assert_eq!( parachain::Assets::balance(relay_asset_id_on_b, ¶_a_sovereign_on_para_b), - // should be `(fee_amount - min_xcm_fee) - execution_cost_on_relay_chain - min_xcm_fee` - // but there was not enough of the asset to withdraw the second min_xcm_fee - fee_amount - min_xcm_fee + 0 ); assert_eq!( @@ -3023,10 +3030,9 @@ fn transfer_multicurrencies_should_fail_scenarios() { parachain::Assets::balance(relay_asset_id_on_b, &ALICE), 0 ); - assert_eq!( - parachain::Assets::total_supply(relay_asset_id_on_b), - fee_amount - min_xcm_fee - ); + // Since BuyExecution failed so no change to deposit in Alice's account + // the total_supply will remain 0. + assert_eq!(parachain::Assets::total_supply(relay_asset_id_on_b), 0); assert_eq!( parachain::Balances::free_balance(&ALICE), From 0ec77528e0579e3077d40a2c5cc3d29bac35e23b Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Jul 2022 20:19:37 +0300 Subject: [PATCH 06/19] Allow deprecated only for remove_storage_prefix Signed-off-by: Georgi Zlatarev --- pallets/collator-selection/src/migrations.rs | 7 +++++-- runtime/calamari/src/migrations/sudo.rs | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pallets/collator-selection/src/migrations.rs b/pallets/collator-selection/src/migrations.rs index c365432c8..0c9363a75 100644 --- a/pallets/collator-selection/src/migrations.rs +++ b/pallets/collator-selection/src/migrations.rs @@ -15,12 +15,13 @@ // along with Manta. If not, see . #![cfg_attr(not(feature = "std"), no_std)] -#![allow(deprecated)] use super::*; +#[allow(deprecated)] +use frame_support::migration::remove_storage_prefix; use frame_support::{ dispatch::GetStorageVersion, - migration::{have_storage_value, remove_storage_prefix, storage_key_iter}, + migration::{have_storage_value, storage_key_iter}, pallet_prelude::Weight, traits::{Get, PalletInfoAccess, StorageVersion}, Twox64Concat, @@ -44,6 +45,7 @@ impl Pallet { dropcount += 1; } log::info!(" >>> Cleaned {} keys from LastAuthoredBlock", dropcount); + #[allow(deprecated)] remove_storage_prefix(Self::name().as_bytes(), b"LastAuthoredBlock", &[]); log::info!(" >>> Removed LastAuthoredBlock from storage"); @@ -52,6 +54,7 @@ impl Pallet { // Remove KickThreshold if customized if have_storage_value(Self::name().as_bytes(), b"KickThreshold", &[]) { + #[allow(deprecated)] remove_storage_prefix(Self::name().as_bytes(), b"KickThreshold", &[]); log::info!(" >>> Removed KickThreshold"); } else { diff --git a/runtime/calamari/src/migrations/sudo.rs b/runtime/calamari/src/migrations/sudo.rs index 64bade92f..931ac6669 100644 --- a/runtime/calamari/src/migrations/sudo.rs +++ b/runtime/calamari/src/migrations/sudo.rs @@ -15,20 +15,22 @@ // along with Manta. If not, see . #![allow(clippy::unnecessary_cast)] -#![allow(deprecated)] use core::marker::PhantomData; +#[allow(deprecated)] +use frame_support::migration::remove_storage_prefix; use frame_support::{ - migration::{have_storage_value, remove_storage_prefix}, + migration::have_storage_value, pallet_prelude::Weight, traits::{Get, OnRuntimeUpgrade}, }; - pub struct RemoveSudo(PhantomData); impl OnRuntimeUpgrade for RemoveSudo { fn on_runtime_upgrade() -> Weight { if have_storage_value(b"Sudo", b"Key", b"") { + #[allow(deprecated)] remove_storage_prefix(b"Sudo", b"Key", b""); + #[allow(deprecated)] remove_storage_prefix(b"Sudo", b":__STORAGE_VERSION__:", b""); log::info!(target: "OnRuntimeUpgrade", "✅ Sudo key has been removed."); log::info!(target: "OnRuntimeUpgrade", "✅ The pallet version has been removed."); From 8b6b4dc1fb7abccf66aff03aa465f016229da088 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Jul 2022 20:27:07 +0300 Subject: [PATCH 07/19] Fix linters Signed-off-by: Georgi Zlatarev --- pallets/asset-manager/src/lib.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pallets/asset-manager/src/lib.rs b/pallets/asset-manager/src/lib.rs index 932cbd43d..91f0c9ac1 100644 --- a/pallets/asset-manager/src/lib.rs +++ b/pallets/asset-manager/src/lib.rs @@ -552,10 +552,7 @@ pub mod pallet { fn get(location: &MultiLocation) -> Option { let location = >::AssetLocation::from(location.clone()); - match MinXcmFee::::get(&location) { - Some(min_fee) => Some(min_fee), - None => None, - } + MinXcmFee::::get(&location) } } From 7f6f6a7040061ce8a94b6db1531bffbaebf364e3 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Jul 2022 21:32:56 +0300 Subject: [PATCH 08/19] Add CollatorsCount storage and fix linters Signed-off-by: Georgi Zlatarev --- pallets/collator-selection/src/lib.rs | 9 +++++++-- runtime/calamari/Cargo.toml | 4 ++-- runtime/dolphin/Cargo.toml | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index 817028515..96f9eab82 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -222,6 +222,11 @@ pub mod pallet { #[pallet::getter(fn candidacy_bond)] pub type CandidacyBond = StorageValue<_, BalanceOf, ValueQuery>; + /// The collators count. + #[pallet::storage] + #[pallet::getter(fn collators_count)] + pub type CollatorsCount = StorageValue<_, u32, ValueQuery>; + #[pallet::genesis_config] pub struct GenesisConfig { pub invulnerables: Vec, @@ -635,7 +640,7 @@ pub mod pallet { /// Reset the performance map to the currently active validators at 0 blocks pub fn reset_collator_performance() { - let _ = >::clear(>::get(), None); + let _ = >::clear(>::get(), None); let validators = T::ValidatorRegistration::validators(); for validator_id in validators { let account_id = T::AccountIdOf::convert(validator_id.clone().into()); @@ -699,7 +704,7 @@ pub mod pallet { }) .collect::>(); let result = Self::assemble_collators(active_candidate_ids); - + >::set(result.len() as u32); frame_system::Pallet::::register_extra_weight_unchecked( T::WeightInfo::new_session(candidates_len_before as u32), DispatchClass::Mandatory, diff --git a/runtime/calamari/Cargo.toml b/runtime/calamari/Cargo.toml index cfc49d8b1..eedad6332 100644 --- a/runtime/calamari/Cargo.toml +++ b/runtime/calamari/Cargo.toml @@ -82,8 +82,8 @@ xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', default-feat xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } # Third party (vendored) dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } # Self dependencies calamari-vesting = { path = '../../pallets/vesting', default-features = false } diff --git a/runtime/dolphin/Cargo.toml b/runtime/dolphin/Cargo.toml index ea692e36a..9cf980bee 100644 --- a/runtime/dolphin/Cargo.toml +++ b/runtime/dolphin/Cargo.toml @@ -93,8 +93,8 @@ runtime-common = { path = '../common', default-features = false } session-key-primitives = { path = '../../primitives/session-keys', default-features = false } # Third party (vendored) dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] From 3d15f66df158545dcd19b8583b996e39033b9352 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Thu, 28 Jul 2022 13:41:02 +0300 Subject: [PATCH 09/19] Fix RPC builder Signed-off-by: Georgi Zlatarev --- node/src/service.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/src/service.rs b/node/src/service.rs index 6e277fe44..1d86e8cd7 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -247,7 +247,7 @@ async fn start_node_impl( 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, @@ -348,7 +348,7 @@ where deny_unsafe, }; - crate::rpc::create_common_full(deps).map_err(Into::into) + rpc_ext_builder(deps) }) }; From 40c3834e004a61bac990fd0e9ee26b8eb8ee7495 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Thu, 28 Jul 2022 15:25:38 +0300 Subject: [PATCH 10/19] Get rid of redundant collatos count storage item Signed-off-by: Georgi Zlatarev --- pallets/collator-selection/src/lib.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index 96f9eab82..d2cee5aaa 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -222,11 +222,6 @@ pub mod pallet { #[pallet::getter(fn candidacy_bond)] pub type CandidacyBond = StorageValue<_, BalanceOf, ValueQuery>; - /// The collators count. - #[pallet::storage] - #[pallet::getter(fn collators_count)] - pub type CollatorsCount = StorageValue<_, u32, ValueQuery>; - #[pallet::genesis_config] pub struct GenesisConfig { pub invulnerables: Vec, @@ -640,8 +635,8 @@ pub mod pallet { /// Reset the performance map to the currently active validators at 0 blocks pub fn reset_collator_performance() { - let _ = >::clear(>::get(), None); let validators = T::ValidatorRegistration::validators(); + let _ = >::clear(validators.len() as u32, None); for validator_id in validators { let account_id = T::AccountIdOf::convert(validator_id.clone().into()); >::insert(account_id.clone(), 0u32); @@ -704,7 +699,6 @@ pub mod pallet { }) .collect::>(); let result = Self::assemble_collators(active_candidate_ids); - >::set(result.len() as u32); frame_system::Pallet::::register_extra_weight_unchecked( T::WeightInfo::new_session(candidates_len_before as u32), DispatchClass::Mandatory, From 765b151835c0a681a9b29bc1aacc98fc3333346b Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Thu, 28 Jul 2022 16:54:18 +0300 Subject: [PATCH 11/19] Use clear call properly Signed-off-by: Georgi Zlatarev --- pallets/collator-selection/src/lib.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index d2cee5aaa..16ff30986 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -636,7 +636,17 @@ pub mod pallet { /// Reset the performance map to the currently active validators at 0 blocks pub fn reset_collator_performance() { let validators = T::ValidatorRegistration::validators(); - let _ = >::clear(validators.len() as u32, None); + let validators_len = validators.len() as u32; + let mut clear_res = >::clear(validators_len, None); + let mut old_cursor = vec![]; + while let Some(cursor) = clear_res.maybe_cursor { + clear_res = >::clear(validators_len, Some(&cursor)); + if cursor == old_cursor { + // As per the documentation the cursor may not advance after every operation + break; + } + old_cursor = cursor; + } for validator_id in validators { let account_id = T::AccountIdOf::convert(validator_id.clone().into()); >::insert(account_id.clone(), 0u32); From 59da9a5d070184908a6e34eb2f49cc24f7ff7f5a Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Thu, 28 Jul 2022 18:20:52 +0300 Subject: [PATCH 12/19] Import sp_std::vec Signed-off-by: Georgi Zlatarev --- pallets/collator-selection/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index 16ff30986..5d68ccb42 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -98,6 +98,7 @@ pub mod pallet { use pallet_session::SessionManager; use sp_arithmetic::Percent; use sp_staking::SessionIndex; + use sp_std::vec; type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; From 6af044bd258942769515469fd627010f34f18959 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Mon, 1 Aug 2022 09:57:31 +0300 Subject: [PATCH 13/19] Use explicit call indices in custom pallets Signed-off-by: Georgi Zlatarev --- pallets/asset-manager/src/lib.rs | 6 ++++++ pallets/collator-selection/src/lib.rs | 9 +++++++++ pallets/manta-pay/src/lib.rs | 4 ++++ pallets/tx-pause/src/lib.rs | 2 ++ pallets/vesting/src/lib.rs | 3 +++ 5 files changed, 24 insertions(+) diff --git a/pallets/asset-manager/src/lib.rs b/pallets/asset-manager/src/lib.rs index 91f0c9ac1..616668677 100644 --- a/pallets/asset-manager/src/lib.rs +++ b/pallets/asset-manager/src/lib.rs @@ -251,6 +251,7 @@ pub mod pallet { /// * `min_balance`: Minimum balance to keep an account alive, used in conjunction with `is_sufficient`. /// * `is_sufficient`: Whether this asset needs users to have an existential deposit to hold /// this asset. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::register_asset())] #[transactional] pub fn register_asset( @@ -296,6 +297,7 @@ pub mod pallet { /// * `origin`: Caller of this extrinsic, the access control is specified by `ForceOrigin`. /// * `asset_id`: AssetId to be updated. /// * `location`: `location` to update the asset location. + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::update_asset_location())] #[transactional] pub fn update_asset_location( @@ -357,6 +359,7 @@ pub mod pallet { /// * `origin`: Caller of this extrinsic, the access control is specified by `ForceOrigin`. /// * `asset_id`: AssetId to be updated. /// * `metadata`: new `metadata` to be associated with `asset_id`. + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::update_asset_metadata())] #[transactional] pub fn update_asset_metadata( @@ -387,6 +390,7 @@ pub mod pallet { /// * `origin`: Caller of this extrinsic, the access control is specified by `ForceOrigin`. /// * `asset_id`: AssetId to be updated. /// * `units_per_second`: units per second for `asset_id` + #[pallet::call_index(3)] #[pallet::weight(T::WeightInfo::set_units_per_second())] #[transactional] pub fn set_units_per_second( @@ -413,6 +417,7 @@ pub mod pallet { /// * `asset_id`: AssetId to be updated. /// * `beneficiary`: Account to mint the asset. /// * `amount`: Amount of asset being minted. + #[pallet::call_index(4)] #[pallet::weight(T::WeightInfo::mint_asset())] #[transactional] pub fn mint_asset( @@ -455,6 +460,7 @@ pub mod pallet { /// * `origin`: Caller of this extrinsic, the access control is specified by `ForceOrigin`. /// * `reserve_chain`: Multilocation to be haven min xcm fee. /// * `min_xcm_fee`: Amount of min_xcm_fee. + #[pallet::call_index(5)] #[pallet::weight(T::WeightInfo::set_min_xcm_fee())] #[transactional] pub fn set_min_xcm_fee( diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index 5d68ccb42..d4eb1ef97 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -324,6 +324,7 @@ pub mod pallet { /// Set candidate collator as invulnerable. /// /// `new`: candidate collator. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::set_invulnerables(new.len() as u32))] pub fn set_invulnerables( origin: OriginFor, @@ -344,6 +345,7 @@ pub mod pallet { /// Set how many candidate collator are allowed. /// /// `max`: The max number of candidates. + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::set_desired_candidates())] pub fn set_desired_candidates( origin: OriginFor, @@ -362,6 +364,7 @@ pub mod pallet { /// Set the amount held on reserved for candidate collator. /// /// `bond`: The amount held on reserved. + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::set_candidacy_bond())] pub fn set_candidacy_bond( origin: OriginFor, @@ -374,6 +377,7 @@ pub mod pallet { } /// Register as candidate collator. + #[pallet::call_index(3)] #[pallet::weight(T::WeightInfo::register_as_candidate(T::MaxCandidates::get()))] pub fn register_as_candidate(origin: OriginFor) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; @@ -421,6 +425,7 @@ pub mod pallet { /// Register an specified candidate as collator. /// /// - `new_candidate`: Who is going to be collator. + #[pallet::call_index(4)] #[pallet::weight(T::WeightInfo::register_candidate(T::MaxCandidates::get()))] pub fn register_candidate( origin: OriginFor, @@ -471,6 +476,7 @@ pub mod pallet { } /// Leave from collator set. + #[pallet::call_index(5)] #[pallet::weight(T::WeightInfo::leave_intent(T::MaxCandidates::get()))] pub fn leave_intent(origin: OriginFor) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; @@ -482,6 +488,7 @@ pub mod pallet { /// Remove an specified collator. /// /// - `collator`: Who is going to be remove from collators set. + #[pallet::call_index(6)] #[pallet::weight(T::WeightInfo::remove_collator(T::MaxCandidates::get()))] pub fn remove_collator( origin: OriginFor, @@ -503,6 +510,7 @@ pub mod pallet { /// Set the collator performance percentile used as baseline for eviction /// /// `percentile`: x-th percentile of collator performance to use as eviction baseline + #[pallet::call_index(7)] #[pallet::weight(T::WeightInfo::set_eviction_baseline())] pub fn set_eviction_baseline( origin: OriginFor, @@ -517,6 +525,7 @@ pub mod pallet { /// Set the tolerated underperformance percentage before evicting /// /// `percentage`: x% of missed blocks under eviction_baseline to tolerate + #[pallet::call_index(8)] #[pallet::weight(T::WeightInfo::set_eviction_tolerance())] pub fn set_eviction_tolerance( origin: OriginFor, diff --git a/pallets/manta-pay/src/lib.rs b/pallets/manta-pay/src/lib.rs index 9386436b3..d04060d1d 100644 --- a/pallets/manta-pay/src/lib.rs +++ b/pallets/manta-pay/src/lib.rs @@ -178,6 +178,7 @@ pub mod pallet { impl Pallet { /// Transforms some public assets into private ones using `post`, withdrawing the public /// assets from the `origin` account. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::to_private())] #[transactional] pub fn to_private(origin: OriginFor, post: TransferPost) -> DispatchResultWithPostInfo { @@ -187,6 +188,7 @@ pub mod pallet { /// Transforms some private assets into public ones using `post`, depositing the public /// assets in the `origin` account. + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::to_public())] #[transactional] pub fn to_public(origin: OriginFor, post: TransferPost) -> DispatchResultWithPostInfo { @@ -200,6 +202,7 @@ pub mod pallet { /// /// In this transaction, `origin` is just signing the `post` and is not necessarily related /// to any of the participants in the transaction itself. + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::private_transfer())] #[transactional] pub fn private_transfer( @@ -211,6 +214,7 @@ pub mod pallet { } /// Transfers public `asset` from `origin` to the `sink` account. + #[pallet::call_index(3)] #[pallet::weight(T::WeightInfo::public_transfer())] #[transactional] pub fn public_transfer( diff --git a/pallets/tx-pause/src/lib.rs b/pallets/tx-pause/src/lib.rs index 3c2d311c5..91bcef3d4 100644 --- a/pallets/tx-pause/src/lib.rs +++ b/pallets/tx-pause/src/lib.rs @@ -91,6 +91,7 @@ pub mod pallet { impl Pallet { /// Pause an extrinsic by passing the extrinsic and corresponding pallet names. /// Use names as they are written in the source code of the pallet. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::pause_transaction())] #[transactional] pub fn pause_transaction( @@ -122,6 +123,7 @@ pub mod pallet { /// Unpause an extrinsic by passing the extrinsic and corresponding pallet names. /// Use names as they are written in the source code of the pallet. + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::unpause_transaction())] #[transactional] pub fn unpause_transaction( diff --git a/pallets/vesting/src/lib.rs b/pallets/vesting/src/lib.rs index ff8d5f0de..195fb196d 100644 --- a/pallets/vesting/src/lib.rs +++ b/pallets/vesting/src/lib.rs @@ -153,6 +153,7 @@ pub mod pallet { /// Update vesting schedule. /// /// - `new_schedule`: New schedule for vesting. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::update_vesting_schedule())] pub fn update_vesting_schedule( origin: OriginFor, @@ -206,6 +207,7 @@ pub mod pallet { /// locked under this pallet. /// /// Emits either `VestingCompleted` or `VestingUpdated`. + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::vest())] pub fn vest(origin: OriginFor) -> DispatchResult { let who = ensure_signed(origin)?; @@ -226,6 +228,7 @@ pub mod pallet { /// /// - `target`: The account receiving the vested funds. /// - `locked_amount`: How much tokens will be transfered. + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::vested_transfer())] pub fn vested_transfer( origin: OriginFor, From 520cc53a333cd053a1addcdab8bbf7b46d69cf80 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Mon, 1 Aug 2022 10:00:48 +0300 Subject: [PATCH 14/19] Note about temp garandor/polkadot-v0.9.26 branch Signed-off-by: Georgi Zlatarev --- primitives/session-keys/Cargo.toml | 1 + runtime/calamari/Cargo.toml | 1 + runtime/dolphin/Cargo.toml | 1 + 3 files changed, 3 insertions(+) diff --git a/primitives/session-keys/Cargo.toml b/primitives/session-keys/Cargo.toml index 5a15b8da8..c9315ae4f 100644 --- a/primitives/session-keys/Cargo.toml +++ b/primitives/session-keys/Cargo.toml @@ -8,6 +8,7 @@ version = "3.2.1" [dependencies] manta-primitives = { path = "../manta", default-features = false } +# `garabdor/polkadot-v0.9.26` is a temporary branch until the official v0.9.26 Nimbus release. nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "garandor/polkadot-v0.9.26", default-features = false } parity-scale-codec = { version = "3.1.2", default-features = false, features = ["derive"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } diff --git a/runtime/calamari/Cargo.toml b/runtime/calamari/Cargo.toml index 9e2bb270f..eb23bc3fd 100644 --- a/runtime/calamari/Cargo.toml +++ b/runtime/calamari/Cargo.toml @@ -71,6 +71,7 @@ cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git' parachain-info = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } # Nimbus Dependencies +# `garabdor/polkadot-v0.9.26` is a temporary branch until the official v0.9.26 Nimbus release. pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "garandor/polkadot-v0.9.26", default-features = false } # Polkadot dependencies diff --git a/runtime/dolphin/Cargo.toml b/runtime/dolphin/Cargo.toml index cfdb50624..461c47071 100644 --- a/runtime/dolphin/Cargo.toml +++ b/runtime/dolphin/Cargo.toml @@ -72,6 +72,7 @@ cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git' parachain-info = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" } # Nimbus Dependencies +# `garabdor/polkadot-v0.9.26` is a temporary branch until the official v0.9.26 Nimbus release. pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "garandor/polkadot-v0.9.26", default-features = false } # Polkadot dependencies From c9fbcfb3c6544754168933355083ae23ee084f74 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Mon, 1 Aug 2022 10:16:15 +0300 Subject: [PATCH 15/19] Clarification comment on SpendOrigin Signed-off-by: Georgi Zlatarev --- runtime/calamari/src/lib.rs | 9 +++++++-- runtime/dolphin/src/lib.rs | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/runtime/calamari/src/lib.rs b/runtime/calamari/src/lib.rs index b1f913255..99b4a128c 100644 --- a/runtime/calamari/src/lib.rs +++ b/runtime/calamari/src/lib.rs @@ -39,7 +39,10 @@ use sp_version::RuntimeVersion; use frame_support::{ construct_runtime, parameter_types, - traits::{ConstU16, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, PrivilegeCmp}, + traits::{ + ConstU16, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, NeverEnsureOrigin, + PrivilegeCmp, + }, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, ConstantMultiplier, DispatchClass, Weight, @@ -550,7 +553,9 @@ impl pallet_treasury::Config for Runtime { type MaxApprovals = ConstU32<100>; type WeightInfo = weights::pallet_treasury::SubstrateWeight; type SpendFunds = (); - type SpendOrigin = frame_support::traits::NeverEnsureOrigin; + // Expects an implementation of `EnsureOrigin` with a `Success` generic, + // which is the the maximum amount that this origin is allowed to spend at a time. + type SpendOrigin = NeverEnsureOrigin; } parameter_types! { diff --git a/runtime/dolphin/src/lib.rs b/runtime/dolphin/src/lib.rs index 9c178507c..6c1246985 100644 --- a/runtime/dolphin/src/lib.rs +++ b/runtime/dolphin/src/lib.rs @@ -40,7 +40,10 @@ use sp_version::NativeVersion; use frame_support::{ construct_runtime, parameter_types, - traits::{ConstU16, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, PrivilegeCmp}, + traits::{ + ConstU16, ConstU32, ConstU8, Contains, Currency, EitherOfDiverse, NeverEnsureOrigin, + PrivilegeCmp, + }, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, ConstantMultiplier, DispatchClass, Weight, @@ -553,7 +556,9 @@ impl pallet_treasury::Config for Runtime { type MaxApprovals = ConstU32<100>; type WeightInfo = weights::pallet_treasury::SubstrateWeight; type SpendFunds = (); - type SpendOrigin = frame_support::traits::NeverEnsureOrigin; + // Expects an implementation of `EnsureOrigin` with a `Success` generic, + // which is the the maximum amount that this origin is allowed to spend at a time. + type SpendOrigin = NeverEnsureOrigin; } parameter_types! { From fc7469c417f288f190f1059ca8bf9aa80fe6b6a7 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Mon, 1 Aug 2022 10:35:16 +0300 Subject: [PATCH 16/19] Remove unnecessary deps and clean up Signed-off-by: Georgi Zlatarev --- Cargo.lock | 1 - node/Cargo.toml | 1 - node/src/service.rs | 5 +++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 98074ef92..aeb2ac3f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4881,7 +4881,6 @@ dependencies = [ "pallet-transaction-payment-rpc", "parity-scale-codec", "polkadot-cli", - "polkadot-parachain", "polkadot-primitives", "polkadot-service", "sc-basic-authorship", diff --git a/node/Cargo.toml b/node/Cargo.toml index 9924efa49..7cbcab933 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -83,7 +83,6 @@ cumulus-relay-chain-rpc-interface = { git = 'https://github.com/paritytech/cumul # Polkadot dependencies polkadot-cli = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } polkadot-service = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" } xcm = { git = "https://github.com/paritytech/polkadot.git", branch = "release-v0.9.26" } diff --git a/node/src/service.rs b/node/src/service.rs index 1d86e8cd7..220ea0072 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -27,7 +27,8 @@ use cumulus_client_consensus_common::{ use cumulus_client_consensus_relay_chain::Verifier as RelayChainVerifier; use cumulus_client_network::BlockAnnounceValidator; use cumulus_client_service::{ - prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, + prepare_node_config, start_collator, start_full_node, SharedImportQueue, StartCollatorParams, + StartFullNodeParams, }; use cumulus_primitives_core::{ relay_chain::v2::{Hash as PHash, PersistedValidationData}, @@ -323,7 +324,7 @@ where let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); - let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); + let import_queue = SharedImportQueue::new(params.import_queue); let (network, system_rpc_tx, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, From 0585589385ac60ff6bbfaaf6f24d20699c8f5032 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Mon, 1 Aug 2022 22:31:01 +0300 Subject: [PATCH 17/19] Bump scale-infol in pallet-asset-manager Signed-off-by: Georgi Zlatarev --- pallets/asset-manager/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pallets/asset-manager/Cargo.toml b/pallets/asset-manager/Cargo.toml index 32dcc7ceb..0410a5147 100644 --- a/pallets/asset-manager/Cargo.toml +++ b/pallets/asset-manager/Cargo.toml @@ -14,7 +14,7 @@ frame-support = { git = "https://github.com/paritytech/substrate.git", branch = frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } log = { version = "0.4.0", default-features = false } manta-primitives = { path = "../../primitives/manta", default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false } xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } From 6950c65d61c0bce9086183f61665a7c8ea16dc7d Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Mon, 1 Aug 2022 23:03:28 +0300 Subject: [PATCH 18/19] Use vendored ORML.xTokens Signed-off-by: Georgi Zlatarev --- Cargo.lock | 89 ++++++++++++++++++++++++++++---- pallets/asset-manager/Cargo.toml | 2 +- runtime/common/Cargo.toml | 4 +- 3 files changed, 81 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aeb2ac3f0..e28e9cb22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -982,8 +982,8 @@ dependencies = [ "log", "manta-collator-selection", "manta-primitives", - "orml-traits", - "orml-xtokens", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-xtokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", "pallet-asset-manager", "pallet-assets", "pallet-aura", @@ -2372,8 +2372,8 @@ dependencies = [ "log", "manta-collator-selection", "manta-primitives", - "orml-traits", - "orml-xtokens", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-xtokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", "pallet-asset-manager", "pallet-assets", "pallet-aura", @@ -5754,6 +5754,24 @@ dependencies = [ "num-traits", ] +[[package]] +name = "orml-traits" +version = "0.4.1-dev" +source = "git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" +dependencies = [ + "frame-support", + "impl-trait-for-tuples", + "num-traits", + "orml-utilities 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io", + "sp-runtime", + "sp-std", + "xcm", +] + [[package]] name = "orml-traits" version = "0.4.1-dev" @@ -5762,7 +5780,7 @@ dependencies = [ "frame-support", "impl-trait-for-tuples", "num-traits", - "orml-utilities", + "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", "parity-scale-codec", "scale-info", "serde", @@ -5772,6 +5790,20 @@ dependencies = [ "xcm", ] +[[package]] +name = "orml-utilities" +version = "0.4.1-dev" +source = "git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" +dependencies = [ + "frame-support", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "orml-utilities" version = "0.4.1-dev" @@ -5786,13 +5818,27 @@ dependencies = [ "sp-std", ] +[[package]] +name = "orml-xcm-support" +version = "0.4.1-dev" +source = "git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" +dependencies = [ + "frame-support", + "orml-traits 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "parity-scale-codec", + "sp-runtime", + "sp-std", + "xcm", + "xcm-executor", +] + [[package]] name = "orml-xcm-support" version = "0.4.1-dev" source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "frame-support", - "orml-traits", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", "parity-scale-codec", "sp-runtime", "sp-std", @@ -5800,6 +5846,27 @@ dependencies = [ "xcm-executor", ] +[[package]] +name = "orml-xtokens" +version = "0.4.1-dev" +source = "git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "frame-system", + "orml-traits 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-xcm-support 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "pallet-xcm", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io", + "sp-runtime", + "sp-std", + "xcm", + "xcm-executor", +] + [[package]] name = "orml-xtokens" version = "0.4.1-dev" @@ -5808,8 +5875,8 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "orml-traits", - "orml-xcm-support", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-xcm-support 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", "pallet-xcm", "parity-scale-codec", "scale-info", @@ -5845,7 +5912,7 @@ dependencies = [ "frame-system", "log", "manta-primitives", - "orml-traits", + "orml-traits 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", "pallet-assets", "pallet-balances", "parity-scale-codec", @@ -8959,8 +9026,8 @@ dependencies = [ "frame-support", "frame-system", "manta-primitives", - "orml-traits", - "orml-xtokens", + "orml-traits 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-xtokens 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", "pallet-asset-manager", "pallet-assets", "pallet-balances", diff --git a/pallets/asset-manager/Cargo.toml b/pallets/asset-manager/Cargo.toml index 0410a5147..6577da47e 100644 --- a/pallets/asset-manager/Cargo.toml +++ b/pallets/asset-manager/Cargo.toml @@ -20,7 +20,7 @@ sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkad xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } # 3rd party dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" } +orml-traits = { git = "https://github.com/manta-network/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.26" } [dev-dependencies] pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.26" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index b83b0f09f..e58a55b46 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -50,8 +50,8 @@ cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumul parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" } # Orml dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.26" } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.26" } +orml-traits = { git = "https://github.com/manta-network/open-runtime-module-library.git", branch = "polkadot-v0.9.26" } +orml-xtokens = { git = "https://github.com/manta-network/open-runtime-module-library.git", branch = "polkadot-v0.9.26" } # Self dependencies pallet-asset-manager = { path = '../../pallets/asset-manager' } From b293e890c4d115b602a4406b6a9f5dacd46e3c84 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Mon, 1 Aug 2022 23:48:06 +0300 Subject: [PATCH 19/19] Use manta-network fork for orml in general Signed-off-by: Georgi Zlatarev --- Cargo.lock | 89 +++++-------------------------------- runtime/calamari/Cargo.toml | 4 +- runtime/dolphin/Cargo.toml | 4 +- 3 files changed, 15 insertions(+), 82 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e28e9cb22..d0615af16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -982,8 +982,8 @@ dependencies = [ "log", "manta-collator-selection", "manta-primitives", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", - "orml-xtokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-traits", + "orml-xtokens", "pallet-asset-manager", "pallet-assets", "pallet-aura", @@ -2372,8 +2372,8 @@ dependencies = [ "log", "manta-collator-selection", "manta-primitives", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", - "orml-xtokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-traits", + "orml-xtokens", "pallet-asset-manager", "pallet-assets", "pallet-aura", @@ -5762,25 +5762,7 @@ dependencies = [ "frame-support", "impl-trait-for-tuples", "num-traits", - "orml-utilities 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", - "parity-scale-codec", - "scale-info", - "serde", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", -] - -[[package]] -name = "orml-traits" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" -dependencies = [ - "frame-support", - "impl-trait-for-tuples", - "num-traits", - "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-utilities", "parity-scale-codec", "scale-info", "serde", @@ -5804,41 +5786,13 @@ dependencies = [ "sp-std", ] -[[package]] -name = "orml-utilities" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" -dependencies = [ - "frame-support", - "parity-scale-codec", - "scale-info", - "serde", - "sp-io", - "sp-runtime", - "sp-std", -] - [[package]] name = "orml-xcm-support" version = "0.4.1-dev" source = "git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "frame-support", - "orml-traits 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", - "parity-scale-codec", - "sp-runtime", - "sp-std", - "xcm", - "xcm-executor", -] - -[[package]] -name = "orml-xcm-support" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" -dependencies = [ - "frame-support", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-traits", "parity-scale-codec", "sp-runtime", "sp-std", @@ -5854,29 +5808,8 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "orml-traits 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", - "orml-xcm-support 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", - "pallet-xcm", - "parity-scale-codec", - "scale-info", - "serde", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", - "xcm-executor", -] - -[[package]] -name = "orml-xtokens" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" -dependencies = [ - "cumulus-primitives-core", - "frame-support", - "frame-system", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", - "orml-xcm-support 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-traits", + "orml-xcm-support", "pallet-xcm", "parity-scale-codec", "scale-info", @@ -5912,7 +5845,7 @@ dependencies = [ "frame-system", "log", "manta-primitives", - "orml-traits 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-traits", "pallet-assets", "pallet-balances", "parity-scale-codec", @@ -9026,8 +8959,8 @@ dependencies = [ "frame-support", "frame-system", "manta-primitives", - "orml-traits 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", - "orml-xtokens 0.4.1-dev (git+https://github.com/manta-network/open-runtime-module-library.git?branch=polkadot-v0.9.26)", + "orml-traits", + "orml-xtokens", "pallet-asset-manager", "pallet-assets", "pallet-balances", diff --git a/runtime/calamari/Cargo.toml b/runtime/calamari/Cargo.toml index eb23bc3fd..167df8571 100644 --- a/runtime/calamari/Cargo.toml +++ b/runtime/calamari/Cargo.toml @@ -83,8 +83,8 @@ xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', default-feat xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" } # Third party (vendored) dependencies -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } +orml-traits = { git = 'https://github.com/manta-network/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } +orml-xtokens = { git = 'https://github.com/manta-network/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } # Self dependencies calamari-vesting = { path = '../../pallets/vesting', default-features = false } diff --git a/runtime/dolphin/Cargo.toml b/runtime/dolphin/Cargo.toml index 461c47071..ba327094d 100644 --- a/runtime/dolphin/Cargo.toml +++ b/runtime/dolphin/Cargo.toml @@ -94,8 +94,8 @@ runtime-common = { path = '../common', default-features = false } session-key-primitives = { path = '../../primitives/session-keys', default-features = false } # Third party (vendored) dependencies -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } +orml-traits = { git = 'https://github.com/manta-network/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } +orml-xtokens = { git = 'https://github.com/manta-network/open-runtime-module-library.git', default-features = false, branch = "polkadot-v0.9.26" } [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu']