From ead344925506564c7a362c24d32f06220f20bde5 Mon Sep 17 00:00:00 2001 From: Guantong Date: Tue, 7 Feb 2023 22:54:19 +0800 Subject: [PATCH] To `polkadot-v0.9.36` (#213) * Anchor polkadot-v0.9.36 * Companion for paritytech/cumulus#1860 * Companion for paritytech/cumulus#1876 * Companion for paritytech/cumulus#1904 * Companion for paritytech/substrate#12310 * Companion for paritytech/substrate#12740 * Bump array-bytes to 6.0.0 * Companion for paritytech/substrate#12868 * Companion for paritytech/cumulus#1930 * Companion for paritytech/cumulus#1905 * Companion for paritytech/cumulus#1880 * Companion for paritytech/cumulus#1997 * Companion for paritytech/cumulus#1559 * Prepare messages-substrate * Companion for paritytech/substrate#12684 * Companion for paritytech/substrate#12740 * Fix compile paritytech/substrate#12740 * Compile done * Format * Add call index * Compile done * Fix CI * Bump moonbeam * Fix CI * Try fix tests * Use into instead of `Compact` * Patch substrate & Fix compile * Fix try-runtime * Remove parity-util-mem * Format * Format * Opt * Format * Use `codec::Compact` * Format --------- Co-authored-by: Xavier Lau --- Cargo.lock | 1311 +++++++++-------- Cargo.toml | 168 +++ core/inflation/Cargo.toml | 2 +- core/primitives/Cargo.toml | 6 +- node/Cargo.toml | 123 +- node/src/cli.rs | 2 +- node/src/command.rs | 25 +- node/src/service/mod.rs | 87 +- pallet/account-migration/Cargo.toml | 20 +- pallet/account-migration/src/lib.rs | 2 +- pallet/deposit/Cargo.toml | 18 +- pallet/deposit/tests/mock.rs | 6 +- pallet/ecdsa-authority/Cargo.toml | 14 +- pallet/message-gadget/Cargo.toml | 18 +- pallet/message-gadget/src/lib.rs | 1 + pallet/message-transact/Cargo.toml | 34 +- pallet/staking/Cargo.toml | 24 +- pallet/staking/tests/mock.rs | 20 +- precompile/assets/Cargo.toml | 28 +- precompile/assets/src/lib.rs | 20 +- precompile/assets/src/mock.rs | 2 + precompile/assets/src/tests.rs | 311 +++- precompile/bls12-381/Cargo.toml | 22 +- precompile/deposit/Cargo.toml | 24 +- precompile/staking/Cargo.toml | 26 +- precompile/state-storage/Cargo.toml | 24 +- runtime/common/Cargo.toml | 22 +- runtime/common/src/xcm_configs.rs | 2 +- runtime/crab/Cargo.toml | 162 +- runtime/crab/src/lib.rs | 26 +- runtime/crab/src/pallets/assets.rs | 4 + runtime/crab/src/pallets/deposit.rs | 9 +- runtime/crab/src/pallets/staking.rs | 4 +- runtime/crab/src/pallets/system.rs | 7 +- runtime/crab/src/pallets/timestamp.rs | 2 +- runtime/crab/src/weights/block_weights.rs | 6 +- runtime/crab/src/weights/extrinsic_weights.rs | 6 +- runtime/crab/src/weights/paritydb_weights.rs | 12 +- runtime/crab/src/weights/rocksdb_weights.rs | 12 +- runtime/darwinia/Cargo.toml | 162 +- runtime/darwinia/src/lib.rs | 26 +- runtime/darwinia/src/pallets/assets.rs | 4 + runtime/darwinia/src/pallets/deposit.rs | 9 +- runtime/darwinia/src/pallets/staking.rs | 4 +- runtime/darwinia/src/pallets/system.rs | 7 +- runtime/darwinia/src/pallets/timestamp.rs | 2 +- runtime/darwinia/src/weights/block_weights.rs | 6 +- .../darwinia/src/weights/extrinsic_weights.rs | 6 +- .../darwinia/src/weights/paritydb_weights.rs | 12 +- .../darwinia/src/weights/rocksdb_weights.rs | 12 +- runtime/pangolin/Cargo.toml | 162 +- runtime/pangolin/src/lib.rs | 26 +- runtime/pangolin/src/pallets/assets.rs | 4 + runtime/pangolin/src/pallets/deposit.rs | 9 +- runtime/pangolin/src/pallets/staking.rs | 4 +- runtime/pangolin/src/pallets/system.rs | 7 +- runtime/pangolin/src/pallets/timestamp.rs | 2 +- runtime/pangolin/src/weights/block_weights.rs | 6 +- .../pangolin/src/weights/extrinsic_weights.rs | 6 +- .../pangolin/src/weights/paritydb_weights.rs | 12 +- .../pangolin/src/weights/rocksdb_weights.rs | 12 +- 61 files changed, 1770 insertions(+), 1342 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 746ef56a..84ef1b92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,7 +15,7 @@ dependencies = [ [[package]] name = "account" version = "0.1.1" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.33#4ea11a7b2b71e0f4f6d100f5fa04e0f3ea285895" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#f5c98d5612bdb7b6311005f41fc873400d5e1481" dependencies = [ "blake2-rfc", "hex", @@ -325,7 +325,6 @@ dependencies = [ "async-global-executor", "async-io", "async-lock", - "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -342,21 +341,6 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "async-std-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba50e24d9ee0a8950d3d03fc6d0dd10aa14b5de3b101949b4e160f7fee7c723" -dependencies = [ - "async-std", - "async-trait", - "futures-io", - "futures-util", - "pin-utils", - "socket2", - "trust-dns-resolver", -] - [[package]] name = "async-task" version = "4.3.0" @@ -422,20 +406,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom 0.2.8", - "instant", - "pin-project-lite 0.2.9", - "rand 0.8.5", - "tokio", -] - [[package]] name = "backtrace" version = "0.3.67" @@ -505,11 +475,10 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "array-bytes 4.2.0", "async-trait", - "beefy-primitives", "fnv", "futures", "futures-timer", @@ -528,6 +497,7 @@ dependencies = [ "sp-api", "sp-application-crypto", "sp-arithmetic", + "sp-beefy", "sp-blockchain", "sp-consensus", "sp-core", @@ -542,10 +512,9 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "beefy-gadget", - "beefy-primitives", "futures", "jsonrpsee", "log", @@ -554,6 +523,7 @@ dependencies = [ "sc-rpc", "sc-utils", "serde", + "sp-beefy", "sp-core", "sp-runtime", "thiserror", @@ -562,28 +532,11 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" -dependencies = [ - "beefy-primitives", - "sp-api", - "sp-runtime", -] - -[[package]] -name = "beefy-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-mmr-primitives", + "sp-beefy", "sp-runtime", - "sp-std", ] [[package]] @@ -759,7 +712,7 @@ dependencies = [ [[package]] name = "bp-darwinia-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "account", "bp-messages", @@ -776,7 +729,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bp-runtime", "finality-grandpa", @@ -793,7 +746,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bp-runtime", "frame-support", @@ -806,7 +759,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bitvec", "bp-runtime", @@ -823,7 +776,7 @@ dependencies = [ [[package]] name = "bp-parachains" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bp-polkadot-core", "bp-runtime", @@ -836,14 +789,13 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bp-messages", "bp-runtime", "frame-support", "frame-system", "parity-scale-codec", - "parity-util-mem", "scale-info", "serde", "sp-api", @@ -856,7 +808,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "frame-support", "frame-system", @@ -877,7 +829,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -892,7 +844,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bp-header-chain", "bp-message-dispatch", @@ -1313,6 +1265,16 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "cpu-time" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "cpufeatures" version = "0.2.5" @@ -1655,7 +1617,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "clap", "parity-scale-codec", @@ -1670,7 +1632,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1693,7 +1655,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1722,12 +1684,15 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "async-trait", + "cumulus-client-pov-recovery", + "cumulus-primitives-core", "cumulus-relay-chain-interface", "dyn-clone", "futures", + "log", "parity-scale-codec", "polkadot-primitives", "sc-client-api", @@ -1742,7 +1707,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1765,7 +1730,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -1788,19 +1753,24 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", "cumulus-primitives-core", + "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "futures", "parking_lot 0.12.1", "polkadot-primitives", "sc-client-api", "sc-consensus", "sc-service", + "sc-sysinfo", + "sc-telemetry", "sp-api", "sp-blockchain", "sp-consensus", @@ -1811,7 +1781,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "frame-support", "frame-system", @@ -1827,7 +1797,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1844,7 +1814,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -1872,7 +1842,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.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1883,7 +1853,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "frame-benchmarking", "frame-support", @@ -1897,7 +1867,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1913,7 +1883,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -1932,7 +1902,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -1947,7 +1917,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1970,7 +1940,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "cumulus-primitives-core", "futures", @@ -1983,7 +1953,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1999,7 +1969,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2024,7 +1994,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2038,24 +2008,23 @@ dependencies = [ "sp-blockchain", "sp-state-machine", "thiserror", + "tokio", ] [[package]] name = "cumulus-relay-chain-minimal-node" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ - "array-bytes 4.2.0", + "array-bytes 6.0.0", "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures", "lru", - "polkadot-availability-distribution", "polkadot-core-primitives", "polkadot-network-bridge", - "polkadot-node-core-av-store", "polkadot-node-network-protocol", "polkadot-node-subsystem-util", "polkadot-overseer", @@ -2067,8 +2036,6 @@ dependencies = [ "sc-keystore", "sc-network", "sc-network-common", - "sc-network-light", - "sc-network-sync", "sc-service", "sc-telemetry", "sc-tracing", @@ -2087,24 +2054,25 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "async-trait", - "backoff", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures", "futures-timer", "jsonrpsee", + "lru", "parity-scale-codec", "polkadot-service", "sc-client-api", "sc-rpc-api", + "serde", + "serde_json", "sp-api", "sp-authority-discovery", "sp-consensus-babe", "sp-core", - "sp-runtime", "sp-state-machine", "sp-storage", "tokio", @@ -2115,7 +2083,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.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2218,18 +2186,18 @@ dependencies = [ "clap", "crab-runtime", "cumulus-client-cli", + "cumulus-client-collator", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-client-service", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", - "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", - "cumulus-relay-chain-minimal-node", "darwinia-runtime", "dc-primitives", "fc-cli", + "fc-consensus", "fc-db", "fc-mapping-sync", "fc-rpc", @@ -2246,6 +2214,7 @@ dependencies = [ "pangolin-runtime", "parity-scale-codec", "polkadot-cli", + "polkadot-parachain", "polkadot-primitives", "polkadot-service", "sc-basic-authorship", @@ -2255,10 +2224,12 @@ dependencies = [ "sc-consensus", "sc-consensus-aura", "sc-executor", + "sc-keystore", "sc-network", "sc-network-common", "sc-offchain", "sc-rpc", + "sc-rpc-api", "sc-service", "sc-sysinfo", "sc-telemetry", @@ -2272,6 +2243,8 @@ dependencies = [ "sp-consensus", "sp-consensus-aura", "sp-core", + "sp-inherents", + "sp-io", "sp-keystore", "sp-offchain", "sp-runtime", @@ -2711,6 +2684,17 @@ dependencies = [ "syn", ] +[[package]] +name = "derive-syn-parse" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -3276,7 +3260,7 @@ dependencies = [ [[package]] name = "fc-cli" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "clap", "ethereum-types 0.14.1", @@ -3292,10 +3276,29 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "fc-consensus" +version = "2.0.0-dev" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" +dependencies = [ + "async-trait", + "fc-db", + "fp-consensus", + "fp-rpc", + "sc-client-api", + "sc-consensus", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-runtime", + "thiserror", +] + [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "fp-storage", "kvdb-rocksdb", @@ -3314,7 +3317,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "fc-db", "fp-consensus", @@ -3331,7 +3334,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3374,7 +3377,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3507,7 +3510,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", ] @@ -3524,7 +3527,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "ethereum", "parity-scale-codec", @@ -3536,7 +3539,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3551,7 +3554,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "evm", "frame-support", @@ -3564,7 +3567,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -3581,12 +3584,11 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "ethereum", "frame-support", "parity-scale-codec", - "parity-util-mem", "scale-info", "serde", "sp-runtime", @@ -3595,7 +3597,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "parity-scale-codec", "serde", @@ -3610,7 +3612,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "frame-system", @@ -3633,7 +3635,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "Inflector", "array-bytes 4.2.0", @@ -3685,7 +3687,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3696,7 +3698,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3704,6 +3706,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-arithmetic", + "sp-core", "sp-npos-elections", "sp-runtime", "sp-std", @@ -3712,7 +3715,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "frame-system", @@ -3738,10 +3741,29 @@ dependencies = [ "serde", ] +[[package]] +name = "frame-remote-externalities" +version = "0.10.0-dev" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" +dependencies = [ + "env_logger 0.9.3", + "futures", + "log", + "parity-scale-codec", + "serde", + "serde_json", + "sp-core", + "sp-io", + "sp-runtime", + "sp-version", + "substrate-rpc-client", + "tokio", +] + [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "bitflags", "frame-metadata", @@ -3767,16 +3789,18 @@ dependencies = [ "sp-std", "sp-tracing", "sp-weights", + "static_assertions", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "Inflector", "cfg-expr", + "derive-syn-parse", "frame-support-procedural-tools", "itertools", "proc-macro2", @@ -3787,7 +3811,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -3799,7 +3823,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "proc-macro2", "quote", @@ -3809,7 +3833,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "log", @@ -3827,7 +3851,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -3842,7 +3866,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "sp-api", @@ -3851,7 +3875,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "parity-scale-codec", @@ -4307,6 +4331,12 @@ dependencies = [ "pin-project-lite 0.2.9", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "httparse" version = "1.8.0" @@ -4615,24 +4645,23 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" +checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ "jsonrpsee-core", - "jsonrpsee-http-server", "jsonrpsee-proc-macros", + "jsonrpsee-server", "jsonrpsee-types", "jsonrpsee-ws-client", - "jsonrpsee-ws-server", "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74" +checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ "futures-util", "http", @@ -4651,9 +4680,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" +checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" dependencies = [ "anyhow", "arrayvec 0.7.2", @@ -4664,10 +4693,8 @@ dependencies = [ "futures-timer", "futures-util", "globset", - "http", "hyper", "jsonrpsee-types", - "lazy_static", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -4677,45 +4704,48 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-futures", - "unicase", ] [[package]] -name = "jsonrpsee-http-server" -version = "0.15.1" +name = "jsonrpsee-proc-macros" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117" +checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "jsonrpsee-server" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" dependencies = [ "futures-channel", "futures-util", + "http", "hyper", "jsonrpsee-core", "jsonrpsee-types", "serde", "serde_json", + "soketto", "tokio", + "tokio-stream", + "tokio-util", + "tower", "tracing", - "tracing-futures", -] - -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", ] [[package]] name = "jsonrpsee-types" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" +checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" dependencies = [ "anyhow", "beef", @@ -4727,9 +4757,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee5feddd5188e62ac08fcf0e56478138e581509d4730f3f7be9b57dd402a4ff" +checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" dependencies = [ "http", "jsonrpsee-client-transport", @@ -4737,26 +4767,6 @@ dependencies = [ "jsonrpsee-types", ] -[[package]] -name = "jsonrpsee-ws-server" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325" -dependencies = [ - "futures-channel", - "futures-util", - "http", - "jsonrpsee-core", - "jsonrpsee-types", - "serde_json", - "soketto", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "tracing-futures", -] - [[package]] name = "k256" version = "0.11.6" @@ -4780,10 +4790,9 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ - "beefy-primitives", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -4810,13 +4819,13 @@ dependencies = [ "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", "pallet-fast-unstake", - "pallet-gilt", "pallet-grandpa", "pallet-identity", "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-multisig", + "pallet-nis", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", "pallet-nomination-pools-runtime-api", @@ -4854,6 +4863,7 @@ dependencies = [ "sp-api", "sp-arithmetic", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -4877,8 +4887,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "frame-support", "polkadot-primitives", @@ -4900,35 +4910,31 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b" +checksum = "e7d770dcb02bf6835887c3a979b5107a04ff4bbde97a5f0928d27404a155add9" dependencies = [ - "parity-util-mem", "smallvec", ] [[package]] name = "kvdb-memorydb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" +checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parity-util-mem", "parking_lot 0.12.1", ] [[package]] name = "kvdb-rocksdb" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597" +checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844" dependencies = [ "kvdb", - "log", "num_cpus", - "parity-util-mem", "parking_lot 0.12.1", "regex", "rocksdb", @@ -5051,7 +5057,6 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2322c9fb40d99101def6a01612ee30500c89abbbecb6297b3cd252903a4c1720" dependencies = [ - "async-std-resolver", "futures", "libp2p-core", "log", @@ -5115,7 +5120,6 @@ version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "761704e727f7d68d58d7bc2231eafae5fc1b9814de24290f126df09d4bd37a15" dependencies = [ - "async-io", "data-encoding", "dns-parser", "futures", @@ -5126,6 +5130,7 @@ dependencies = [ "rand 0.8.5", "smallvec", "socket2", + "tokio", "void", ] @@ -5254,7 +5259,6 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9839d96761491c6d3e238e70554b856956fca0ab60feb9de2cd08eed4473fa92" dependencies = [ - "async-io", "futures", "futures-timer", "if-watch", @@ -5262,6 +5266,7 @@ dependencies = [ "libp2p-core", "log", "socket2", + "tokio", ] [[package]] @@ -5620,22 +5625,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" +checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" dependencies = [ "hash-db", "hashbrown", - "parity-util-mem", -] - -[[package]] -name = "memory-lru" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce95ae042940bad7e312857b929ee3d11b8f799a80cb7b9c7ec5125516906395" -dependencies = [ - "lru", ] [[package]] @@ -5704,6 +5699,42 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "mmr-gadget" +version = "4.0.0-dev" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" +dependencies = [ + "futures", + "log", + "parity-scale-codec", + "sc-client-api", + "sc-offchain", + "sp-api", + "sp-beefy", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-io", + "sp-mmr-primitives", + "sp-runtime", +] + +[[package]] +name = "mmr-rpc" +version = "4.0.0-dev" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" +dependencies = [ + "anyhow", + "jsonrpsee", + "parity-scale-codec", + "serde", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-mmr-primitives", + "sp-runtime", +] + [[package]] name = "mockall" version = "0.11.3" @@ -6176,7 +6207,7 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.33#dc39cfddefb10ef0de23655e2c3dcdab66a19404" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.36#db0381f6363e0c8e781082b6f552c092b688fb1c" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -6193,7 +6224,7 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.33#dc39cfddefb10ef0de23655e2c3dcdab66a19404" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.36#db0381f6363e0c8e781082b6f552c092b688fb1c" dependencies = [ "frame-support", "parity-scale-codec", @@ -6222,13 +6253,14 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] @@ -6236,7 +6268,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "frame-system", @@ -6252,7 +6284,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "frame-system", @@ -6268,7 +6300,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "frame-system", @@ -6283,7 +6315,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -6307,7 +6339,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6327,7 +6359,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -6342,15 +6374,15 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ - "beefy-primitives", "frame-support", "frame-system", "pallet-session", "parity-scale-codec", "scale-info", "serde", + "sp-beefy", "sp-runtime", "sp-std", ] @@ -6358,11 +6390,10 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "array-bytes 4.2.0", "beefy-merkle-tree", - "beefy-primitives", "frame-support", "frame-system", "log", @@ -6372,6 +6403,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", + "sp-beefy", "sp-core", "sp-io", "sp-runtime", @@ -6381,7 +6413,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -6399,7 +6431,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -6415,7 +6447,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bp-header-chain", "bp-runtime", @@ -6437,7 +6469,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bitvec", "bp-message-dispatch", @@ -6458,7 +6490,7 @@ dependencies = [ [[package]] name = "pallet-bridge-parachains" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bp-parachains", "bp-polkadot-core", @@ -6479,7 +6511,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -6498,7 +6530,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -6515,7 +6547,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "assert_matches", "frame-benchmarking", @@ -6532,7 +6564,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -6550,7 +6582,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6574,7 +6606,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6587,7 +6619,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -6605,7 +6637,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -6632,7 +6664,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "environmental", "evm", @@ -6657,7 +6689,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "fp-evm", ] @@ -6665,7 +6697,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "fp-evm", "sp-core", @@ -6675,7 +6707,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "fp-evm", "frame-support", @@ -6685,7 +6717,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "fp-evm", "num", @@ -6694,7 +6726,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.33#05ee2dbf537bf5bbcbc5b4785be62088034bdd58" +source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v0.9.36#63309df8e9a4b19ab4ceb2fd1a37f7968c111de9" dependencies = [ "fp-evm", "ripemd", @@ -6704,7 +6736,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6722,7 +6754,7 @@ dependencies = [ [[package]] name = "pallet-fee-market" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.33#3c4598428c048b78749ad334a1e134f435984daf" +source = "git+https://github.com/darwinia-network/darwinia-messages-substrate?branch=polkadot-v0.9.36#3cb281ddcd5a85b15da08bc2380f130d69ea2279" dependencies = [ "bp-messages", "bp-runtime", @@ -6738,25 +6770,10 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-gilt" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-arithmetic", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -6779,7 +6796,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6795,7 +6812,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -6815,7 +6832,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -6832,7 +6849,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -6849,9 +6866,8 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ - "ckb-merkle-mountain-range", "frame-benchmarking", "frame-support", "frame-system", @@ -6865,33 +6881,33 @@ dependencies = [ ] [[package]] -name = "pallet-mmr-rpc" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +name = "pallet-multisig" +version = "4.0.0-dev" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ - "anyhow", - "jsonrpsee", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", "parity-scale-codec", - "serde", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-mmr-primitives", + "scale-info", + "sp-io", "sp-runtime", + "sp-std", ] [[package]] -name = "pallet-multisig" +name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "log", "parity-scale-codec", "scale-info", - "sp-io", + "sp-arithmetic", + "sp-core", "sp-runtime", "sp-std", ] @@ -6899,7 +6915,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "frame-system", @@ -6916,7 +6932,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6936,7 +6952,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "sp-api", @@ -6946,7 +6962,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "frame-system", @@ -6963,7 +6979,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6986,7 +7002,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7003,7 +7019,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7018,7 +7034,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7036,7 +7052,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7051,12 +7067,13 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "assert_matches", "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "serde", @@ -7069,7 +7086,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7080,12 +7097,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "frame-system", @@ -7106,7 +7124,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7122,7 +7140,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "frame-system", @@ -7136,7 +7154,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7159,7 +7177,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7170,7 +7188,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "log", "sp-arithmetic", @@ -7179,7 +7197,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7196,7 +7214,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "frame-system", @@ -7210,7 +7228,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7228,7 +7246,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7247,7 +7265,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-support", "frame-system", @@ -7263,7 +7281,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -7279,7 +7297,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -7291,7 +7309,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7308,7 +7326,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7324,7 +7342,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7339,7 +7357,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-benchmarking", "frame-support", @@ -7353,8 +7371,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "frame-support", "frame-system", @@ -7371,8 +7389,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "frame-benchmarking", "frame-support", @@ -7492,7 +7510,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.36#afe528af891f464b318293f183f6d3eefbc979b0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -7553,35 +7571,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parity-util-mem" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" -dependencies = [ - "cfg-if", - "ethereum-types 0.14.1", - "hashbrown", - "impl-trait-for-tuples", - "lru", - "parity-util-mem-derive", - "parking_lot 0.12.1", - "primitive-types 0.12.1", - "smallvec", - "winapi", -] - -[[package]] -name = "parity-util-mem-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" -dependencies = [ - "proc-macro2", - "syn", - "synstructure", -] - [[package]] name = "parity-wasm" version = "0.45.0" @@ -7800,8 +7789,8 @@ checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] name = "polkadot-approval-distribution" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "futures", "polkadot-node-network-protocol", @@ -7815,8 +7804,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "futures", "polkadot-node-network-protocol", @@ -7829,8 +7818,8 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "derive_more", "fatality", @@ -7852,8 +7841,8 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "fatality", "futures", @@ -7873,8 +7862,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "clap", "frame-benchmarking-cli", @@ -7886,12 +7875,13 @@ dependencies = [ "polkadot-performance-test", "polkadot-service", "sc-cli", + "sc-executor", "sc-service", "sc-sysinfo", "sc-tracing", "sp-core", + "sp-io", "sp-keyring", - "sp-trie", "substrate-build-script-utils", "thiserror", "try-runtime-cli", @@ -7899,14 +7889,15 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ - "beefy-primitives", + "async-trait", "frame-benchmarking", "frame-benchmarking-cli", "frame-system", "frame-system-rpc-runtime-api", + "futures", "kusama-runtime", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -7922,6 +7913,7 @@ dependencies = [ "sc-service", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-blockchain", "sp-consensus", @@ -7941,8 +7933,8 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "always-assert", "bitvec", @@ -7963,11 +7955,10 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "parity-scale-codec", - "parity-util-mem", "scale-info", "sp-core", "sp-runtime", @@ -7976,8 +7967,8 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "derive_more", "fatality", @@ -8001,8 +7992,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -8015,8 +8006,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "futures", "futures-timer", @@ -8035,8 +8026,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "always-assert", "async-trait", @@ -8059,8 +8050,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "futures", "parity-scale-codec", @@ -8077,8 +8068,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "bitvec", "derive_more", @@ -8106,8 +8097,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "bitvec", "futures", @@ -8126,8 +8117,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "bitvec", "fatality", @@ -8145,8 +8136,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "futures", "polkadot-node-subsystem", @@ -8160,8 +8151,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "async-trait", "futures", @@ -8179,8 +8170,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "futures", "polkadot-node-subsystem", @@ -8194,8 +8185,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "futures", "futures-timer", @@ -8211,8 +8202,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "fatality", "futures", @@ -8230,13 +8221,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "async-trait", "futures", "futures-timer", "polkadot-node-subsystem", + "polkadot-overseer", "polkadot-primitives", "sp-blockchain", "sp-inherents", @@ -8247,8 +8239,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "bitvec", "fatality", @@ -8265,13 +8257,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "always-assert", "assert_matches", "async-process", "async-std", + "cpu-time", "futures", "futures-timer", "parity-scale-codec", @@ -8297,8 +8290,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "futures", "polkadot-node-primitives", @@ -8313,12 +8306,11 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "futures", - "memory-lru", - "parity-util-mem", + "lru", "polkadot-node-subsystem", "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", @@ -8329,10 +8321,9 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ - "async-std", "lazy_static", "log", "mick-jaeger", @@ -8343,12 +8334,13 @@ dependencies = [ "sc-network", "sp-core", "thiserror", + "tokio", ] [[package]] name = "polkadot-node-metrics" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "bs58", "futures", @@ -8366,8 +8358,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "async-trait", "derive_more", @@ -8389,8 +8381,8 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "bounded-vec", "futures", @@ -8411,8 +8403,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -8421,8 +8413,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "async-trait", "derive_more", @@ -8444,8 +8436,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "async-trait", "derive_more", @@ -8456,7 +8448,6 @@ dependencies = [ "lru", "parity-db", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.11.2", "pin-project", "polkadot-node-jaeger", @@ -8477,15 +8468,14 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "async-trait", "futures", "futures-timer", "lru", "orchestra", - "parity-util-mem", "parking_lot 0.12.1", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -8495,18 +8485,18 @@ dependencies = [ "sc-client-api", "sp-api", "sp-core", + "tikv-jemalloc-ctl", "tracing-gum", ] [[package]] name = "polkadot-parachain" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "derive_more", "frame-support", "parity-scale-codec", - "parity-util-mem", "polkadot-core-primitives", "scale-info", "serde", @@ -8517,8 +8507,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "env_logger 0.9.3", "kusama-runtime", @@ -8532,13 +8522,12 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "bitvec", "hex-literal", "parity-scale-codec", - "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", "scale-info", @@ -8559,13 +8548,13 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", "jsonrpsee", - "pallet-mmr-rpc", + "mmr-rpc", "pallet-transaction-payment-rpc", "polkadot-primitives", "sc-chain-spec", @@ -8591,10 +8580,9 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ - "beefy-primitives", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -8657,6 +8645,7 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -8680,10 +8669,9 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ - "beefy-primitives", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -8714,6 +8702,7 @@ dependencies = [ "serde_derive", "slot-range-helper", "sp-api", + "sp-beefy", "sp-core", "sp-inherents", "sp-io", @@ -8728,8 +8717,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "frame-support", "polkadot-primitives", @@ -8742,8 +8731,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "bs58", "parity-scale-codec", @@ -8754,8 +8743,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "bitflags", "bitvec", @@ -8797,12 +8786,11 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "async-trait", "beefy-gadget", - "beefy-primitives", "frame-support", "frame-system-rpc-runtime-api", "futures", @@ -8812,6 +8800,7 @@ dependencies = [ "kvdb", "kvdb-rocksdb", "lru", + "mmr-gadget", "pallet-babe", "pallet-im-online", "pallet-staking", @@ -8878,6 +8867,7 @@ dependencies = [ "serde_json", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-blockchain", "sp-consensus", @@ -8887,6 +8877,7 @@ dependencies = [ "sp-inherents", "sp-io", "sp-keystore", + "sp-mmr-primitives", "sp-offchain", "sp-runtime", "sp-session", @@ -8903,8 +8894,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -8924,8 +8915,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -8978,7 +8969,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precompile-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.33#4ea11a7b2b71e0f4f6d100f5fa04e0f3ea285895" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#f5c98d5612bdb7b6311005f41fc873400d5e1481" dependencies = [ "affix", "derive_more", @@ -9008,7 +8999,7 @@ dependencies = [ [[package]] name = "precompile-utils-macro" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.33#4ea11a7b2b71e0f4f6d100f5fa04e0f3ea285895" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#f5c98d5612bdb7b6311005f41fc873400d5e1481" dependencies = [ "case", "num_enum", @@ -9518,23 +9509,6 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" -[[package]] -name = "remote-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" -dependencies = [ - "env_logger 0.9.3", - "log", - "parity-scale-codec", - "serde", - "serde_json", - "sp-core", - "sp-io", - "sp-runtime", - "sp-version", - "substrate-rpc-client", -] - [[package]] name = "remove_dir_all" version = "0.5.3" @@ -9623,11 +9597,10 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "beefy-merkle-tree", - "beefy-primitives", "frame-benchmarking", "frame-executive", "frame-support", @@ -9647,7 +9620,6 @@ dependencies = [ "pallet-collective", "pallet-democracy", "pallet-elections-phragmen", - "pallet-gilt", "pallet-grandpa", "pallet-identity", "pallet-im-online", @@ -9655,6 +9627,7 @@ dependencies = [ "pallet-membership", "pallet-mmr", "pallet-multisig", + "pallet-nis", "pallet-offences", "pallet-preimage", "pallet-proxy", @@ -9686,6 +9659,7 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -9708,8 +9682,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "frame-support", "polkadot-primitives", @@ -9879,7 +9853,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "log", "sp-core", @@ -9890,7 +9864,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "futures", @@ -9917,7 +9891,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "futures", "futures-timer", @@ -9940,7 +9914,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9956,7 +9930,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "impl-trait-for-tuples", "memmap2", @@ -9973,7 +9947,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9984,7 +9958,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "array-bytes 4.2.0", "chrono", @@ -10024,7 +9998,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "fnv", "futures", @@ -10052,7 +10026,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "hash-db", "kvdb", @@ -10077,13 +10051,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "futures", "futures-timer", "libp2p", "log", + "mockall", "parking_lot 0.12.1", "sc-client-api", "sc-utils", @@ -10101,7 +10076,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "futures", @@ -10130,7 +10105,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "fork-tree", @@ -10171,7 +10146,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "futures", "jsonrpsee", @@ -10193,7 +10168,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "fork-tree", "parity-scale-codec", @@ -10206,7 +10181,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "futures", @@ -10230,9 +10205,8 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ - "lazy_static", "lru", "parity-scale-codec", "parking_lot 0.12.1", @@ -10241,7 +10215,6 @@ dependencies = [ "sc-executor-wasmtime", "sp-api", "sp-core", - "sp-core-hashing-proc-macro", "sp-externalities", "sp-io", "sp-panic-handler", @@ -10256,13 +10229,10 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ - "environmental", - "parity-scale-codec", "sc-allocator", "sp-maybe-compressed-blob", - "sp-sandbox", "sp-wasm-interface", "thiserror", "wasm-instrument", @@ -10272,14 +10242,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "log", - "parity-scale-codec", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmi", ] @@ -10287,19 +10255,16 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "cfg-if", "libc", "log", "once_cell", - "parity-scale-codec", - "parity-wasm", "rustix 0.35.13", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmtime", ] @@ -10307,7 +10272,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "ahash", "array-bytes 4.2.0", @@ -10348,7 +10313,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "finality-grandpa", "futures", @@ -10369,13 +10334,12 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "ansi_term", "futures", "futures-timer", "log", - "parity-util-mem", "sc-client-api", "sc-network-common", "sc-transaction-pool-api", @@ -10386,7 +10350,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -10401,7 +10365,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -10448,7 +10412,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "cid", "futures", @@ -10468,7 +10432,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "bitflags", @@ -10494,7 +10458,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "ahash", "futures", @@ -10512,7 +10476,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "array-bytes 4.2.0", "futures", @@ -10533,9 +10497,10 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "array-bytes 4.2.0", + "async-trait", "fork-tree", "futures", "libp2p", @@ -10557,13 +10522,14 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "array-bytes 4.2.0", "futures", @@ -10582,7 +10548,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "array-bytes 4.2.0", "bytes", @@ -10612,7 +10578,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "futures", "libp2p", @@ -10625,7 +10591,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10634,7 +10600,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "futures", "hash-db", @@ -10664,7 +10630,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "futures", "jsonrpsee", @@ -10687,20 +10653,23 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "futures", + "http", "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", "tokio", + "tower", + "tower-http", ] [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "futures", "hex", @@ -10719,7 +10688,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "directories", @@ -10730,7 +10699,6 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "pin-project", "rand 0.7.3", @@ -10790,12 +10758,10 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "log", "parity-scale-codec", - "parity-util-mem", - "parity-util-mem-derive", "parking_lot 0.12.1", "sc-client-api", "sp-core", @@ -10804,7 +10770,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10823,7 +10789,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "futures", "libc", @@ -10842,7 +10808,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "chrono", "futures", @@ -10860,7 +10826,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "ansi_term", "atty", @@ -10891,7 +10857,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10902,7 +10868,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "futures", @@ -10910,7 +10876,6 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", @@ -10929,7 +10894,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "futures", @@ -10943,7 +10908,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "futures", "futures-timer", @@ -11333,8 +11298,8 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slot-range-helper" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "enumn", "parity-scale-codec", @@ -11401,6 +11366,7 @@ dependencies = [ "bytes", "flate2", "futures", + "http", "httparse", "log", "rand 0.8.5", @@ -11410,7 +11376,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "hash-db", "log", @@ -11428,7 +11394,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "blake2", "proc-macro-crate", @@ -11439,8 +11405,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "scale-info", @@ -11452,8 +11418,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "6.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "integer-sqrt", "num-traits", @@ -11468,7 +11434,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "scale-info", @@ -11481,7 +11447,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "parity-scale-codec", @@ -11490,10 +11456,27 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-beefy" +version = "4.0.0-dev" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-mmr-primitives", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "sp-api", @@ -11505,7 +11488,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "futures", "log", @@ -11523,7 +11506,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "futures", @@ -11542,7 +11525,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "parity-scale-codec", @@ -11560,7 +11543,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "merlin", @@ -11583,7 +11566,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "scale-info", @@ -11597,7 +11580,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "scale-info", @@ -11609,8 +11592,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "array-bytes 4.2.0", "base58", @@ -11654,8 +11637,8 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "5.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "blake2", "byteorder", @@ -11669,7 +11652,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "proc-macro2", "quote", @@ -11680,7 +11663,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -11688,8 +11671,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "5.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "proc-macro2", "quote", @@ -11698,8 +11681,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "0.13.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "environmental", "parity-scale-codec", @@ -11710,7 +11693,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "finality-grandpa", "log", @@ -11728,7 +11711,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -11741,10 +11724,11 @@ dependencies = [ [[package]] name = "sp-io" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "bytes", + "ed25519-dalek", "futures", "hash-db", "libsecp256k1 0.7.1", @@ -11767,8 +11751,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "lazy_static", "sp-core", @@ -11778,8 +11762,8 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "0.13.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "futures", @@ -11796,7 +11780,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "thiserror", "zstd", @@ -11805,8 +11789,9 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ + "ckb-merkle-mountain-range", "log", "parity-scale-codec", "scale-info", @@ -11822,7 +11807,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "scale-info", @@ -11836,7 +11821,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "sp-api", "sp-core", @@ -11845,8 +11830,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "5.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "backtrace", "lazy_static", @@ -11856,7 +11841,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "rustc-hash", "serde", @@ -11865,15 +11850,14 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", "parity-scale-codec", - "parity-util-mem", "paste", "rand 0.7.3", "scale-info", @@ -11888,8 +11872,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -11906,8 +11890,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "6.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "Inflector", "proc-macro-crate", @@ -11916,24 +11900,10 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-sandbox" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" -dependencies = [ - "log", - "parity-scale-codec", - "sp-core", - "sp-io", - "sp-std", - "sp-wasm-interface", - "wasmi", -] - [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "scale-info", @@ -11947,18 +11917,19 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] [[package]] name = "sp-state-machine" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "0.13.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "hash-db", "log", @@ -11979,13 +11950,13 @@ dependencies = [ [[package]] name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "5.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" [[package]] name = "sp-storage" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -11998,7 +11969,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "futures-timer", @@ -12013,8 +11984,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "6.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "sp-std", @@ -12026,7 +11997,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "sp-api", "sp-runtime", @@ -12035,7 +12006,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "log", @@ -12050,8 +12021,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "ahash", "hash-db", @@ -12074,7 +12045,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -12091,7 +12062,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -12101,8 +12072,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "impl-trait-for-tuples", "log", @@ -12115,7 +12086,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -12294,7 +12265,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "platforms 2.0.0", ] @@ -12313,7 +12284,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -12334,7 +12305,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "futures-util", "hyper", @@ -12347,7 +12318,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "async-trait", "jsonrpsee", @@ -12360,7 +12331,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "jsonrpsee", "log", @@ -12381,7 +12352,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "ansi_term", "build-helper", @@ -12543,6 +12514,17 @@ dependencies = [ "threadpool", ] +[[package]] +name = "tikv-jemalloc-ctl" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" +dependencies = [ + "libc", + "paste", + "tikv-jemalloc-sys", +] + [[package]] name = "tikv-jemalloc-sys" version = "0.5.2+5.3.0-patched" @@ -12702,6 +12684,41 @@ dependencies = [ "toml_datetime", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite 0.2.9", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -12715,6 +12732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", @@ -12753,8 +12771,8 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -12764,8 +12782,8 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -12870,6 +12888,7 @@ dependencies = [ "smallvec", "thiserror", "tinyvec", + "tokio", "tracing", "url", ] @@ -12889,6 +12908,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", + "tokio", "tracing", "trust-dns-proto", ] @@ -12902,22 +12922,26 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/darwinia-network/substrate?branch=polkadot-v0.9.36#d6d80979da7b176bede2974f91259fbf80710003" dependencies = [ "clap", + "frame-remote-externalities", "frame-try-runtime", + "hex", "log", "parity-scale-codec", - "remote-externalities", "sc-chain-spec", "sc-cli", "sc-executor", "sc-service", "serde", + "sp-api", "sp-core", + "sp-debug-derive", "sp-externalities", "sp-io", "sp-keystore", + "sp-rpc", "sp-runtime", "sp-state-machine", "sp-version", @@ -12977,15 +13001,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.10" @@ -13526,10 +13541,9 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ - "beefy-primitives", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -13593,6 +13607,7 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -13616,8 +13631,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "frame-support", "polkadot-primitives", @@ -13850,8 +13865,8 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -13864,8 +13879,8 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "frame-support", "frame-system", @@ -13884,8 +13899,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "frame-benchmarking", "frame-support", @@ -13903,7 +13918,7 @@ dependencies = [ [[package]] name = "xcm-primitives" version = "0.1.0" -source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.33#4ea11a7b2b71e0f4f6d100f5fa04e0f3ea285895" +source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v0.9.36#f5c98d5612bdb7b6311005f41fc873400d5e1481" dependencies = [ "ethereum", "ethereum-types 0.14.1", @@ -13926,8 +13941,8 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" dependencies = [ "Inflector", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 69296e14..1310fe08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,3 +9,171 @@ members = [ "precompile/*", "runtime/*", ] + +[patch."https://github.com/paritytech/substrate"] +beefy-gadget = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +beefy-gadget-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +beefy-merkle-tree = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-benchmarking-cli = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-election-provider-solution-type = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-election-provider-support = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-executive = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-support = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-support-procedural = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-support-procedural-tools = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-support-procedural-tools-derive = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-system-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-system-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +frame-try-runtime = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +mmr-gadget = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +mmr-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-assets = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-aura = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-authority-discovery = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-authorship = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-babe = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-bags-list = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-beefy = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-beefy-mmr = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-bounties = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-child-bounties = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-collective = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-conviction-voting = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-democracy = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-election-provider-multi-phase = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-election-provider-support-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-elections-phragmen = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-fast-unstake = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-grandpa = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-identity = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-im-online = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-indices = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-membership = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-mmr = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-multisig = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-nis = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-nomination-pools = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-nomination-pools-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-nomination-pools-runtime-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-offences = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-offences-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-preimage = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-proxy = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-ranked-collective = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-recovery = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-referenda = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-scheduler = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-session = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-session-benchmarking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-society = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-staking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-staking-reward-curve = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-staking-reward-fn = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-state-trie-migration = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-sudo = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-tips = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-treasury = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-utility = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-vesting = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +pallet-whitelist = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-allocator = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-authority-discovery = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-basic-authorship = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-block-builder = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-chain-spec = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-chain-spec-derive = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-cli = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-client-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-client-db = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-consensus = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-aura = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-babe-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-slots = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-executor = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-executor-common = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-executor-wasmi = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-executor-wasmtime = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-finality-grandpa = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-finality-grandpa-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-informant = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-keystore = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-network = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-network-common = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-network-gossip = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-offchain = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-peerset = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-proposer-metrics = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-rpc-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-rpc-server = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-service = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-state-db = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-sync-state-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-sysinfo = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-telemetry = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-tracing = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-tracing-proc-macro = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-transaction-pool = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-transaction-pool-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sc-utils = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-api = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-api-proc-macro = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-application-crypto = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-arithmetic = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-authority-discovery = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-beefy = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-block-builder = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-blockchain = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-consensus = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-aura = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-slots = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-vrf = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-database = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-debug-derive = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-externalities = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-finality-grandpa = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-inherents = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-keyring = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-keystore = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-maybe-compressed-blob = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-mmr-primitives = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-npos-elections = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-offchain = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-panic-handler = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-runtime-interface = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-runtime-interface-proc-macro = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-session = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-staking = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-state-machine = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-storage = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-timestamp = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-tracing = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-transaction-storage-proof = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-trie = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-version = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-version-proc-macro = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-wasm-interface = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +sp-weights = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +substrate-build-script-utils = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +substrate-frame-rpc-system = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +substrate-prometheus-endpoint = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +substrate-rpc-client = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +substrate-state-trie-migration-rpc = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +substrate-wasm-builder = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } +try-runtime-cli = { git = "https://github.com/darwinia-network/substrate", branch = "polkadot-v0.9.36" } diff --git a/core/inflation/Cargo.toml b/core/inflation/Cargo.toml index e9144376..fab9422d 100644 --- a/core/inflation/Cargo.toml +++ b/core/inflation/Cargo.toml @@ -20,7 +20,7 @@ dc-types = { path = "../types" } substrate-fixed = { default-features = false, git = "https://github.com/encointer/substrate-fixed" } [dev-dependencies] -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/core/primitives/Cargo.toml b/core/primitives/Cargo.toml index cb9fd066..06bfcfe0 100644 --- a/core/primitives/Cargo.toml +++ b/core/primitives/Cargo.toml @@ -14,11 +14,11 @@ version = "6.0.0" dc-types = { path = "../types" } # moonbeam -account = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } +account = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } # substrate -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/node/Cargo.toml b/node/Cargo.toml index f9d49648..d2f62282 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/darwinia-network/darwinia" version = "6.0.0" [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dependencies] # crates.io @@ -19,21 +19,20 @@ async-trait = { version = "0.1" } clap = { version = "4.0", features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.3" } futures = { version = "0.3" } -jsonrpsee = { version = "0.15", features = ["server"] } +jsonrpsee = { version = "0.16", features = ["server"] } log = { version = "0.4" } serde = { version = "1.0", features = ["derive"] } # cumulus -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } +cumulus-client-collator = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } # darwinia crab-runtime = { path = "../runtime/crab" } @@ -42,57 +41,63 @@ dc-primitives = { path = "../core/primitives" } pangolin-runtime = { path = "../runtime/pangolin" } # frontier -fc-cli = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -fc-db = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -fc-mapping-sync = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -fc-rpc = { features = ["rpc_binary_search_estimate"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -fc-rpc-core = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -fp-evm = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -fp-rpc = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -fp-storage = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +fc-cli = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fc-consensus = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fc-db = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fc-mapping-sync = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fc-rpc = { features = ["rpc_binary_search_estimate"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fc-rpc-core = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fp-evm = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fp-rpc = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fp-storage = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # polkadot -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } # substrate -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-cli = { features = ["wasmtime"], git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-executor = { features = ["wasmtime"], git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-service = { features = ["wasmtime"], git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", optional = true} +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true} [features] default = [] diff --git a/node/src/cli.rs b/node/src/cli.rs index 809159be..428092f1 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -55,7 +55,7 @@ pub enum Subcommand { /// Sub-commands concerned with benchmarking. /// The pallet benchmarking moved to the `pallet` sub-command. #[command(subcommand)] - Benchmark(frame_benchmarking_cli::BenchmarkCmd), + Benchmark(Box), /// Try some testing command against a specified runtime state. #[cfg(feature = "try-runtime")] diff --git a/node/src/command.rs b/node/src/command.rs index 3692eb7a..19aa62e4 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -450,10 +450,10 @@ pub fn run() -> Result<()> { }) }, Some(Subcommand::Benchmark(cmd)) => { - let runner = cli.create_runner(cmd)?; + let runner = cli.create_runner(&**cmd)?; // Switch on the concrete benchmark sub-command- - match cmd { + match &**cmd { BenchmarkCmd::Pallet(cmd) => if cfg!(feature = "runtime-benchmarks") { runner.sync_run(|config| { @@ -504,22 +504,29 @@ pub fn run() -> Result<()> { let chain_spec = &runner.config().chain_spec; set_default_ss58_version(chain_spec); + + use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch}; + type HostFunctionsOf = ExtendedHostFunctions< + sp_io::SubstrateHostFunctions, + ::ExtendHostFunctions, + >; + // grab the task manager. let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry); let task_manager = TaskManager::new(runner.config().tokio_handle.clone(), *registry) .map_err(|e| format!("Error: {:?}", e))?; if chain_spec.is_crab() { - runner.async_run(|config| { - Ok((cmd.run::(config), task_manager)) + runner.async_run(|_| { + Ok((cmd.run::>(), task_manager)) }) } else if chain_spec.is_pangolin() { - runner.async_run(|config| { - Ok((cmd.run::(config), task_manager)) + runner.async_run(|_| { + Ok((cmd.run::>(), task_manager)) }) } else { - runner.async_run(|config| { - Ok((cmd.run::(config), task_manager)) + runner.async_run(|_| { + Ok((cmd.run::>(), task_manager)) }) } }, @@ -570,7 +577,7 @@ pub fn run() -> Result<()> { if config.role.is_authority() { "yes" } else { "no" } ); - if collator_options.relay_chain_rpc_url.is_some() && !cli.relay_chain_args.is_empty() { + if !collator_options.relay_chain_rpc_urls.is_empty() && !cli.relay_chain_args.is_empty() { log::warn!("Detected relay chain node arguments together with --relay-chain-rpc-url. This command starts a minimal Polkadot node that only uses a network-related subset of all relay chain CLI options."); } diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs index 3b19fd8e..d50bc381 100644 --- a/node/src/service/mod.rs +++ b/node/src/service/mod.rs @@ -38,6 +38,7 @@ use crate::frontier_service; use darwinia_runtime::AuraId; use dc_primitives::*; // substrate +use sc_consensus::ImportQueue; use sc_network_common::service::NetworkBlock; use sp_core::Pair; use sp_runtime::app_crypto::AppKey; @@ -46,7 +47,11 @@ type FullBackend = sc_service::TFullBackend; type FullClient = sc_service::TFullClient>; type ParachainBlockImport = - cumulus_client_consensus_common::ParachainBlockImport>>; + cumulus_client_consensus_common::ParachainBlockImport< + Block, + Arc>, + FullBackend, + >; /// Can be called for a `Configuration` to check if it is a configuration for the `Crab` network. pub trait IdentifyVariant { @@ -176,7 +181,7 @@ where client.clone(), ); - let block_import = ParachainBlockImport::new(client.clone()); + let block_import = ParachainBlockImport::new(client.clone(), backend.clone()); let import_queue = parachain_build_import_queue( client.clone(), @@ -215,35 +220,6 @@ where }) } -async fn build_relay_chain_interface( - polkadot_config: sc_service::Configuration, - parachain_config: &sc_service::Configuration, - telemetry_worker_handle: Option, - task_manager: &mut sc_service::TaskManager, - collator_options: cumulus_client_cli::CollatorOptions, - hwbench: Option, -) -> cumulus_relay_chain_interface::RelayChainResult<( - Arc<(dyn 'static + cumulus_relay_chain_interface::RelayChainInterface)>, - Option, -)> { - match collator_options.relay_chain_rpc_url { - Some(relay_chain_url) => - cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node( - polkadot_config, - task_manager, - relay_chain_url, - ) - .await, - None => cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain( - polkadot_config, - parachain_config, - telemetry_worker_handle, - task_manager, - hwbench, - ), - } -} - /// Start a node with the given parachain `Configuration` and relay chain `Configuration`. /// /// This is the actual implementation that is abstract over the executor and the runtime api. @@ -307,21 +283,22 @@ where ), } = new_partial::(¶chain_config, eth_rpc_config)?; - let (relay_chain_interface, collator_key) = build_relay_chain_interface( - polkadot_config, - ¶chain_config, - telemetry_worker_handle, - &mut task_manager, - collator_options.clone(), - hwbench.clone(), - ) - .await - .map_err(|e| match e { - cumulus_relay_chain_interface::RelayChainError::ServiceError( - polkadot_service::Error::Sub(x), - ) => x, - s => s.to_string().into(), - })?; + let (relay_chain_interface, collator_key) = + cumulus_client_service::build_relay_chain_interface( + polkadot_config, + ¶chain_config, + telemetry_worker_handle, + &mut task_manager, + collator_options.clone(), + hwbench.clone(), + ) + .await + .map_err(|e| match e { + cumulus_relay_chain_interface::RelayChainError::ServiceError( + polkadot_service::Error::Sub(x), + ) => x, + s => s.to_string().into(), + })?; let block_announce_validator = cumulus_client_network::BlockAnnounceValidator::new(relay_chain_interface.clone(), para_id); @@ -329,7 +306,7 @@ where let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); - let import_queue = cumulus_client_service::SharedImportQueue::new(import_queue); + let import_queue_service = import_queue.service(); let (network, system_rpc_tx, tx_handler_controller, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { @@ -337,12 +314,22 @@ where client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), - import_queue: import_queue.clone(), + import_queue, block_announce_validator_builder: Some(Box::new(|_| { Box::new(block_announce_validator) })), warp_sync: None, })?; + + if parachain_config.offchain_worker.enabled { + sc_service::build_offchain_workers( + ¶chain_config, + task_manager.spawn_handle(), + client.clone(), + network.clone(), + ); + } + let overrides = frontier_service::overrides_handle(client.clone()); let block_data_cache = Arc::new(fc_rpc::EthBlockDataCacheTask::new( task_manager.spawn_handle(), @@ -452,7 +439,7 @@ where relay_chain_interface, spawner, parachain_consensus, - import_queue, + import_queue: import_queue_service, collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, }; @@ -466,7 +453,7 @@ where para_id, relay_chain_interface, relay_chain_slot_duration, - import_queue, + import_queue: import_queue_service, }; cumulus_client_service::start_full_node(params)?; diff --git a/pallet/account-migration/Cargo.toml b/pallet/account-migration/Cargo.toml index 203adcc3..fef26a18 100644 --- a/pallet/account-migration/Cargo.toml +++ b/pallet/account-migration/Cargo.toml @@ -21,18 +21,18 @@ darwinia-staking = { default-features = false, path = "../staking" } dc-primitives = { default-features = false, path = "../../core/primitives" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-identity = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-identity = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/pallet/account-migration/src/lib.rs b/pallet/account-migration/src/lib.rs index 8dcb6974..b587517e 100644 --- a/pallet/account-migration/src/lib.rs +++ b/pallet/account-migration/src/lib.rs @@ -252,7 +252,7 @@ pub mod pallet { if amount >= sum { >::transfer( RawOrigin::Signed(to).into(), - KTON_ID, + KTON_ID.into(), staking_pot, sum, )?; diff --git a/pallet/deposit/Cargo.toml b/pallet/deposit/Cargo.toml index 55ee4d13..194a6c8d 100644 --- a/pallet/deposit/Cargo.toml +++ b/pallet/deposit/Cargo.toml @@ -20,18 +20,18 @@ dc-inflation = { default-features = false, path = "../../core/inflation" } dc-types = { path = "../../core/types" } # subtrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] # substrate -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/pallet/deposit/tests/mock.rs b/pallet/deposit/tests/mock.rs index 48fdb0e9..a28aea9c 100644 --- a/pallet/deposit/tests/mock.rs +++ b/pallet/deposit/tests/mock.rs @@ -73,6 +73,7 @@ impl pallet_assets::Config for Runtime { type AssetAccountDeposit = (); type AssetDeposit = (); type AssetId = AssetId; + type AssetIdParameter = codec::Compact; type Balance = Balance; type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg< frame_system::EnsureSignedBy, u32>, @@ -83,6 +84,7 @@ impl pallet_assets::Config for Runtime { type Freezer = (); type MetadataDepositBase = (); type MetadataDepositPerByte = (); + type RemoveItemsLimit = (); type RuntimeEvent = RuntimeEvent; type StringLimit = frame_support::traits::ConstU32<4>; type WeightInfo = (); @@ -93,7 +95,7 @@ impl darwinia_deposit::SimpleAsset for KtonAsset { type AccountId = u32; fn mint(beneficiary: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult { - Assets::mint(RuntimeOrigin::signed(0), 0, *beneficiary, amount) + Assets::mint(RuntimeOrigin::signed(0), 0.into(), *beneficiary, amount) } fn burn(who: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult { @@ -101,7 +103,7 @@ impl darwinia_deposit::SimpleAsset for KtonAsset { Err(>::BalanceLow)?; } - Assets::burn(RuntimeOrigin::signed(0), 0, *who, amount) + Assets::burn(RuntimeOrigin::signed(0), 0.into(), *who, amount) } } impl darwinia_deposit::Config for Runtime { diff --git a/pallet/ecdsa-authority/Cargo.toml b/pallet/ecdsa-authority/Cargo.toml index 6a10ceae..cd070c02 100644 --- a/pallet/ecdsa-authority/Cargo.toml +++ b/pallet/ecdsa-authority/Cargo.toml @@ -19,17 +19,17 @@ scale-info = { version = "2.3", default-features = false } dc-primitives = { default-features = false, path = "../../core/primitives" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] array-bytes = { version = "6.0" } libsecp256k1 = { version = "0.7" } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/pallet/message-gadget/Cargo.toml b/pallet/message-gadget/Cargo.toml index 2e18d186..7fd84102 100644 --- a/pallet/message-gadget/Cargo.toml +++ b/pallet/message-gadget/Cargo.toml @@ -15,23 +15,23 @@ codec = { package = "parity-scale-codec", version = "3.3", default-features scale-info = { version = "2.3", default-features = false, features = ["derive"] } # frontier -pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # paritytech -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] # crates.io array-bytes = { version = "6.0" } # substrate -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/pallet/message-gadget/src/lib.rs b/pallet/message-gadget/src/lib.rs index ed0a1ec2..e36ca4b4 100644 --- a/pallet/message-gadget/src/lib.rs +++ b/pallet/message-gadget/src/lib.rs @@ -57,6 +57,7 @@ pub mod pallet { pub struct Pallet(_); #[pallet::call] impl Pallet { + #[pallet::call_index(0)] #[pallet::weight(0)] pub fn set_commitment_contract( origin: OriginFor, diff --git a/pallet/message-transact/Cargo.toml b/pallet/message-transact/Cargo.toml index fcd39611..0a389343 100644 --- a/pallet/message-transact/Cargo.toml +++ b/pallet/message-transact/Cargo.toml @@ -16,16 +16,16 @@ ethereum = { version = "0.14", default-features = false, features = ["with-cod scale-info = { version = "2.3", default-features = false, features = ["derive"] } # frontier -fp-ethereum = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +fp-ethereum = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] array-bytes = { version = "6.0" } @@ -34,21 +34,21 @@ rlp = { version = "0.5" } sha3 = { version = "0.9" } # darwinia -bp-message-dispatch = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bp-runtime = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-dispatch = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } +bp-message-dispatch = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bp-runtime = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-dispatch = { git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } # frontier -fp-self-contained = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-ethereum = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +fp-self-contained = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-ethereum = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # moonbeam -precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33", features = ["testing"] } +precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36", features = ["testing"] } # substrate -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/pallet/staking/Cargo.toml b/pallet/staking/Cargo.toml index dcdbea2b..bde5a641 100644 --- a/pallet/staking/Cargo.toml +++ b/pallet/staking/Cargo.toml @@ -19,13 +19,13 @@ dc-inflation = { default-features = false, path = "../../core/inflation" } dc-types = { path = "../../core/types" } # subtrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] # crates.io @@ -35,11 +35,11 @@ pretty_env_logger = { version = "0.4" } darwinia-deposit = { path = "../deposit" } # substrate -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/pallet/staking/tests/mock.rs b/pallet/staking/tests/mock.rs index 980cd862..91422e9f 100644 --- a/pallet/staking/tests/mock.rs +++ b/pallet/staking/tests/mock.rs @@ -75,6 +75,7 @@ impl pallet_assets::Config for Runtime { type AssetAccountDeposit = (); type AssetDeposit = (); type AssetId = AssetId; + type AssetIdParameter = codec::Compact; type Balance = Balance; type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg< frame_system::EnsureSignedBy, u32>, @@ -85,6 +86,7 @@ impl pallet_assets::Config for Runtime { type Freezer = (); type MetadataDepositBase = (); type MetadataDepositPerByte = (); + type RemoveItemsLimit = (); type RuntimeEvent = RuntimeEvent; type StringLimit = frame_support::traits::ConstU32<4>; type WeightInfo = (); @@ -108,7 +110,7 @@ impl darwinia_deposit::SimpleAsset for KtonAsset { type AccountId = u32; fn mint(beneficiary: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult { - Assets::mint(RuntimeOrigin::signed(0), 0, *beneficiary, amount) + Assets::mint(RuntimeOrigin::signed(0), 0.into(), *beneficiary, amount) } fn burn(who: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult { @@ -116,7 +118,7 @@ impl darwinia_deposit::SimpleAsset for KtonAsset { Err(>::BalanceLow)?; } - Assets::burn(RuntimeOrigin::signed(0), 0, *who, amount) + Assets::burn(RuntimeOrigin::signed(0), 0.into(), *who, amount) } } impl darwinia_deposit::Config for Runtime { @@ -202,11 +204,21 @@ impl darwinia_staking::Stake for KtonStaking { type Item = Balance; fn stake(who: &Self::AccountId, item: Self::Item) -> sp_runtime::DispatchResult { - Assets::transfer(RuntimeOrigin::signed(*who), 0, darwinia_staking::account_id(), item) + Assets::transfer( + RuntimeOrigin::signed(*who), + 0.into(), + darwinia_staking::account_id(), + item, + ) } fn unstake(who: &Self::AccountId, item: Self::Item) -> sp_runtime::DispatchResult { - Assets::transfer(RuntimeOrigin::signed(darwinia_staking::account_id()), 0, *who, item) + Assets::transfer( + RuntimeOrigin::signed(darwinia_staking::account_id()), + 0.into(), + *who, + item, + ) } } frame_support::parameter_types! { diff --git a/precompile/assets/Cargo.toml b/precompile/assets/Cargo.toml index 2200c55b..c6860259 100644 --- a/precompile/assets/Cargo.toml +++ b/precompile/assets/Cargo.toml @@ -11,19 +11,19 @@ version = "6.0.0" [dependencies] # frontier -fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # moonbeam -precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } +precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } # paritytech -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] # crates.io codec = { package = "parity-scale-codec", version = "3.3" } @@ -31,14 +31,14 @@ scale-info = { version = "2.3", features = ["derive"] } sha3 = { version = "0.8" } # moonbeam -precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33", features = ["testing"] } +precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36", features = ["testing"] } # paritytech -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/precompile/assets/src/lib.rs b/precompile/assets/src/lib.rs index 8e14a735..eab87041 100644 --- a/precompile/assets/src/lib.rs +++ b/precompile/assets/src/lib.rs @@ -147,7 +147,7 @@ where handle, Some(owner.clone()).into(), pallet_assets::Call::::cancel_approval { - id: asset_id, + id: asset_id.into(), delegate: Runtime::Lookup::unlookup(spender.clone()), }, )?; @@ -156,7 +156,7 @@ where handle, Some(owner).into(), pallet_assets::Call::::approve_transfer { - id: asset_id, + id: asset_id.into(), delegate: Runtime::Lookup::unlookup(spender), amount, }, @@ -190,7 +190,7 @@ where handle, Some(origin).into(), pallet_assets::Call::::transfer { - id: asset_id, + id: asset_id.into(), target: Runtime::Lookup::unlookup(to), amount: value, }, @@ -233,7 +233,7 @@ where handle, Some(caller).into(), pallet_assets::Call::::transfer_approved { - id: asset_id, + id: asset_id.into(), owner: Runtime::Lookup::unlookup(from), destination: Runtime::Lookup::unlookup(to), amount: value, @@ -244,7 +244,7 @@ where handle, Some(from).into(), pallet_assets::Call::::transfer { - id: asset_id, + id: asset_id.into(), target: Runtime::Lookup::unlookup(to), amount: value, }, @@ -306,7 +306,7 @@ where handle, Some(origin).into(), pallet_assets::Call::::mint { - id: asset_id, + id: asset_id.into(), beneficiary: Runtime::Lookup::unlookup(to), amount: value, }, @@ -340,7 +340,7 @@ where handle, Some(origin).into(), pallet_assets::Call::::burn { - id: asset_id, + id: asset_id.into(), who: Runtime::Lookup::unlookup(from), amount: value, }, @@ -372,7 +372,7 @@ where handle, Some(origin).into(), pallet_assets::Call::::transfer_ownership { - id: asset_id, + id: asset_id.into(), owner: Runtime::Lookup::unlookup(owner), }, )?; @@ -394,7 +394,7 @@ where handle, Some(origin).into(), pallet_assets::Call::::freeze { - id: asset_id, + id: asset_id.into(), who: Runtime::Lookup::unlookup(account), }, )?; @@ -416,7 +416,7 @@ where handle, Some(origin).into(), pallet_assets::Call::::thaw { - id: asset_id, + id: asset_id.into(), who: Runtime::Lookup::unlookup(account), }, )?; diff --git a/precompile/assets/src/mock.rs b/precompile/assets/src/mock.rs index b03d21f6..470a5ee2 100644 --- a/precompile/assets/src/mock.rs +++ b/precompile/assets/src/mock.rs @@ -176,6 +176,7 @@ impl pallet_assets::Config for TestRuntime { type AssetAccountDeposit = (); type AssetDeposit = (); type AssetId = AssetId; + type AssetIdParameter = codec::Compact; type Balance = Balance; type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg< frame_system::EnsureSignedBy, AccountId>, @@ -186,6 +187,7 @@ impl pallet_assets::Config for TestRuntime { type Freezer = (); type MetadataDepositBase = (); type MetadataDepositPerByte = (); + type RemoveItemsLimit = (); type RuntimeEvent = RuntimeEvent; type StringLimit = frame_support::traits::ConstU32<50>; type WeightInfo = (); diff --git a/precompile/assets/src/tests.rs b/precompile/assets/src/tests.rs index 5858987b..3246fc78 100644 --- a/precompile/assets/src/tests.rs +++ b/precompile/assets/src/tests.rs @@ -20,13 +20,8 @@ use sha3::{Digest, Keccak256}; // darwinia use crate::{ - log3, - mock::{ - Account::{Alice, Bob, Charlie, Precompile}, - Assets, ExtBuilder, InternalCall, PrecompilesValue, RuntimeOrigin, TestPrecompiles, - TestRuntime, TEST_ID, - }, - SELECTOR_LOG_APPROVAL, SELECTOR_LOG_TRANSFER, + mock::{Account::*, *}, + *, }; // moonbeam use precompile_utils::{ @@ -75,7 +70,13 @@ fn selectors() { #[test] fn selector_less_than_four_bytes() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); // This selector is only three bytes long when four are required. precompiles() .prepare_test(Alice, Precompile, vec![1u8, 2u8, 3u8]) @@ -86,7 +87,13 @@ fn selector_less_than_four_bytes() { #[test] fn no_selector_exists_but_length_is_right() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); precompiles() .prepare_test(Alice, Precompile, vec![1u8, 2u8, 3u8, 4u8]) @@ -97,7 +104,13 @@ fn no_selector_exists_but_length_is_right() { #[test] fn modifiers() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); let mut tester = PrecompilesModifierTester::new(precompiles(), Alice, Precompile); tester.test_view_modifier(InternalCall::balance_of_selectors()); @@ -124,10 +137,16 @@ fn get_total_supply() { .with_balances(vec![(Alice.into(), 1000), (Bob.into(), 2500)]) .build() .execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); assert_ok!(Assets::mint( RuntimeOrigin::signed(Alice.into()), - TEST_ID, + TEST_ID.into(), Alice.into(), 1000 )); @@ -142,8 +161,19 @@ fn get_total_supply() { #[test] fn get_balances_known_user() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1000 + )); precompiles() .prepare_test( @@ -159,8 +189,19 @@ fn get_balances_known_user() { #[test] fn get_balances_unknown_user() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1000 + )); precompiles() .prepare_test(Alice, Precompile, InternalCall::balance_of { who: Address(Bob.into()) }) @@ -172,8 +213,19 @@ fn get_balances_unknown_user() { #[test] fn approve() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1000 + )); precompiles() .prepare_test( @@ -195,8 +247,19 @@ fn approve() { #[test] fn approve_overflow() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1000 + )); precompiles() .prepare_test( @@ -211,8 +274,19 @@ fn approve_overflow() { #[test] fn check_allowance_existing() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1000 + )); precompiles() .prepare_test( @@ -240,7 +314,13 @@ fn check_allowance_existing() { #[test] fn check_allowance_not_existing() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); precompiles() .prepare_test( @@ -260,8 +340,19 @@ fn check_allowance_not_existing() { #[test] fn transfer() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1000 + )); precompiles() .prepare_test( @@ -298,8 +389,19 @@ fn transfer() { #[test] fn transfer_not_enough_founds() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1 + )); precompiles() .prepare_test( @@ -317,8 +419,19 @@ fn transfer_not_enough_founds() { #[test] fn transfer_from() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1000 + )); precompiles() .prepare_test( @@ -389,8 +502,8 @@ fn transfer_from() { #[test] fn transfer_from_non_incremental_approval() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID.into(), Alice.into(), true, 1)); + assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID.into(), Alice.into(), 1000)); // We first approve 500 precompiles() @@ -448,8 +561,19 @@ fn transfer_from_non_incremental_approval() { #[test] fn transfer_from_above_allowance() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1000 + )); precompiles() .prepare_test( @@ -480,8 +604,19 @@ fn transfer_from_above_allowance() { #[test] fn transfer_from_self() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1000 + )); precompiles() .prepare_test( @@ -526,10 +661,16 @@ fn get_metadata() { .with_balances(vec![(Alice.into(), 1000), (Bob.into(), 2500)]) .build() .execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); assert_ok!(Assets::force_set_metadata( RuntimeOrigin::root(), - TEST_ID, + TEST_ID.into(), b"TestToken".to_vec(), b"Test".to_vec(), 12, @@ -566,7 +707,13 @@ fn mint() { .with_balances(vec![(Alice.into(), 1000), (Bob.into(), 2500)]) .build() .execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); precompiles() .prepare_test( @@ -601,10 +748,16 @@ fn burn() { .with_balances(vec![(Alice.into(), 1000), (Bob.into(), 2500)]) .build() .execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); assert_ok!(Assets::mint( RuntimeOrigin::signed(Alice.into()), - TEST_ID, + TEST_ID.into(), Alice.into(), 1000 )); @@ -641,10 +794,16 @@ fn freeze() { .with_balances(vec![(Alice.into(), 1000), (Bob.into(), 2500)]) .build() .execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); assert_ok!(Assets::mint( RuntimeOrigin::signed(Alice.into()), - TEST_ID, + TEST_ID.into(), Bob.into(), 1000 )); @@ -677,10 +836,16 @@ fn thaw() { .with_balances(vec![(Alice.into(), 1000), (Bob.into(), 2500)]) .build() .execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); assert_ok!(Assets::mint( RuntimeOrigin::signed(Alice.into()), - TEST_ID, + TEST_ID.into(), Bob.into(), 1000 )); @@ -726,10 +891,16 @@ fn transfer_ownership() { .with_balances(vec![(Alice.into(), 1000), (Bob.into(), 2500)]) .build() .execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); assert_ok!(Assets::force_set_metadata( RuntimeOrigin::root(), - TEST_ID, + TEST_ID.into(), b"TestToken".to_vec(), b"Test".to_vec(), 12, @@ -771,8 +942,19 @@ fn transfer_ownership() { #[test] fn transfer_amount_overflow() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1000 + )); precompiles() .prepare_test( @@ -810,7 +992,13 @@ fn mint_overflow() { .with_balances(vec![(Alice.into(), 1000), (Bob.into(), 2500)]) .build() .execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); precompiles() .prepare_test( @@ -829,8 +1017,19 @@ fn mint_overflow() { #[test] fn transfer_from_overflow() { ExtBuilder::default().with_balances(vec![(Alice.into(), 1000)]).build().execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); - assert_ok!(Assets::mint(RuntimeOrigin::signed(Alice.into()), TEST_ID, Alice.into(), 1000)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); + assert_ok!(Assets::mint( + RuntimeOrigin::signed(Alice.into()), + TEST_ID.into(), + Alice.into(), + 1000 + )); precompiles() .prepare_test( @@ -861,10 +1060,16 @@ fn burn_overflow() { .with_balances(vec![(Alice.into(), 1000), (Bob.into(), 2500)]) .build() .execute_with(|| { - assert_ok!(Assets::force_create(RuntimeOrigin::root(), TEST_ID, Alice.into(), true, 1)); + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + TEST_ID.into(), + Alice.into(), + true, + 1 + )); assert_ok!(Assets::mint( RuntimeOrigin::signed(Alice.into()), - TEST_ID, + TEST_ID.into(), Alice.into(), 1000 )); diff --git a/precompile/bls12-381/Cargo.toml b/precompile/bls12-381/Cargo.toml index 9f8bd445..46ce5f91 100644 --- a/precompile/bls12-381/Cargo.toml +++ b/precompile/bls12-381/Cargo.toml @@ -14,14 +14,14 @@ version = "6.0.0" milagro_bls = { default-features = false, git = "https://github.com/darwinia-network/milagro_bls" } # frontier -fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # moonbeam -precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } +precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } # substrate -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] # crates.io @@ -29,15 +29,15 @@ codec = { package = "parity-scale-codec", version = "3.3" } scale-info = { version = "2.3", features = ["derive"] } # moonbeam -precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33", features = ["testing"] } +precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36", features = ["testing"] } # substrate -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/precompile/deposit/Cargo.toml b/precompile/deposit/Cargo.toml index 38b5ba96..6724504c 100644 --- a/precompile/deposit/Cargo.toml +++ b/precompile/deposit/Cargo.toml @@ -11,20 +11,20 @@ version = "6.0.0" [dependencies] # frontier -fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # darwinia darwinia-deposit = { default-features = false, path = "../../pallet/deposit"} # moonbeam -precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } +precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] # crates.io @@ -32,13 +32,13 @@ codec = { package = "parity-scale-codec", version = "3.3" } scale-info = { version = "2.3", features = ["derive"] } # moonbeam -precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33", features = ["testing"] } +precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36", features = ["testing"] } # substrate -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/precompile/staking/Cargo.toml b/precompile/staking/Cargo.toml index 373e0103..9cba6b87 100644 --- a/precompile/staking/Cargo.toml +++ b/precompile/staking/Cargo.toml @@ -11,21 +11,21 @@ version = "6.0.0" [dependencies] # frontier -fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # darwinia darwinia-staking = { default-features = false, path = "../../pallet/staking" } # moonbeam -precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } +precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] # crates.io @@ -36,13 +36,13 @@ scale-info = { version = "2.3", features = ["derive"] } darwinia-deposit = { path = "../../pallet/deposit" } # moonbeam -precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33", features = ["testing"] } +precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36", features = ["testing"] } # substrate -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] diff --git a/precompile/state-storage/Cargo.toml b/precompile/state-storage/Cargo.toml index c07c5163..34fbbdc4 100644 --- a/precompile/state-storage/Cargo.toml +++ b/precompile/state-storage/Cargo.toml @@ -11,15 +11,15 @@ version = "6.0.0" [dependencies] # frontier -fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # moonbeam -precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } +precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] # crates.io @@ -27,15 +27,15 @@ codec = { package = "parity-scale-codec", version = "3.3" } scale-info = { version = "2.3", features = ["derive"] } # moonbeam -precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33", features = ["testing"] } +precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36", features = ["testing"] } # substrate -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 263024b2..7837ac0b 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -18,23 +18,23 @@ smallvec = { version = "1.10" } dc-primitives = { default-features = false, path = "../../core/primitives" } # darwinia-messages-substrate -bp-darwinia-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } +bp-darwinia-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } # moonbeam -account = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } +account = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } # polkadot -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/runtime/common/src/xcm_configs.rs b/runtime/common/src/xcm_configs.rs index 9c690a3d..ad47ef8e 100644 --- a/runtime/common/src/xcm_configs.rs +++ b/runtime/common/src/xcm_configs.rs @@ -79,7 +79,7 @@ where } } -// See issue #5233 +// See issue pub struct DenyReserveTransferToRelayChain; impl ShouldExecute for DenyReserveTransferToRelayChain { fn should_execute( diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml index c295578a..b2f376fc 100644 --- a/runtime/crab/Cargo.toml +++ b/runtime/crab/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/darwinia-network/darwinia" version = "6.0.0" [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dependencies] # crates.io @@ -21,17 +21,17 @@ static_assertions = { version = "1.1" } array-bytes = { version = "6.0", optional = true } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } # cumulus optional -cumulus-pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } # darwinia darwinia-account-migration = { default-features = false, path = "../../pallet/account-migration" } @@ -49,89 +49,89 @@ darwinia-staking = { default-features = false, path = "../../pa dc-primitives = { default-features = false, path = "../../core/primitives" } # darwinia-messages-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } # frontier -fp-rpc = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -fp-self-contained = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-ethereum = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-bn128 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-dispatch = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-modexp = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +fp-rpc = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fp-self-contained = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-ethereum = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-bn128 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-dispatch = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-modexp = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # moonbeam -precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } -xcm-primitives = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } +precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } +xcm-primitives = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } # substrate -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-democracy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-elections-phragmen = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-identity = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-membership = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-preimage = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-tips = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-treasury = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-democracy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-elections-phragmen = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-identity = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-membership = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-preimage = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-tips = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-treasury = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } # substrate optional -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] # darwinia darwinia-common-runtime = { features = ["test"], path = "../common" } # substrate -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] @@ -332,6 +332,7 @@ try-runtime = [ "pallet-fee-market/try-runtime", # frontier + "fp-self-contained/try-runtime", "pallet-ethereum/try-runtime", "pallet-evm/try-runtime", @@ -364,6 +365,7 @@ try-runtime = [ "pallet-treasury/try-runtime", "pallet-utility/try-runtime", "pallet-vesting/try-runtime", + "sp-runtime/try-runtime", # substrate optional "frame-try-runtime/try-runtime", ] diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs index 45196de9..91e8e956 100644 --- a/runtime/crab/src/lib.rs +++ b/runtime/crab/src/lib.rs @@ -602,30 +602,26 @@ sp_api::impl_runtime_apis! { #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { - fn on_runtime_upgrade() -> (Weight, Weight) { + fn on_runtime_upgrade(checks: bool) -> (Weight, Weight) { // substrate use frame_support::log; log::info!("try-runtime::on_runtime_upgrade"); - let weight = Executive::try_runtime_upgrade().unwrap(); + let weight = Executive::try_runtime_upgrade(checks).unwrap(); (weight, RuntimeBlockWeights::get().max_block) } - fn execute_block(block: Block, state_root_check: bool, select: frame_try_runtime::TryStateSelect) -> Weight { - // substrate - use frame_support::log; - - log::info!( - "try-runtime: executing block #{} ({:?}) / root checks: {:?} / sanity-checks: {:?}", - block.header.number, - block.header.hash(), - state_root_check, - select, - ); - - Executive::try_execute_block(block, state_root_check, select).expect("try_execute_block failed") + fn execute_block( + block: Block, + state_root_check: bool, + signature_check: bool, + select: frame_try_runtime::TryStateSelect, + ) -> Weight { + // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to + // have a backtrace here. + Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap() } } } diff --git a/runtime/crab/src/pallets/assets.rs b/runtime/crab/src/pallets/assets.rs index 19ff27cb..ed9bd71c 100644 --- a/runtime/crab/src/pallets/assets.rs +++ b/runtime/crab/src/pallets/assets.rs @@ -33,7 +33,10 @@ impl pallet_assets::Config for Runtime { type AssetAccountDeposit = ConstU128<0>; type AssetDeposit = ConstU128<0>; type AssetId = AssetId; + type AssetIdParameter = codec::Compact; type Balance = Balance; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = (); type CreateOrigin = AsEnsureOriginWithArg, AccountId>>; type Currency = Balances; type Extra = (); @@ -41,6 +44,7 @@ impl pallet_assets::Config for Runtime { type Freezer = (); type MetadataDepositBase = ConstU128<0>; type MetadataDepositPerByte = ConstU128<0>; + type RemoveItemsLimit = ConstU32<1000>; type RuntimeEvent = RuntimeEvent; type StringLimit = ConstU32<50>; type WeightInfo = (); diff --git a/runtime/crab/src/pallets/deposit.rs b/runtime/crab/src/pallets/deposit.rs index 2f408280..f1990094 100644 --- a/runtime/crab/src/pallets/deposit.rs +++ b/runtime/crab/src/pallets/deposit.rs @@ -24,7 +24,12 @@ impl darwinia_deposit::SimpleAsset for CKtonMinting { type AccountId = AccountId; fn mint(beneficiary: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult { - Assets::mint(RuntimeOrigin::signed(ROOT), AssetIds::CKton as _, *beneficiary, amount) + Assets::mint( + RuntimeOrigin::signed(ROOT), + (AssetIds::CKton as AssetId).into(), + *beneficiary, + amount, + ) } fn burn(who: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult { @@ -34,7 +39,7 @@ impl darwinia_deposit::SimpleAsset for CKtonMinting { Err(>::BalanceLow)?; } - Assets::burn(RuntimeOrigin::signed(ROOT), asset_id, *who, amount) + Assets::burn(RuntimeOrigin::signed(ROOT), asset_id.into(), *who, amount) } } diff --git a/runtime/crab/src/pallets/staking.rs b/runtime/crab/src/pallets/staking.rs index 7ac9221d..9464a453 100644 --- a/runtime/crab/src/pallets/staking.rs +++ b/runtime/crab/src/pallets/staking.rs @@ -52,7 +52,7 @@ impl darwinia_staking::Stake for CKtonStaking { fn stake(who: &Self::AccountId, item: Self::Item) -> sp_runtime::DispatchResult { Assets::transfer( RuntimeOrigin::signed(*who), - AssetIds::CKton as AssetId, + (AssetIds::CKton as AssetId).into(), darwinia_staking::account_id(), item, ) @@ -61,7 +61,7 @@ impl darwinia_staking::Stake for CKtonStaking { fn unstake(who: &Self::AccountId, item: Self::Item) -> sp_runtime::DispatchResult { Assets::transfer( RuntimeOrigin::signed(darwinia_staking::account_id()), - AssetIds::CKton as AssetId, + (AssetIds::CKton as AssetId).into(), *who, item, ) diff --git a/runtime/crab/src/pallets/system.rs b/runtime/crab/src/pallets/system.rs index ac01d5c8..43a82603 100644 --- a/runtime/crab/src/pallets/system.rs +++ b/runtime/crab/src/pallets/system.rs @@ -28,9 +28,10 @@ const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(5); pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); /// We allow for 0.5 of a second of compute with a 12 second average block time. -pub const MAXIMUM_BLOCK_WEIGHT: Weight = frame_support::weights::constants::WEIGHT_PER_SECOND - .saturating_div(2) - .set_proof_size(cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64); +pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts( + frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND.saturating_div(2), + cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64, +); frame_support::parameter_types! { pub const Version: sp_version::RuntimeVersion = VERSION; diff --git a/runtime/crab/src/pallets/timestamp.rs b/runtime/crab/src/pallets/timestamp.rs index 3443326f..b18b2a16 100644 --- a/runtime/crab/src/pallets/timestamp.rs +++ b/runtime/crab/src/pallets/timestamp.rs @@ -23,6 +23,6 @@ impl pallet_timestamp::Config for Runtime { type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>; /// A timestamp: milliseconds since the unix epoch. type Moment = u64; - type OnTimestampSet = (); + type OnTimestampSet = Aura; type WeightInfo = weights::pallet_timestamp::WeightInfo; } diff --git a/runtime/crab/src/weights/block_weights.rs b/runtime/crab/src/weights/block_weights.rs index c0043073..66279be1 100644 --- a/runtime/crab/src/weights/block_weights.rs +++ b/runtime/crab/src/weights/block_weights.rs @@ -23,7 +23,7 @@ pub mod constants { parameter_types! { /// Importing a block with 0 Extrinsics. - pub const BlockExecutionWeight: Weight = constants::WEIGHT_PER_NANOS.saturating_mul(5_000_000); + pub const BlockExecutionWeight: Weight = Weight::from_ref_time(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(5_000_000)); } #[cfg(test)] @@ -39,12 +39,12 @@ pub mod constants { // At least 100 µs. assert!( - w.ref_time() >= 100u64 * constants::WEIGHT_PER_MICROS.ref_time(), + w.ref_time() >= 100u64 * constants::WEIGHT_REF_TIME_PER_MICROS, "Weight should be at least 100 µs." ); // At most 50 ms. assert!( - w.ref_time() <= 50u64 * constants::WEIGHT_PER_MILLIS.ref_time(), + w.ref_time() <= 50u64 * constants::WEIGHT_REF_TIME_PER_MILLIS, "Weight should be at most 50 ms." ); } diff --git a/runtime/crab/src/weights/extrinsic_weights.rs b/runtime/crab/src/weights/extrinsic_weights.rs index 3ce6b73d..48868670 100644 --- a/runtime/crab/src/weights/extrinsic_weights.rs +++ b/runtime/crab/src/weights/extrinsic_weights.rs @@ -23,7 +23,7 @@ pub mod constants { parameter_types! { /// Executing a NO-OP `System::remarks` Extrinsic. - pub const ExtrinsicBaseWeight: Weight = constants::WEIGHT_PER_NANOS.saturating_mul(125_000); + pub const ExtrinsicBaseWeight: Weight = Weight::from_ref_time(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(125_000)); } #[cfg(test)] @@ -39,12 +39,12 @@ pub mod constants { // At least 10 µs. assert!( - w.ref_time() >= 10u64 * constants::WEIGHT_PER_MICROS.ref_time(), + w.ref_time() >= 10u64 * constants::WEIGHT_REF_TIME_PER_MICROS, "Weight should be at least 10 µs." ); // At most 1 ms. assert!( - w.ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + w.ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Weight should be at most 1 ms." ); } diff --git a/runtime/crab/src/weights/paritydb_weights.rs b/runtime/crab/src/weights/paritydb_weights.rs index dca7d348..4338d928 100644 --- a/runtime/crab/src/weights/paritydb_weights.rs +++ b/runtime/crab/src/weights/paritydb_weights.rs @@ -25,8 +25,8 @@ pub mod constants { /// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights /// are available for brave runtime engineers who may want to try this out as default. pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight { - read: 8_000 * constants::WEIGHT_PER_NANOS.ref_time(), - write: 50_000 * constants::WEIGHT_PER_NANOS.ref_time(), + read: 8_000 * constants::WEIGHT_REF_TIME_PER_NANOS, + write: 50_000 * constants::WEIGHT_REF_TIME_PER_NANOS, }; } @@ -42,20 +42,20 @@ pub mod constants { fn sane() { // At least 1 µs. assert!( - W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Read weight should be at least 1 µs." ); assert!( - W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Write weight should be at least 1 µs." ); // At most 1 ms. assert!( - W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Read weight should be at most 1 ms." ); assert!( - W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Write weight should be at most 1 ms." ); } diff --git a/runtime/crab/src/weights/rocksdb_weights.rs b/runtime/crab/src/weights/rocksdb_weights.rs index 87867ebf..1d115d96 100644 --- a/runtime/crab/src/weights/rocksdb_weights.rs +++ b/runtime/crab/src/weights/rocksdb_weights.rs @@ -25,8 +25,8 @@ pub mod constants { /// By default, Substrate uses `RocksDB`, so this will be the weight used throughout /// the runtime. pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight { - read: 25_000 * constants::WEIGHT_PER_NANOS.ref_time(), - write: 100_000 * constants::WEIGHT_PER_NANOS.ref_time(), + read: 25_000 * constants::WEIGHT_REF_TIME_PER_NANOS, + write: 100_000 * constants::WEIGHT_REF_TIME_PER_NANOS, }; } @@ -42,20 +42,20 @@ pub mod constants { fn sane() { // At least 1 µs. assert!( - W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Read weight should be at least 1 µs." ); assert!( - W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Write weight should be at least 1 µs." ); // At most 1 ms. assert!( - W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Read weight should be at most 1 ms." ); assert!( - W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Write weight should be at most 1 ms." ); } diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml index 693ca9a3..a1761b51 100644 --- a/runtime/darwinia/Cargo.toml +++ b/runtime/darwinia/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/darwinia-network/darwinia" version = "6.0.0" [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dependencies] # crates.io @@ -21,17 +21,17 @@ static_assertions = { version = "1.1" } array-bytes = { version = "6.0", optional = true } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } # cumulus optional -cumulus-pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } # darwinia darwinia-account-migration = { default-features = false, path = "../../pallet/account-migration" } @@ -49,89 +49,89 @@ darwinia-staking = { default-features = false, path = "../../pa dc-primitives = { default-features = false, path = "../../core/primitives" } # darwinia-messages-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } # frontier -fp-rpc = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -fp-self-contained = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-ethereum = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-bn128 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-dispatch = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-modexp = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +fp-rpc = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fp-self-contained = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-ethereum = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-bn128 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-dispatch = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-modexp = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # moonbeam -precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } -xcm-primitives = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } +precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } +xcm-primitives = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } # substrate -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-democracy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-elections-phragmen = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-identity = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-membership = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-preimage = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-tips = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-treasury = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-democracy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-elections-phragmen = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-identity = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-membership = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-preimage = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-tips = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-treasury = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } # substrate optional -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] # darwinia darwinia-common-runtime = { features = ["test"], path = "../common" } # substrate -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] @@ -332,6 +332,7 @@ try-runtime = [ "pallet-fee-market/try-runtime", # frontier + "fp-self-contained/try-runtime", "pallet-ethereum/try-runtime", "pallet-evm/try-runtime", @@ -364,6 +365,7 @@ try-runtime = [ "pallet-treasury/try-runtime", "pallet-utility/try-runtime", "pallet-vesting/try-runtime", + "sp-runtime/try-runtime", # substrate optional "frame-try-runtime/try-runtime", ] diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs index bddc318e..8e00e144 100644 --- a/runtime/darwinia/src/lib.rs +++ b/runtime/darwinia/src/lib.rs @@ -603,30 +603,26 @@ sp_api::impl_runtime_apis! { #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { - fn on_runtime_upgrade() -> (Weight, Weight) { + fn on_runtime_upgrade(checks: bool) -> (Weight, Weight) { // substrate use frame_support::log; log::info!("try-runtime::on_runtime_upgrade"); - let weight = Executive::try_runtime_upgrade().unwrap(); + let weight = Executive::try_runtime_upgrade(checks).unwrap(); (weight, RuntimeBlockWeights::get().max_block) } - fn execute_block(block: Block, state_root_check: bool, select: frame_try_runtime::TryStateSelect) -> Weight { - // substrate - use frame_support::log; - - log::info!( - "try-runtime: executing block #{} ({:?}) / root checks: {:?} / sanity-checks: {:?}", - block.header.number, - block.header.hash(), - state_root_check, - select, - ); - - Executive::try_execute_block(block, state_root_check, select).expect("try_execute_block failed") + fn execute_block( + block: Block, + state_root_check: bool, + signature_check: bool, + select: frame_try_runtime::TryStateSelect, + ) -> Weight { + // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to + // have a backtrace here. + Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap() } } } diff --git a/runtime/darwinia/src/pallets/assets.rs b/runtime/darwinia/src/pallets/assets.rs index 2367bca4..903856ed 100644 --- a/runtime/darwinia/src/pallets/assets.rs +++ b/runtime/darwinia/src/pallets/assets.rs @@ -33,7 +33,10 @@ impl pallet_assets::Config for Runtime { type AssetAccountDeposit = ConstU128<0>; type AssetDeposit = ConstU128<0>; type AssetId = AssetId; + type AssetIdParameter = codec::Compact; type Balance = Balance; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = (); type CreateOrigin = AsEnsureOriginWithArg, AccountId>>; type Currency = Balances; type Extra = (); @@ -41,6 +44,7 @@ impl pallet_assets::Config for Runtime { type Freezer = (); type MetadataDepositBase = ConstU128<0>; type MetadataDepositPerByte = ConstU128<0>; + type RemoveItemsLimit = ConstU32<1000>; type RuntimeEvent = RuntimeEvent; type StringLimit = ConstU32<50>; type WeightInfo = (); diff --git a/runtime/darwinia/src/pallets/deposit.rs b/runtime/darwinia/src/pallets/deposit.rs index 34a0f3e5..87ec891e 100644 --- a/runtime/darwinia/src/pallets/deposit.rs +++ b/runtime/darwinia/src/pallets/deposit.rs @@ -24,7 +24,12 @@ impl darwinia_deposit::SimpleAsset for KtonAsset { type AccountId = AccountId; fn mint(beneficiary: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult { - Assets::mint(RuntimeOrigin::signed(ROOT), AssetIds::Kton as _, *beneficiary, amount) + Assets::mint( + RuntimeOrigin::signed(ROOT), + (AssetIds::Kton as AssetId).into(), + *beneficiary, + amount, + ) } fn burn(who: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult { @@ -34,7 +39,7 @@ impl darwinia_deposit::SimpleAsset for KtonAsset { Err(>::BalanceLow)?; } - Assets::burn(RuntimeOrigin::signed(ROOT), asset_id, *who, amount) + Assets::burn(RuntimeOrigin::signed(ROOT), asset_id.into(), *who, amount) } } diff --git a/runtime/darwinia/src/pallets/staking.rs b/runtime/darwinia/src/pallets/staking.rs index cc1661ea..7d3aa2d5 100644 --- a/runtime/darwinia/src/pallets/staking.rs +++ b/runtime/darwinia/src/pallets/staking.rs @@ -52,7 +52,7 @@ impl darwinia_staking::Stake for KtonStaking { fn stake(who: &Self::AccountId, item: Self::Item) -> sp_runtime::DispatchResult { Assets::transfer( RuntimeOrigin::signed(*who), - AssetIds::Kton as AssetId, + (AssetIds::Kton as AssetId).into(), darwinia_staking::account_id(), item, ) @@ -61,7 +61,7 @@ impl darwinia_staking::Stake for KtonStaking { fn unstake(who: &Self::AccountId, item: Self::Item) -> sp_runtime::DispatchResult { Assets::transfer( RuntimeOrigin::signed(darwinia_staking::account_id()), - AssetIds::Kton as AssetId, + (AssetIds::Kton as AssetId).into(), *who, item, ) diff --git a/runtime/darwinia/src/pallets/system.rs b/runtime/darwinia/src/pallets/system.rs index ac01d5c8..43a82603 100644 --- a/runtime/darwinia/src/pallets/system.rs +++ b/runtime/darwinia/src/pallets/system.rs @@ -28,9 +28,10 @@ const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(5); pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); /// We allow for 0.5 of a second of compute with a 12 second average block time. -pub const MAXIMUM_BLOCK_WEIGHT: Weight = frame_support::weights::constants::WEIGHT_PER_SECOND - .saturating_div(2) - .set_proof_size(cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64); +pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts( + frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND.saturating_div(2), + cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64, +); frame_support::parameter_types! { pub const Version: sp_version::RuntimeVersion = VERSION; diff --git a/runtime/darwinia/src/pallets/timestamp.rs b/runtime/darwinia/src/pallets/timestamp.rs index 3443326f..b18b2a16 100644 --- a/runtime/darwinia/src/pallets/timestamp.rs +++ b/runtime/darwinia/src/pallets/timestamp.rs @@ -23,6 +23,6 @@ impl pallet_timestamp::Config for Runtime { type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>; /// A timestamp: milliseconds since the unix epoch. type Moment = u64; - type OnTimestampSet = (); + type OnTimestampSet = Aura; type WeightInfo = weights::pallet_timestamp::WeightInfo; } diff --git a/runtime/darwinia/src/weights/block_weights.rs b/runtime/darwinia/src/weights/block_weights.rs index c0043073..66279be1 100644 --- a/runtime/darwinia/src/weights/block_weights.rs +++ b/runtime/darwinia/src/weights/block_weights.rs @@ -23,7 +23,7 @@ pub mod constants { parameter_types! { /// Importing a block with 0 Extrinsics. - pub const BlockExecutionWeight: Weight = constants::WEIGHT_PER_NANOS.saturating_mul(5_000_000); + pub const BlockExecutionWeight: Weight = Weight::from_ref_time(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(5_000_000)); } #[cfg(test)] @@ -39,12 +39,12 @@ pub mod constants { // At least 100 µs. assert!( - w.ref_time() >= 100u64 * constants::WEIGHT_PER_MICROS.ref_time(), + w.ref_time() >= 100u64 * constants::WEIGHT_REF_TIME_PER_MICROS, "Weight should be at least 100 µs." ); // At most 50 ms. assert!( - w.ref_time() <= 50u64 * constants::WEIGHT_PER_MILLIS.ref_time(), + w.ref_time() <= 50u64 * constants::WEIGHT_REF_TIME_PER_MILLIS, "Weight should be at most 50 ms." ); } diff --git a/runtime/darwinia/src/weights/extrinsic_weights.rs b/runtime/darwinia/src/weights/extrinsic_weights.rs index 3ce6b73d..48868670 100644 --- a/runtime/darwinia/src/weights/extrinsic_weights.rs +++ b/runtime/darwinia/src/weights/extrinsic_weights.rs @@ -23,7 +23,7 @@ pub mod constants { parameter_types! { /// Executing a NO-OP `System::remarks` Extrinsic. - pub const ExtrinsicBaseWeight: Weight = constants::WEIGHT_PER_NANOS.saturating_mul(125_000); + pub const ExtrinsicBaseWeight: Weight = Weight::from_ref_time(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(125_000)); } #[cfg(test)] @@ -39,12 +39,12 @@ pub mod constants { // At least 10 µs. assert!( - w.ref_time() >= 10u64 * constants::WEIGHT_PER_MICROS.ref_time(), + w.ref_time() >= 10u64 * constants::WEIGHT_REF_TIME_PER_MICROS, "Weight should be at least 10 µs." ); // At most 1 ms. assert!( - w.ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + w.ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Weight should be at most 1 ms." ); } diff --git a/runtime/darwinia/src/weights/paritydb_weights.rs b/runtime/darwinia/src/weights/paritydb_weights.rs index dca7d348..4338d928 100644 --- a/runtime/darwinia/src/weights/paritydb_weights.rs +++ b/runtime/darwinia/src/weights/paritydb_weights.rs @@ -25,8 +25,8 @@ pub mod constants { /// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights /// are available for brave runtime engineers who may want to try this out as default. pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight { - read: 8_000 * constants::WEIGHT_PER_NANOS.ref_time(), - write: 50_000 * constants::WEIGHT_PER_NANOS.ref_time(), + read: 8_000 * constants::WEIGHT_REF_TIME_PER_NANOS, + write: 50_000 * constants::WEIGHT_REF_TIME_PER_NANOS, }; } @@ -42,20 +42,20 @@ pub mod constants { fn sane() { // At least 1 µs. assert!( - W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Read weight should be at least 1 µs." ); assert!( - W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Write weight should be at least 1 µs." ); // At most 1 ms. assert!( - W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Read weight should be at most 1 ms." ); assert!( - W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Write weight should be at most 1 ms." ); } diff --git a/runtime/darwinia/src/weights/rocksdb_weights.rs b/runtime/darwinia/src/weights/rocksdb_weights.rs index 87867ebf..1d115d96 100644 --- a/runtime/darwinia/src/weights/rocksdb_weights.rs +++ b/runtime/darwinia/src/weights/rocksdb_weights.rs @@ -25,8 +25,8 @@ pub mod constants { /// By default, Substrate uses `RocksDB`, so this will be the weight used throughout /// the runtime. pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight { - read: 25_000 * constants::WEIGHT_PER_NANOS.ref_time(), - write: 100_000 * constants::WEIGHT_PER_NANOS.ref_time(), + read: 25_000 * constants::WEIGHT_REF_TIME_PER_NANOS, + write: 100_000 * constants::WEIGHT_REF_TIME_PER_NANOS, }; } @@ -42,20 +42,20 @@ pub mod constants { fn sane() { // At least 1 µs. assert!( - W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Read weight should be at least 1 µs." ); assert!( - W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Write weight should be at least 1 µs." ); // At most 1 ms. assert!( - W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Read weight should be at most 1 ms." ); assert!( - W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Write weight should be at most 1 ms." ); } diff --git a/runtime/pangolin/Cargo.toml b/runtime/pangolin/Cargo.toml index f3da526f..b5610ac1 100644 --- a/runtime/pangolin/Cargo.toml +++ b/runtime/pangolin/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/darwinia-network/darwinia" version = "6.0.0" [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dependencies] # crates.io @@ -21,17 +21,17 @@ static_assertions = { version = "1.1" } array-bytes = { version = "6.0", optional = true } # cumulus -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } # cumulus optional -cumulus-pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } # darwinia darwinia-account-migration = { default-features = false, path = "../../pallet/account-migration" } @@ -49,89 +49,89 @@ darwinia-staking = { default-features = false, path = "../../pa dc-primitives = { default-features = false, path = "../../core/primitives" } # darwinia-messages-substrate -bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } -pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.33" } +bp-message-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bp-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bp-polkadot-core = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bp-runtime = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +bridge-runtime-common = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-grandpa = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-messages = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-bridge-parachains = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } +pallet-fee-market = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.36" } # frontier -fp-rpc = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -fp-self-contained = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-ethereum = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-bn128 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-dispatch = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-modexp = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } -pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" } +fp-rpc = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +fp-self-contained = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-ethereum = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-bn128 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-dispatch = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-modexp = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } +pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" } # moonbeam -precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } -xcm-primitives = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" } +precompile-utils = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } +xcm-primitives = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" } # polkadot -pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +polkadot-runtime-common = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } # substrate -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-democracy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-elections-phragmen = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-identity = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-membership = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-preimage = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-tips = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-treasury = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-democracy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-elections-phragmen = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-identity = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-membership = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-multisig = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-preimage = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-tips = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-treasury = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } # substrate optional -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-try-runtime = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [dev-dependencies] # darwinia darwinia-common-runtime = { features = ["test"], path = "../common" } # substrate -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] @@ -332,6 +332,7 @@ try-runtime = [ "pallet-fee-market/try-runtime", # frontier + "fp-self-contained/try-runtime", "pallet-ethereum/try-runtime", "pallet-evm/try-runtime", @@ -364,6 +365,7 @@ try-runtime = [ "pallet-treasury/try-runtime", "pallet-utility/try-runtime", "pallet-vesting/try-runtime", + "sp-runtime/try-runtime", # substrate optional "frame-try-runtime/try-runtime", ] diff --git a/runtime/pangolin/src/lib.rs b/runtime/pangolin/src/lib.rs index fb5b9cbc..8dfa46d6 100644 --- a/runtime/pangolin/src/lib.rs +++ b/runtime/pangolin/src/lib.rs @@ -582,30 +582,26 @@ sp_api::impl_runtime_apis! { #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { - fn on_runtime_upgrade() -> (Weight, Weight) { + fn on_runtime_upgrade(checks: bool) -> (Weight, Weight) { // substrate use frame_support::log; log::info!("try-runtime::on_runtime_upgrade"); - let weight = Executive::try_runtime_upgrade().unwrap(); + let weight = Executive::try_runtime_upgrade(checks).unwrap(); (weight, RuntimeBlockWeights::get().max_block) } - fn execute_block(block: Block, state_root_check: bool, select: frame_try_runtime::TryStateSelect) -> Weight { - // substrate - use frame_support::log; - - log::info!( - "try-runtime: executing block #{} ({:?}) / root checks: {:?} / sanity-checks: {:?}", - block.header.number, - block.header.hash(), - state_root_check, - select, - ); - - Executive::try_execute_block(block, state_root_check, select).expect("try_execute_block failed") + fn execute_block( + block: Block, + state_root_check: bool, + signature_check: bool, + select: frame_try_runtime::TryStateSelect, + ) -> Weight { + // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to + // have a backtrace here. + Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap() } } } diff --git a/runtime/pangolin/src/pallets/assets.rs b/runtime/pangolin/src/pallets/assets.rs index d1a5335f..8ff110b0 100644 --- a/runtime/pangolin/src/pallets/assets.rs +++ b/runtime/pangolin/src/pallets/assets.rs @@ -33,7 +33,10 @@ impl pallet_assets::Config for Runtime { type AssetAccountDeposit = ConstU128<0>; type AssetDeposit = ConstU128<0>; type AssetId = AssetId; + type AssetIdParameter = codec::Compact; type Balance = Balance; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = (); type CreateOrigin = AsEnsureOriginWithArg, AccountId>>; type Currency = Balances; type Extra = (); @@ -41,6 +44,7 @@ impl pallet_assets::Config for Runtime { type Freezer = (); type MetadataDepositBase = ConstU128<0>; type MetadataDepositPerByte = ConstU128<0>; + type RemoveItemsLimit = ConstU32<1000>; type RuntimeEvent = RuntimeEvent; type StringLimit = ConstU32<50>; type WeightInfo = (); diff --git a/runtime/pangolin/src/pallets/deposit.rs b/runtime/pangolin/src/pallets/deposit.rs index 2febd939..fbde4efc 100644 --- a/runtime/pangolin/src/pallets/deposit.rs +++ b/runtime/pangolin/src/pallets/deposit.rs @@ -24,7 +24,12 @@ impl darwinia_deposit::SimpleAsset for PKtonMinting { type AccountId = AccountId; fn mint(beneficiary: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult { - Assets::mint(RuntimeOrigin::signed(ROOT), AssetIds::PKton as _, *beneficiary, amount) + Assets::mint( + RuntimeOrigin::signed(ROOT), + (AssetIds::PKton as AssetId).into(), + *beneficiary, + amount, + ) } fn burn(who: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult { @@ -34,7 +39,7 @@ impl darwinia_deposit::SimpleAsset for PKtonMinting { Err(>::BalanceLow)?; } - Assets::burn(RuntimeOrigin::signed(ROOT), asset_id, *who, amount) + Assets::burn(RuntimeOrigin::signed(ROOT), asset_id.into(), *who, amount) } } diff --git a/runtime/pangolin/src/pallets/staking.rs b/runtime/pangolin/src/pallets/staking.rs index 83e0ea7f..79ea8fe7 100644 --- a/runtime/pangolin/src/pallets/staking.rs +++ b/runtime/pangolin/src/pallets/staking.rs @@ -52,7 +52,7 @@ impl darwinia_staking::Stake for PKtonStaking { fn stake(who: &Self::AccountId, item: Self::Item) -> sp_runtime::DispatchResult { Assets::transfer( RuntimeOrigin::signed(*who), - AssetIds::PKton as AssetId, + (AssetIds::PKton as AssetId).into(), darwinia_staking::account_id(), item, ) @@ -61,7 +61,7 @@ impl darwinia_staking::Stake for PKtonStaking { fn unstake(who: &Self::AccountId, item: Self::Item) -> sp_runtime::DispatchResult { Assets::transfer( RuntimeOrigin::signed(darwinia_staking::account_id()), - AssetIds::PKton as AssetId, + (AssetIds::PKton as AssetId).into(), *who, item, ) diff --git a/runtime/pangolin/src/pallets/system.rs b/runtime/pangolin/src/pallets/system.rs index ac01d5c8..43a82603 100644 --- a/runtime/pangolin/src/pallets/system.rs +++ b/runtime/pangolin/src/pallets/system.rs @@ -28,9 +28,10 @@ const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(5); pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); /// We allow for 0.5 of a second of compute with a 12 second average block time. -pub const MAXIMUM_BLOCK_WEIGHT: Weight = frame_support::weights::constants::WEIGHT_PER_SECOND - .saturating_div(2) - .set_proof_size(cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64); +pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts( + frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND.saturating_div(2), + cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64, +); frame_support::parameter_types! { pub const Version: sp_version::RuntimeVersion = VERSION; diff --git a/runtime/pangolin/src/pallets/timestamp.rs b/runtime/pangolin/src/pallets/timestamp.rs index 3443326f..b18b2a16 100644 --- a/runtime/pangolin/src/pallets/timestamp.rs +++ b/runtime/pangolin/src/pallets/timestamp.rs @@ -23,6 +23,6 @@ impl pallet_timestamp::Config for Runtime { type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>; /// A timestamp: milliseconds since the unix epoch. type Moment = u64; - type OnTimestampSet = (); + type OnTimestampSet = Aura; type WeightInfo = weights::pallet_timestamp::WeightInfo; } diff --git a/runtime/pangolin/src/weights/block_weights.rs b/runtime/pangolin/src/weights/block_weights.rs index c0043073..66279be1 100644 --- a/runtime/pangolin/src/weights/block_weights.rs +++ b/runtime/pangolin/src/weights/block_weights.rs @@ -23,7 +23,7 @@ pub mod constants { parameter_types! { /// Importing a block with 0 Extrinsics. - pub const BlockExecutionWeight: Weight = constants::WEIGHT_PER_NANOS.saturating_mul(5_000_000); + pub const BlockExecutionWeight: Weight = Weight::from_ref_time(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(5_000_000)); } #[cfg(test)] @@ -39,12 +39,12 @@ pub mod constants { // At least 100 µs. assert!( - w.ref_time() >= 100u64 * constants::WEIGHT_PER_MICROS.ref_time(), + w.ref_time() >= 100u64 * constants::WEIGHT_REF_TIME_PER_MICROS, "Weight should be at least 100 µs." ); // At most 50 ms. assert!( - w.ref_time() <= 50u64 * constants::WEIGHT_PER_MILLIS.ref_time(), + w.ref_time() <= 50u64 * constants::WEIGHT_REF_TIME_PER_MILLIS, "Weight should be at most 50 ms." ); } diff --git a/runtime/pangolin/src/weights/extrinsic_weights.rs b/runtime/pangolin/src/weights/extrinsic_weights.rs index 3ce6b73d..48868670 100644 --- a/runtime/pangolin/src/weights/extrinsic_weights.rs +++ b/runtime/pangolin/src/weights/extrinsic_weights.rs @@ -23,7 +23,7 @@ pub mod constants { parameter_types! { /// Executing a NO-OP `System::remarks` Extrinsic. - pub const ExtrinsicBaseWeight: Weight = constants::WEIGHT_PER_NANOS.saturating_mul(125_000); + pub const ExtrinsicBaseWeight: Weight = Weight::from_ref_time(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(125_000)); } #[cfg(test)] @@ -39,12 +39,12 @@ pub mod constants { // At least 10 µs. assert!( - w.ref_time() >= 10u64 * constants::WEIGHT_PER_MICROS.ref_time(), + w.ref_time() >= 10u64 * constants::WEIGHT_REF_TIME_PER_MICROS, "Weight should be at least 10 µs." ); // At most 1 ms. assert!( - w.ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + w.ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Weight should be at most 1 ms." ); } diff --git a/runtime/pangolin/src/weights/paritydb_weights.rs b/runtime/pangolin/src/weights/paritydb_weights.rs index dca7d348..4338d928 100644 --- a/runtime/pangolin/src/weights/paritydb_weights.rs +++ b/runtime/pangolin/src/weights/paritydb_weights.rs @@ -25,8 +25,8 @@ pub mod constants { /// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights /// are available for brave runtime engineers who may want to try this out as default. pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight { - read: 8_000 * constants::WEIGHT_PER_NANOS.ref_time(), - write: 50_000 * constants::WEIGHT_PER_NANOS.ref_time(), + read: 8_000 * constants::WEIGHT_REF_TIME_PER_NANOS, + write: 50_000 * constants::WEIGHT_REF_TIME_PER_NANOS, }; } @@ -42,20 +42,20 @@ pub mod constants { fn sane() { // At least 1 µs. assert!( - W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Read weight should be at least 1 µs." ); assert!( - W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Write weight should be at least 1 µs." ); // At most 1 ms. assert!( - W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Read weight should be at most 1 ms." ); assert!( - W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Write weight should be at most 1 ms." ); } diff --git a/runtime/pangolin/src/weights/rocksdb_weights.rs b/runtime/pangolin/src/weights/rocksdb_weights.rs index 87867ebf..1d115d96 100644 --- a/runtime/pangolin/src/weights/rocksdb_weights.rs +++ b/runtime/pangolin/src/weights/rocksdb_weights.rs @@ -25,8 +25,8 @@ pub mod constants { /// By default, Substrate uses `RocksDB`, so this will be the weight used throughout /// the runtime. pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight { - read: 25_000 * constants::WEIGHT_PER_NANOS.ref_time(), - write: 100_000 * constants::WEIGHT_PER_NANOS.ref_time(), + read: 25_000 * constants::WEIGHT_REF_TIME_PER_NANOS, + write: 100_000 * constants::WEIGHT_REF_TIME_PER_NANOS, }; } @@ -42,20 +42,20 @@ pub mod constants { fn sane() { // At least 1 µs. assert!( - W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Read weight should be at least 1 µs." ); assert!( - W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Write weight should be at least 1 µs." ); // At most 1 ms. assert!( - W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Read weight should be at most 1 ms." ); assert!( - W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Write weight should be at most 1 ms." ); }