From d07d8ec9bd8d983f72902a5c95af52572277b422 Mon Sep 17 00:00:00 2001 From: cheme Date: Mon, 4 Jul 2022 15:11:31 +0200 Subject: [PATCH 1/8] init, using polkadot master --- Cargo.lock | 768 ++++++++++-------- .../runtimes/assets/statemine/Cargo.toml | 1 + .../runtimes/assets/statemine/src/lib.rs | 69 +- .../runtimes/assets/statemint/Cargo.toml | 1 + .../runtimes/assets/statemint/src/lib.rs | 69 +- 5 files changed, 585 insertions(+), 323 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 950cca9602f..b2d08add631 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -392,7 +392,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "miniz_oxide", - "object", + "object 0.27.1", "rustc-demangle", ] @@ -432,7 +432,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "beefy-primitives", "fnv", @@ -466,7 +466,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -486,7 +486,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "beefy-primitives", "sp-api", @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bp-runtime", "finality-grandpa", @@ -702,7 +702,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bp-runtime", "frame-support", @@ -714,7 +714,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bitvec", "bp-runtime", @@ -731,7 +731,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bp-messages", "bp-runtime", @@ -749,7 +749,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -766,7 +766,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "frame-support", "hash-db", @@ -784,7 +784,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -799,7 +799,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -814,7 +814,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -1286,59 +1286,60 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.82.3" +version = "0.85.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75" +checksum = "7901fbba05decc537080b07cb3f1cadf53be7b7602ca8255786288a8692ae29a" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.82.3" +version = "0.85.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b" +checksum = "37ba1b45d243a4a28e12d26cd5f2507da74e77c45927d40de8b6ffbf088b46b5" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", + "cranelift-isle", "gimli", "log", - "regalloc", + "regalloc2", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.82.3" +version = "0.85.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24" +checksum = "54cc30032171bf230ce22b99c07c3a1de1221cb5375bd6dbe6dbe77d0eed743c" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.82.3" +version = "0.85.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc" +checksum = "a23f2672426d2bb4c9c3ef53e023076cfc4d8922f0eeaebaf372c92fae8b5c69" [[package]] name = "cranelift-entity" -version = "0.82.3" +version = "0.85.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf" +checksum = "886c59a5e0de1f06dbb7da80db149c75de10d5e2caca07cdd9fef8a5918a6336" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.82.3" +version = "0.85.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce" +checksum = "ace74eeca11c439a9d4ed1a5cb9df31a54cd0f7fbddf82c8ce4ea8e9ad2a8fe0" dependencies = [ "cranelift-codegen", "log", @@ -1346,11 +1347,17 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cranelift-isle" +version = "0.85.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db1ae52a5cc2cad0d86fdd3dcb16b7217d2f1e65ab4f5814aa4f014ad335fa43" + [[package]] name = "cranelift-native" -version = "0.82.3" +version = "0.85.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501241b0cdf903412ec9075385ac9f2b1eb18a89044d1538e97fab603231f70c" +checksum = "dadcfb7852900780d37102bce5698bcd401736403f07b52e714ff7a180e0e22f" dependencies = [ "cranelift-codegen", "libc", @@ -1359,9 +1366,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.82.3" +version = "0.85.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d9e4211bbc3268042a96dd4de5bd979cda22434991d035f5f8eacba987fad2" +checksum = "c84e3410960389110b88f97776f39f6d2c8becdaa4cd59e390e6b76d9d0e7190" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2814,7 +2821,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", ] @@ -2832,7 +2839,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -2854,7 +2861,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "Inflector", "chrono", @@ -2905,7 +2912,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2916,7 +2923,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2932,7 +2939,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -2960,7 +2967,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "bitflags", "frame-metadata", @@ -2990,7 +2997,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -3002,7 +3009,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -3014,7 +3021,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "proc-macro2", "quote", @@ -3024,7 +3031,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "log", @@ -3041,7 +3048,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -3056,7 +3063,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "sp-api", @@ -3065,7 +3072,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "sp-api", @@ -3235,6 +3242,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generic-array" version = "0.12.4" @@ -3705,6 +3721,12 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" +[[package]] +name = "io-lifetimes" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb" + [[package]] name = "ip_network" version = "0.4.1" @@ -3927,7 +3949,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" [[package]] name = "kusama-runtime" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "beefy-primitives", "bitvec", @@ -4019,7 +4041,7 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "frame-support", "polkadot-primitives", @@ -4090,9 +4112,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.122" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libloading" @@ -4774,6 +4796,12 @@ version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" +[[package]] +name = "linux-raw-sys" +version = "0.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" + [[package]] name = "lock_api" version = "0.4.6" @@ -5355,8 +5383,18 @@ name = "object" version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +dependencies = [ + "memchr", +] + +[[package]] +name = "object" +version = "0.28.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ "crc32fast", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -5394,7 +5432,7 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "orchestra" version = "0.0.1" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "async-trait", "dyn-clonable", @@ -5410,7 +5448,7 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" version = "0.0.1" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "expander 0.0.6", "itertools", @@ -5448,7 +5486,7 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -5465,7 +5503,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5479,7 +5517,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -5495,7 +5533,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -5511,7 +5549,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -5526,7 +5564,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5550,7 +5588,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5570,7 +5608,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5585,7 +5623,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "beefy-primitives", "frame-support", @@ -5601,7 +5639,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5624,7 +5662,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5642,7 +5680,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5659,7 +5697,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5681,7 +5719,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bitvec", "bp-message-dispatch", @@ -5702,7 +5740,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5747,7 +5785,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5764,7 +5802,7 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "bitflags", "frame-benchmarking", @@ -5791,7 +5829,7 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "bitflags", "parity-scale-codec", @@ -5806,7 +5844,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "proc-macro2", "quote", @@ -5816,7 +5854,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "jsonrpsee", "pallet-contracts-primitives", @@ -5833,7 +5871,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "pallet-contracts-primitives", "parity-scale-codec", @@ -5846,7 +5884,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5862,7 +5900,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5885,7 +5923,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5898,7 +5936,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5916,7 +5954,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5931,7 +5969,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5954,7 +5992,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5970,7 +6008,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5990,7 +6028,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6007,7 +6045,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6024,7 +6062,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -6042,7 +6080,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -6057,7 +6095,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6072,7 +6110,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -6089,7 +6127,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6108,7 +6146,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -6125,7 +6163,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6148,7 +6186,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6164,7 +6202,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6179,7 +6217,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -6193,7 +6231,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6208,7 +6246,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6224,7 +6262,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -6245,7 +6283,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6261,7 +6299,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -6275,7 +6313,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6298,7 +6336,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6309,16 +6347,32 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "log", "sp-arithmetic", ] +[[package]] +name = "pallet-state-trie-migration" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" +dependencies = [ + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -6347,7 +6401,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6365,7 +6419,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6384,7 +6438,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-support", "frame-system", @@ -6400,7 +6454,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6415,7 +6469,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6426,7 +6480,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6443,7 +6497,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6458,7 +6512,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6474,7 +6528,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-benchmarking", "frame-support", @@ -6489,7 +6543,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "frame-support", "frame-system", @@ -6507,7 +6561,7 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "frame-benchmarking", "frame-support", @@ -6827,7 +6881,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.32.0", ] [[package]] @@ -7020,7 +7074,7 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "futures", "polkadot-node-network-protocol", @@ -7035,7 +7089,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "futures", "polkadot-node-network-protocol", @@ -7049,7 +7103,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "derive_more", "fatality", @@ -7072,7 +7126,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "fatality", "futures", @@ -7093,7 +7147,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "clap 3.2.6", "frame-benchmarking-cli", @@ -7118,7 +7172,7 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -7158,7 +7212,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "always-assert", "fatality", @@ -7179,7 +7233,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -7192,7 +7246,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "derive_more", "fatality", @@ -7215,7 +7269,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -7229,7 +7283,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "futures", "futures-timer", @@ -7249,7 +7303,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "always-assert", "async-trait", @@ -7270,7 +7324,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "futures", "parity-scale-codec", @@ -7288,7 +7342,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bitvec", "derive_more", @@ -7317,7 +7371,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bitvec", "futures", @@ -7337,7 +7391,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bitvec", "fatality", @@ -7356,7 +7410,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "futures", "polkadot-node-subsystem", @@ -7371,7 +7425,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "async-trait", "futures", @@ -7389,7 +7443,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "futures", "polkadot-node-subsystem", @@ -7404,7 +7458,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "futures", "futures-timer", @@ -7421,7 +7475,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "fatality", "futures", @@ -7440,7 +7494,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "async-trait", "futures", @@ -7457,7 +7511,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bitvec", "fatality", @@ -7475,7 +7529,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "always-assert", "assert_matches", @@ -7489,6 +7543,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-parachain 0.9.25", "rand 0.8.5", + "rayon", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", @@ -7506,7 +7561,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "futures", "polkadot-node-primitives", @@ -7522,7 +7577,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "futures", "memory-lru", @@ -7539,7 +7594,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "async-std", "lazy_static", @@ -7557,7 +7612,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bs58", "futures", @@ -7576,7 +7631,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "async-trait", "derive_more", @@ -7597,7 +7652,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bounded-vec", "futures", @@ -7619,7 +7674,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7629,7 +7684,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "async-trait", "futures", @@ -7647,7 +7702,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "derive_more", "futures", @@ -7666,7 +7721,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "async-trait", "derive_more", @@ -7699,7 +7754,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "futures", "futures-timer", @@ -7721,7 +7776,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "derive_more", "frame-support", @@ -7815,7 +7870,7 @@ dependencies = [ [[package]] name = "polkadot-performance-test" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "env_logger 0.9.0", "kusama-runtime", @@ -7830,7 +7885,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bitvec", "frame-system", @@ -7860,7 +7915,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7892,7 +7947,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "beefy-primitives", "bitvec", @@ -7977,7 +8032,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "beefy-primitives", "bitvec", @@ -8024,7 +8079,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "frame-support", "polkadot-primitives", @@ -8036,7 +8091,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bs58", "parity-scale-codec", @@ -8048,7 +8103,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "bitflags", "bitvec", @@ -8091,7 +8146,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "async-trait", "beefy-gadget", @@ -8194,7 +8249,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -8215,7 +8270,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -8225,7 +8280,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -8250,7 +8305,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "beefy-primitives", "bitvec", @@ -8311,7 +8366,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "frame-benchmarking", "frame-system", @@ -8455,7 +8510,7 @@ dependencies = [ [[package]] name = "prioritized-metered-channel" version = "0.2.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "coarsetime", "crossbeam-queue", @@ -8899,13 +8954,14 @@ dependencies = [ ] [[package]] -name = "regalloc" -version = "0.0.34" +name = "regalloc2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" +checksum = "4a8d23b35d7177df3b9d31ed8a9ab4bf625c668be77a319d4f5efd4a5257701c" dependencies = [ + "fxhash", "log", - "rustc-hash", + "slice-group-by", "smallvec", ] @@ -8950,7 +9006,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -9078,7 +9134,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -9155,7 +9211,7 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "frame-support", "polkadot-primitives", @@ -9227,18 +9283,32 @@ dependencies = [ [[package]] name = "rustix" -version = "0.33.6" +version = "0.33.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac32d9fc97153ca55305284cb6c2dcbb84e1fc6d7ac13392cea02222f2d8741" +checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.5.3", "libc", - "linux-raw-sys", + "linux-raw-sys 0.0.42", "winapi", ] +[[package]] +name = "rustix" +version = "0.35.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51cc38aa10f6bbb377ed28197aa052aa4e2b762c22be9d3153d01822587e787" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 0.7.2", + "libc", + "linux-raw-sys 0.0.46", + "windows-sys 0.36.1", +] + [[package]] name = "rustls" version = "0.20.2" @@ -9336,7 +9406,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "log", "sp-core", @@ -9347,7 +9417,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "futures", @@ -9374,7 +9444,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "futures-timer", @@ -9397,7 +9467,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9413,7 +9483,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -9430,7 +9500,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9441,7 +9511,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "chrono", "clap 3.2.6", @@ -9480,7 +9550,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "fnv", "futures", @@ -9508,7 +9578,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "hash-db", "kvdb", @@ -9533,7 +9603,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "futures", @@ -9557,7 +9627,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "futures", @@ -9586,7 +9656,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "fork-tree", @@ -9629,7 +9699,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "jsonrpsee", @@ -9651,7 +9721,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9664,7 +9734,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "futures", @@ -9689,7 +9759,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "sc-client-api", "sp-authorship", @@ -9700,7 +9770,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "lazy_static", "lru 0.7.7", @@ -9727,7 +9797,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "environmental", "parity-scale-codec", @@ -9744,7 +9814,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "log", "parity-scale-codec", @@ -9759,13 +9829,15 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "cfg-if 1.0.0", "libc", "log", + "once_cell", "parity-scale-codec", "parity-wasm 0.42.2", + "rustix 0.35.7", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -9777,7 +9849,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "ahash", "async-trait", @@ -9817,7 +9889,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "finality-grandpa", "futures", @@ -9838,7 +9910,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "ansi_term", "futures", @@ -9855,7 +9927,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "hex", @@ -9870,7 +9942,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "asynchronous-codec", @@ -9922,7 +9994,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "libp2p", @@ -9935,7 +10007,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "ahash", "futures", @@ -9952,7 +10024,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "libp2p", @@ -9972,7 +10044,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "bitflags", "either", @@ -10001,7 +10073,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "bytes", "fnv", @@ -10029,7 +10101,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "libp2p", @@ -10042,7 +10114,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10051,7 +10123,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "hash-db", @@ -10081,7 +10153,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "jsonrpsee", @@ -10104,7 +10176,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "jsonrpsee", @@ -10117,7 +10189,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "directories", @@ -10182,7 +10254,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "log", "parity-scale-codec", @@ -10196,7 +10268,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10215,7 +10287,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "libc", @@ -10234,7 +10306,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "chrono", "futures", @@ -10252,7 +10324,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "ansi_term", "atty", @@ -10283,7 +10355,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10294,7 +10366,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "futures-timer", @@ -10321,7 +10393,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "log", @@ -10334,7 +10406,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "futures-timer", @@ -10770,10 +10842,16 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +[[package]] +name = "slice-group-by" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" + [[package]] name = "slot-range-helper" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "enumn", "parity-scale-codec", @@ -10849,7 +10927,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "hash-db", "log", @@ -10866,7 +10944,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "blake2", "proc-macro-crate", @@ -10878,7 +10956,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -10891,7 +10969,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "integer-sqrt", "num-traits", @@ -10906,7 +10984,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -10919,7 +10997,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "parity-scale-codec", @@ -10931,7 +11009,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "sp-api", @@ -10943,7 +11021,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "log", @@ -10961,7 +11039,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "futures", @@ -10980,7 +11058,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "parity-scale-codec", @@ -10998,7 +11076,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "merlin", @@ -11021,7 +11099,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -11035,7 +11113,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -11048,7 +11126,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "base58", "bitflags", @@ -11094,7 +11172,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "blake2", "byteorder", @@ -11108,7 +11186,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "proc-macro2", "quote", @@ -11119,7 +11197,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -11128,7 +11206,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "proc-macro2", "quote", @@ -11138,7 +11216,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "environmental", "parity-scale-codec", @@ -11149,7 +11227,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "finality-grandpa", "log", @@ -11167,7 +11245,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -11181,7 +11259,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "hash-db", @@ -11206,7 +11284,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "lazy_static", "sp-core", @@ -11217,7 +11295,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "futures", @@ -11234,7 +11312,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "thiserror", "zstd", @@ -11243,7 +11321,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "log", "parity-scale-codec", @@ -11258,7 +11336,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -11272,7 +11350,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "sp-api", "sp-core", @@ -11282,7 +11360,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "backtrace", "lazy_static", @@ -11292,7 +11370,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "rustc-hash", "serde", @@ -11302,7 +11380,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "either", "hash256-std-hasher", @@ -11324,7 +11402,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11341,7 +11419,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "Inflector", "proc-macro-crate", @@ -11353,7 +11431,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "log", "parity-scale-codec", @@ -11367,7 +11445,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "serde", "serde_json", @@ -11376,7 +11454,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -11390,7 +11468,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "scale-info", @@ -11401,7 +11479,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "hash-db", "log", @@ -11423,12 +11501,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11441,7 +11519,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "log", "sp-core", @@ -11454,7 +11532,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "futures-timer", @@ -11470,7 +11548,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "sp-std", @@ -11482,7 +11560,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "sp-api", "sp-runtime", @@ -11491,7 +11569,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "log", @@ -11507,7 +11585,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "hash-db", "memory-db", @@ -11523,7 +11601,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11540,7 +11618,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -11551,7 +11629,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "impl-trait-for-tuples", "log", @@ -11621,6 +11699,7 @@ dependencies = [ "pallet-multisig", "pallet-proxy", "pallet-session", + "pallet-state-trie-migration", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -11686,6 +11765,7 @@ dependencies = [ "pallet-multisig", "pallet-proxy", "pallet-session", + "pallet-state-trie-migration", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -11830,7 +11910,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "platforms", ] @@ -11838,7 +11918,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -11859,7 +11939,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures-util", "hyper", @@ -11872,7 +11952,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "jsonrpsee", "log", @@ -11893,7 +11973,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "async-trait", "futures", @@ -11919,7 +11999,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "futures", "substrate-test-utils-derive", @@ -11929,7 +12009,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11940,7 +12020,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "ansi_term", "build-helper", @@ -12048,7 +12128,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" [[package]] name = "test-runtime-constants" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "frame-support", "polkadot-primitives", @@ -12337,7 +12417,7 @@ dependencies = [ [[package]] name = "tracing-gum" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -12348,7 +12428,7 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -12477,7 +12557,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#622f532e605270c9d4f932aea666073e409e02f9" +source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ "clap 3.2.6", "jsonrpsee", @@ -12845,15 +12925,18 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.83.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" +checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7" +dependencies = [ + "indexmap", +] [[package]] name = "wasmtime" -version = "0.35.3" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ffb4705016d5ca91e18a72ed6822dab50e6d5ddd7045461b17ef19071cdef1" +checksum = "e76e2b2833bb0ece666ccdbed7b71b617d447da11f1bb61f4f2bab2648f745ee" dependencies = [ "anyhow", "backtrace", @@ -12863,7 +12946,7 @@ dependencies = [ "lazy_static", "libc", "log", - "object", + "object 0.28.4", "once_cell", "paste", "psm", @@ -12882,9 +12965,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.35.3" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c6ab24291fa7cb3a181f5669f6c72599b7ef781669759b45c7828c5999d0c0" +checksum = "743a9f142d93318262d7e1fe329394ff2e8f86a1df45ae5e4f0eedba215ca5ce" dependencies = [ "anyhow", "base64", @@ -12892,7 +12975,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix", + "rustix 0.33.7", "serde", "sha2 0.9.8", "toml", @@ -12902,9 +12985,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.35.3" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04c810078a491b7bc4866ebe045f714d2b95e6b539e1f64009a4a7606be11de" +checksum = "5dc0f80afa1ce97083a7168e6b6948d015d6237369e9f4a511d38c9c4ac8fbb9" dependencies = [ "anyhow", "cranelift-codegen", @@ -12915,7 +12998,7 @@ dependencies = [ "gimli", "log", "more-asserts", - "object", + "object 0.28.4", "target-lexicon", "thiserror", "wasmparser", @@ -12924,9 +13007,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.35.3" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61448266ea164b1ac406363cdcfac81c7c44db4d94c7a81c8620ac6c5c6cdf59" +checksum = "0816d9365196f1f447060087e0f87239ccded830bd54970a1168b0c9c8e824c9" dependencies = [ "anyhow", "cranelift-entity", @@ -12934,7 +13017,7 @@ dependencies = [ "indexmap", "log", "more-asserts", - "object", + "object 0.28.4", "serde", "target-lexicon", "thiserror", @@ -12944,9 +13027,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.35.3" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "156b4623c6b0d4b8c24afb846c20525922f538ef464cc024abab7ea8de2109a2" +checksum = "5c687f33cfa0f89ec1646929d0ff102087052cf9f0d15533de56526b0da0d1b3" dependencies = [ "addr2line", "anyhow", @@ -12955,10 +13038,10 @@ dependencies = [ "cpp_demangle", "gimli", "log", - "object", + "object 0.28.4", "region", "rustc-demangle", - "rustix", + "rustix 0.33.7", "serde", "target-lexicon", "thiserror", @@ -12970,20 +13053,20 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "0.35.3" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5dc31f811760a6c76b2672c404866fd19b75e5fb3b0075a3e377a6846490654" +checksum = "b252d1d025f94f3954ba2111f12f3a22826a0764a11c150c2d46623115a69e27" dependencies = [ "lazy_static", - "object", - "rustix", + "object 0.28.4", + "rustix 0.33.7", ] [[package]] name = "wasmtime-runtime" -version = "0.35.3" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f907beaff69d4d920fa4688411ee4cc75c0f01859e424677f9e426e2ef749864" +checksum = "ace251693103c9facbbd7df87a29a75e68016e48bc83c09133f2fda6b575e0ab" dependencies = [ "anyhow", "backtrace", @@ -12998,7 +13081,7 @@ dependencies = [ "more-asserts", "rand 0.8.5", "region", - "rustix", + "rustix 0.33.7", "thiserror", "wasmtime-environ", "wasmtime-jit-debug", @@ -13007,9 +13090,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "0.35.3" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514ef0e5fd197b9609dc9eb74beba0c84d5a12b2417cbae55534633329ba4852" +checksum = "d129b0487a95986692af8708ffde9c50b0568dcefd79200941d475713b4f40bb" dependencies = [ "cranelift-entity", "serde", @@ -13058,7 +13141,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "beefy-primitives", "bitvec", @@ -13146,7 +13229,7 @@ dependencies = [ [[package]] name = "westend-runtime-constants" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "frame-support", "polkadot-primitives", @@ -13295,6 +13378,19 @@ dependencies = [ "windows_x86_64_msvc 0.32.0", ] +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + [[package]] name = "windows_aarch64_msvc" version = "0.29.0" @@ -13307,6 +13403,12 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + [[package]] name = "windows_i686_gnu" version = "0.29.0" @@ -13319,6 +13421,12 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + [[package]] name = "windows_i686_msvc" version = "0.29.0" @@ -13331,6 +13439,12 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + [[package]] name = "windows_x86_64_gnu" version = "0.29.0" @@ -13343,6 +13457,12 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + [[package]] name = "windows_x86_64_msvc" version = "0.29.0" @@ -13355,6 +13475,12 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "winreg" version = "0.7.0" @@ -13387,7 +13513,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -13401,7 +13527,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "frame-support", "frame-system", @@ -13421,7 +13547,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.25" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "frame-benchmarking", "frame-support", @@ -13439,7 +13565,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#595ed6e9eaf83134eb4227e161fd0dea1e3f5d92" +source = "git+https://github.com/paritytech/polkadot?branch=master#d22eb62fe40e55e15eb91d375f48cc540d83a47e" dependencies = [ "Inflector", "proc-macro2", @@ -13484,18 +13610,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.10.2+zstd.1.5.2" +version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.6+zstd.1.5.2" +version = "5.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" dependencies = [ "libc", "zstd-sys", @@ -13503,9 +13629,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.3+zstd.1.5.2" +version = "2.0.1+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" +checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" dependencies = [ "cc", "libc", diff --git a/parachains/runtimes/assets/statemine/Cargo.toml b/parachains/runtimes/assets/statemine/Cargo.toml index 0dd770e38b0..4b7853ffda7 100644 --- a/parachains/runtimes/assets/statemine/Cargo.toml +++ b/parachains/runtimes/assets/statemine/Cargo.toml @@ -46,6 +46,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +pallet-state-trie-migration = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } # Polkadot kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } diff --git a/parachains/runtimes/assets/statemine/src/lib.rs b/parachains/runtimes/assets/statemine/src/lib.rs index a7e3f0ef0d7..49c75a78dd3 100644 --- a/parachains/runtimes/assets/statemine/src/lib.rs +++ b/parachains/runtimes/assets/statemine/src/lib.rs @@ -47,7 +47,7 @@ use codec::{Decode, Encode, MaxEncodedLen}; use constants::{currency::*, fee::WeightToFee}; use frame_support::{ construct_runtime, parameter_types, - traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter}, + traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter, SortedMembers}, weights::{ConstantMultiplier, DispatchClass, Weight}, PalletId, RuntimeDebug, }; @@ -583,6 +583,8 @@ construct_runtime!( // The main stage. Assets: pallet_assets::{Pallet, Call, Storage, Event} = 50, Uniques: pallet_uniques::{Pallet, Call, Storage, Event} = 51, + + StateTrieMigration: pallet_state_trie_migration = 52, } ); @@ -840,3 +842,68 @@ cumulus_pallet_parachain_system::register_validate_block! { BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, CheckInherents = CheckInherents, } + +parameter_types! { + // The deposit configuration for the singed migration. Specially if you want to allow any signed account to do the migration (see `SignedFilter`, these deposits should be high) + pub const MigrationSignedDepositPerItem: Balance = 1 * CENTS; + pub const MigrationSignedDepositBase: Balance = 20 * DOLLARS; + pub const MigrationMaxKeyLen: u32 = 512; +} + +impl pallet_state_trie_migration::Config for Runtime { + type Event = Event; + type Currency = Balances; + type SignedDepositPerItem = MigrationSignedDepositPerItem; + type SignedDepositBase = MigrationSignedDepositBase; + // An origin that can control the whole pallet: should be Root, or a part of your council. + type ControlOrigin = frame_system::EnsureSignedBy; + // specific account for the migration, can trigger the signed migrations. + type SignedFilter = frame_system::EnsureSignedBy; + //type SignedFilter = frame_system::EnsureSigned; + + // Replace this with weight based on your runtime. + type WeightInfo = weights::pallet_state_trie_migration::WeightInfo; + + type MaxKeyLen = MigrationMaxKeyLen; +} + +pub struct MigController; +pub struct RootMigController; + +const KEY_ROOT_MIG_CONTROLLER: [u8; 32] = [ + 82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68, + 232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73, +]; + +const KEY_MIG_CONTROLLER: [u8; 32] = [ + 82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68, + 232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73, +]; + +impl SortedMembers for RootMigController { + fn sorted_members() -> Vec { + // hardcoded key of controller for manual migration + vec![KEY_ROOT_MIG_CONTROLLER.into()] + } +} + +impl SortedMembers for MigController { + fn sorted_members() -> Vec { + // hardcoded key of controller for manual migration + vec![KEY_MIG_CONTROLLER.into()] + } +} + +#[test] +fn ensure_key_ss58() { + use sp_core::crypto::Ss58Codec; + let acc = + AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap(); + let acc: &[u8] = acc.as_ref(); + assert_eq!(acc, &KEY_MIG_CONTROLLER[..]); + let acc = + AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap(); + let acc: &[u8] = acc.as_ref(); + assert_eq!(acc, &KEY_ROOT_MIG_CONTROLLER[..]); + // panic!("{:?}", acc); +} diff --git a/parachains/runtimes/assets/statemint/Cargo.toml b/parachains/runtimes/assets/statemint/Cargo.toml index 268f90d0bca..1615dba8ac5 100644 --- a/parachains/runtimes/assets/statemint/Cargo.toml +++ b/parachains/runtimes/assets/statemint/Cargo.toml @@ -33,6 +33,7 @@ pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-fe pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +pallet-state-trie-migration = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } diff --git a/parachains/runtimes/assets/statemint/src/lib.rs b/parachains/runtimes/assets/statemint/src/lib.rs index 54acdc64358..c9be7482296 100644 --- a/parachains/runtimes/assets/statemint/src/lib.rs +++ b/parachains/runtimes/assets/statemint/src/lib.rs @@ -76,7 +76,7 @@ use codec::{Decode, Encode, MaxEncodedLen}; use constants::{currency::*, fee::WeightToFee}; use frame_support::{ construct_runtime, parameter_types, - traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter}, + traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter, SortedMembers}, weights::{ConstantMultiplier, DispatchClass, Weight}, PalletId, RuntimeDebug, }; @@ -613,6 +613,8 @@ construct_runtime!( // The main stage. Assets: pallet_assets::{Pallet, Call, Storage, Event} = 50, Uniques: pallet_uniques::{Pallet, Call, Storage, Event} = 51, + + StateTrieMigration: pallet_state_trie_migration = 52, } ); @@ -869,3 +871,68 @@ cumulus_pallet_parachain_system::register_validate_block! { BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, CheckInherents = CheckInherents, } + +parameter_types! { + // The deposit configuration for the singed migration. Specially if you want to allow any signed account to do the migration (see `SignedFilter`, these deposits should be high) + pub const MigrationSignedDepositPerItem: Balance = 1 * CENTS; + pub const MigrationSignedDepositBase: Balance = 20 * DOLLARS; + pub const MigrationMaxKeyLen: u32 = 512; +} + +impl pallet_state_trie_migration::Config for Runtime { + type Event = Event; + type Currency = Balances; + type SignedDepositPerItem = MigrationSignedDepositPerItem; + type SignedDepositBase = MigrationSignedDepositBase; + // An origin that can control the whole pallet: should be Root, or a part of your council. + type ControlOrigin = frame_system::EnsureSignedBy; + // specific account for the migration, can trigger the signed migrations. + type SignedFilter = frame_system::EnsureSignedBy; + //type SignedFilter = frame_system::EnsureSigned; + + // Replace this with weight based on your runtime. + type WeightInfo = weights::pallet_state_trie_migration::WeightInfo; + + type MaxKeyLen = MigrationMaxKeyLen; +} + +pub struct MigController; +pub struct RootMigController; + +const KEY_ROOT_MIG_CONTROLLER: [u8; 32] = [ + 82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68, + 232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73, +]; + +const KEY_MIG_CONTROLLER: [u8; 32] = [ + 82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68, + 232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73, +]; + +impl SortedMembers for RootMigController { + fn sorted_members() -> Vec { + // hardcoded key of controller for manual migration + vec![KEY_ROOT_MIG_CONTROLLER.into()] + } +} + +impl SortedMembers for MigController { + fn sorted_members() -> Vec { + // hardcoded key of controller for manual migration + vec![KEY_MIG_CONTROLLER.into()] + } +} + +#[test] +fn ensure_key_ss58() { + use sp_core::crypto::Ss58Codec; + let acc = + AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap(); + let acc: &[u8] = acc.as_ref(); + assert_eq!(acc, &KEY_MIG_CONTROLLER[..]); + let acc = + AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap(); + let acc: &[u8] = acc.as_ref(); + assert_eq!(acc, &KEY_ROOT_MIG_CONTROLLER[..]); + // panic!("{:?}", acc); +} From 856aa862c6f511b6ac01582b4b647ae93f7d7971 Mon Sep 17 00:00:00 2001 From: cheme Date: Mon, 4 Jul 2022 15:22:02 +0200 Subject: [PATCH 2/8] version update --- parachains/runtimes/assets/statemine/src/lib.rs | 4 ++-- parachains/runtimes/assets/statemint/src/lib.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parachains/runtimes/assets/statemine/src/lib.rs b/parachains/runtimes/assets/statemine/src/lib.rs index 49c75a78dd3..c1852ebda10 100644 --- a/parachains/runtimes/assets/statemine/src/lib.rs +++ b/parachains/runtimes/assets/statemine/src/lib.rs @@ -85,11 +85,11 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("statemine"), impl_name: create_runtime_str!("statemine"), authoring_version: 1, - spec_version: 9220, + spec_version: 9221, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 6, - state_version: 0, + state_version: 1, }; /// The version information used to identify this runtime when compiled natively. diff --git a/parachains/runtimes/assets/statemint/src/lib.rs b/parachains/runtimes/assets/statemint/src/lib.rs index c9be7482296..79ed34c9518 100644 --- a/parachains/runtimes/assets/statemint/src/lib.rs +++ b/parachains/runtimes/assets/statemint/src/lib.rs @@ -115,11 +115,11 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("statemint"), impl_name: create_runtime_str!("statemint"), authoring_version: 1, - spec_version: 9220, + spec_version: 9221, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 6, - state_version: 0, + state_version: 1, }; /// The version information used to identify this runtime when compiled natively. From 2a63c7ce27c196e45d09c7949aa92868ef07551a Mon Sep 17 00:00:00 2001 From: cheme Date: Mon, 4 Jul 2022 16:37:34 +0200 Subject: [PATCH 3/8] weights copy pasted from substrate --- Cargo.lock | 2 +- .../runtimes/assets/statemine/Cargo.toml | 3 +- .../runtimes/assets/statemine/src/lib.rs | 54 +++++++++++++- .../runtimes/assets/statemint/Cargo.toml | 1 - .../runtimes/assets/statemint/src/lib.rs | 74 +------------------ 5 files changed, 58 insertions(+), 76 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b2d08add631..ad2db6abe81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6358,6 +6358,7 @@ name = "pallet-state-trie-migration" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#279593d87f103fa5e10c9751a97b1584f3ad79d6" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "log", @@ -11765,7 +11766,6 @@ dependencies = [ "pallet-multisig", "pallet-proxy", "pallet-session", - "pallet-state-trie-migration", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", diff --git a/parachains/runtimes/assets/statemine/Cargo.toml b/parachains/runtimes/assets/statemine/Cargo.toml index 4b7853ffda7..959f170a7f7 100644 --- a/parachains/runtimes/assets/statemine/Cargo.toml +++ b/parachains/runtimes/assets/statemine/Cargo.toml @@ -46,7 +46,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-state-trie-migration = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-state-trie-migration = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } @@ -124,6 +124,7 @@ std = [ "pallet-multisig/std", "pallet-proxy/std", "pallet-session/std", + "pallet-state-trie-migration/std", "pallet-timestamp/std", "pallet-transaction-payment-rpc-runtime-api/std", "pallet-transaction-payment/std", diff --git a/parachains/runtimes/assets/statemine/src/lib.rs b/parachains/runtimes/assets/statemine/src/lib.rs index c1852ebda10..d11111c087d 100644 --- a/parachains/runtimes/assets/statemine/src/lib.rs +++ b/parachains/runtimes/assets/statemine/src/lib.rs @@ -846,7 +846,7 @@ cumulus_pallet_parachain_system::register_validate_block! { parameter_types! { // The deposit configuration for the singed migration. Specially if you want to allow any signed account to do the migration (see `SignedFilter`, these deposits should be high) pub const MigrationSignedDepositPerItem: Balance = 1 * CENTS; - pub const MigrationSignedDepositBase: Balance = 20 * DOLLARS; + pub const MigrationSignedDepositBase: Balance = 2_000 * CENTS; pub const MigrationMaxKeyLen: u32 = 512; } @@ -862,7 +862,7 @@ impl pallet_state_trie_migration::Config for Runtime { //type SignedFilter = frame_system::EnsureSigned; // Replace this with weight based on your runtime. - type WeightInfo = weights::pallet_state_trie_migration::WeightInfo; + type WeightInfo = weights_mig::SubstrateWeight; type MaxKeyLen = MigrationMaxKeyLen; } @@ -907,3 +907,53 @@ fn ensure_key_ss58() { assert_eq!(acc, &KEY_ROOT_MIG_CONTROLLER[..]); // panic!("{:?}", acc); } + +pub mod weights_mig { + use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; + use sp_std::marker::PhantomData; + use pallet_state_trie_migration::WeightInfo; + + + /// Weights for pallet_state_trie_migration using the Substrate node and recommended hardware. + pub struct SubstrateWeight(PhantomData); + impl WeightInfo for SubstrateWeight { + // Storage: StateTrieMigration SignedMigrationMaxLimits (r:1 w:0) + // Storage: StateTrieMigration MigrationProcess (r:1 w:1) + fn continue_migrate() -> Weight { + (19_019_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + // Storage: StateTrieMigration SignedMigrationMaxLimits (r:1 w:0) + fn continue_migrate_wrong_witness() -> Weight { + (1_874_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + } + fn migrate_custom_top_success() -> Weight { + (16_381_000 as Weight) + } + // Storage: unknown [0x666f6f] (r:1 w:1) + fn migrate_custom_top_fail() -> Weight { + (25_966_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn migrate_custom_child_success() -> Weight { + (16_712_000 as Weight) + } + // Storage: unknown [0x666f6f] (r:1 w:1) + fn migrate_custom_child_fail() -> Weight { + (29_885_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + // Storage: unknown [0x6b6579] (r:1 w:1) + fn process_top_key(v: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 0 + .saturating_add((2_000 as Weight).saturating_mul(v as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + } +} diff --git a/parachains/runtimes/assets/statemint/Cargo.toml b/parachains/runtimes/assets/statemint/Cargo.toml index 1615dba8ac5..268f90d0bca 100644 --- a/parachains/runtimes/assets/statemint/Cargo.toml +++ b/parachains/runtimes/assets/statemint/Cargo.toml @@ -33,7 +33,6 @@ pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-fe pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-state-trie-migration = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } diff --git a/parachains/runtimes/assets/statemint/src/lib.rs b/parachains/runtimes/assets/statemint/src/lib.rs index 79ed34c9518..6cbcca12d10 100644 --- a/parachains/runtimes/assets/statemint/src/lib.rs +++ b/parachains/runtimes/assets/statemint/src/lib.rs @@ -1,5 +1,4 @@ // Copyright (C) 2021-2022 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -76,7 +75,7 @@ use codec::{Decode, Encode, MaxEncodedLen}; use constants::{currency::*, fee::WeightToFee}; use frame_support::{ construct_runtime, parameter_types, - traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter, SortedMembers}, + traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter}, weights::{ConstantMultiplier, DispatchClass, Weight}, PalletId, RuntimeDebug, }; @@ -115,11 +114,11 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("statemint"), impl_name: create_runtime_str!("statemint"), authoring_version: 1, - spec_version: 9221, + spec_version: 9220, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 6, - state_version: 1, + state_version: 0, }; /// The version information used to identify this runtime when compiled natively. @@ -613,8 +612,6 @@ construct_runtime!( // The main stage. Assets: pallet_assets::{Pallet, Call, Storage, Event} = 50, Uniques: pallet_uniques::{Pallet, Call, Storage, Event} = 51, - - StateTrieMigration: pallet_state_trie_migration = 52, } ); @@ -871,68 +868,3 @@ cumulus_pallet_parachain_system::register_validate_block! { BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, CheckInherents = CheckInherents, } - -parameter_types! { - // The deposit configuration for the singed migration. Specially if you want to allow any signed account to do the migration (see `SignedFilter`, these deposits should be high) - pub const MigrationSignedDepositPerItem: Balance = 1 * CENTS; - pub const MigrationSignedDepositBase: Balance = 20 * DOLLARS; - pub const MigrationMaxKeyLen: u32 = 512; -} - -impl pallet_state_trie_migration::Config for Runtime { - type Event = Event; - type Currency = Balances; - type SignedDepositPerItem = MigrationSignedDepositPerItem; - type SignedDepositBase = MigrationSignedDepositBase; - // An origin that can control the whole pallet: should be Root, or a part of your council. - type ControlOrigin = frame_system::EnsureSignedBy; - // specific account for the migration, can trigger the signed migrations. - type SignedFilter = frame_system::EnsureSignedBy; - //type SignedFilter = frame_system::EnsureSigned; - - // Replace this with weight based on your runtime. - type WeightInfo = weights::pallet_state_trie_migration::WeightInfo; - - type MaxKeyLen = MigrationMaxKeyLen; -} - -pub struct MigController; -pub struct RootMigController; - -const KEY_ROOT_MIG_CONTROLLER: [u8; 32] = [ - 82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68, - 232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73, -]; - -const KEY_MIG_CONTROLLER: [u8; 32] = [ - 82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68, - 232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73, -]; - -impl SortedMembers for RootMigController { - fn sorted_members() -> Vec { - // hardcoded key of controller for manual migration - vec![KEY_ROOT_MIG_CONTROLLER.into()] - } -} - -impl SortedMembers for MigController { - fn sorted_members() -> Vec { - // hardcoded key of controller for manual migration - vec![KEY_MIG_CONTROLLER.into()] - } -} - -#[test] -fn ensure_key_ss58() { - use sp_core::crypto::Ss58Codec; - let acc = - AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap(); - let acc: &[u8] = acc.as_ref(); - assert_eq!(acc, &KEY_MIG_CONTROLLER[..]); - let acc = - AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap(); - let acc: &[u8] = acc.as_ref(); - assert_eq!(acc, &KEY_ROOT_MIG_CONTROLLER[..]); - // panic!("{:?}", acc); -} From 1c467febf7b37624ead6dc6a9e837101eea74a37 Mon Sep 17 00:00:00 2001 From: cheme Date: Fri, 7 Oct 2022 18:31:39 +0200 Subject: [PATCH 4/8] feature gate migration --- .../runtimes/assets/statemine/Cargo.toml | 5 +- .../runtimes/assets/statemine/src/lib.rs | 56 +++++++++---------- 2 files changed, 27 insertions(+), 34 deletions(-) diff --git a/parachains/runtimes/assets/statemine/Cargo.toml b/parachains/runtimes/assets/statemine/Cargo.toml index a521c60a681..562ab4dc107 100644 --- a/parachains/runtimes/assets/statemine/Cargo.toml +++ b/parachains/runtimes/assets/statemine/Cargo.toml @@ -7,7 +7,7 @@ description = "Kusama variant of Statemint parachain runtime" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } -hex-literal = { version = "0.3.4", optional = true } +hex-literal = { version = "0.3.4" } log = { version = "0.4.17", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } smallvec = "1.10.0" @@ -73,7 +73,6 @@ pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", branch [dev-dependencies] -hex-literal = "0.3.4" asset-test-utils = { path = "../test-utils"} [build-dependencies] @@ -81,8 +80,8 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran [features] default = [ "std" ] +state-trie-migration = [] runtime-benchmarks = [ - "hex-literal", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system-benchmarking/runtime-benchmarks", diff --git a/parachains/runtimes/assets/statemine/src/lib.rs b/parachains/runtimes/assets/statemine/src/lib.rs index 4d2048863c6..c4753ce2d1f 100644 --- a/parachains/runtimes/assets/statemine/src/lib.rs +++ b/parachains/runtimes/assets/statemine/src/lib.rs @@ -49,7 +49,7 @@ use frame_support::{ construct_runtime, dispatch::DispatchClass, parameter_types, - traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter, SortedMembers}, + traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter}, weights::{ConstantMultiplier, Weight}, PalletId, RuntimeDebug, }; @@ -82,6 +82,7 @@ impl_opaque_keys! { } } +#[cfg(feature = "state-trie-migration")] #[sp_version::runtime_version] pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("statemine"), @@ -94,6 +95,19 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { state_version: 1, }; +#[cfg(not(feature = "state-trie-migration"))] +#[sp_version::runtime_version] +pub const VERSION: RuntimeVersion = RuntimeVersion { + spec_name: create_runtime_str!("statemine"), + impl_name: create_runtime_str!("statemine"), + authoring_version: 1, + spec_version: 9300, + impl_version: 0, + apis: RUNTIME_API_VERSIONS, + transaction_version: 8, + state_version: 0, +}; + /// The version information used to identify this runtime when compiled natively. #[cfg(feature = "std")] pub fn native_version() -> NativeVersion { @@ -597,6 +611,7 @@ construct_runtime!( Assets: pallet_assets::{Pallet, Call, Storage, Event} = 50, Uniques: pallet_uniques::{Pallet, Call, Storage, Event} = 51, + #[cfg(feature = "state-trie-migration")] StateTrieMigration: pallet_state_trie_migration = 52, } ); @@ -989,6 +1004,7 @@ parameter_types! { pub const MigrationMaxKeyLen: u32 = 512; } +#[cfg(feature = "state-trie-migration")] impl pallet_state_trie_migration::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = Balances; @@ -1006,43 +1022,21 @@ impl pallet_state_trie_migration::Config for Runtime { type MaxKeyLen = MigrationMaxKeyLen; } -pub struct MigController; -pub struct RootMigController; - -const KEY_ROOT_MIG_CONTROLLER: [u8; 32] = [ - 82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68, - 232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73, -]; - -const KEY_MIG_CONTROLLER: [u8; 32] = [ - 82, 188, 113, 193, 236, 165, 53, 55, 73, 84, 45, 253, 240, 175, 151, 191, 118, 79, 156, 47, 68, - 232, 96, 205, 72, 95, 28, 216, 100, 0, 246, 73, -]; - -impl SortedMembers for RootMigController { - fn sorted_members() -> Vec { - // hardcoded key of controller for manual migration - vec![KEY_ROOT_MIG_CONTROLLER.into()] - } -} - -impl SortedMembers for MigController { - fn sorted_members() -> Vec { - // hardcoded key of controller for manual migration - vec![KEY_MIG_CONTROLLER.into()] - } +frame_support::ord_parameter_types! { + pub const MigController: AccountId = AccountId::from(hex_literal::hex!("52bc71c1eca5353749542dfdf0af97bf764f9c2f44e860cd485f1cd86400f649")); + pub const RootMigController: AccountId = AccountId::from(hex_literal::hex!("52bc71c1eca5353749542dfdf0af97bf764f9c2f44e860cd485f1cd86400f649")); } #[test] fn ensure_key_ss58() { + use frame_support::traits::SortedMembers; use sp_core::crypto::Ss58Codec; let acc = AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap(); - let acc: &[u8] = acc.as_ref(); - assert_eq!(acc, &KEY_MIG_CONTROLLER[..]); + //panic!("{:x?}", acc); + assert_eq!(acc, MigController::sorted_members()[0]); let acc = AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap(); - let acc: &[u8] = acc.as_ref(); - assert_eq!(acc, &KEY_ROOT_MIG_CONTROLLER[..]); - // panic!("{:?}", acc); + assert_eq!(acc, RootMigController::sorted_members()[0]); + //panic!("{:x?}", acc); } From 5df8b9b96734ddf9502fac423d1f517709affc65 Mon Sep 17 00:00:00 2001 From: cheme Date: Mon, 10 Oct 2022 12:23:24 +0200 Subject: [PATCH 5/8] changes from reviews --- parachains/runtimes/assets/statemine/Cargo.toml | 11 +++++++++-- parachains/runtimes/assets/statemine/src/lib.rs | 8 +++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/parachains/runtimes/assets/statemine/Cargo.toml b/parachains/runtimes/assets/statemine/Cargo.toml index 562ab4dc107..a32b986c9d3 100644 --- a/parachains/runtimes/assets/statemine/Cargo.toml +++ b/parachains/runtimes/assets/statemine/Cargo.toml @@ -44,7 +44,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-state-trie-migration = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +pallet-state-trie-migration = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master", optional = true } # Polkadot kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } @@ -80,7 +80,14 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran [features] default = [ "std" ] -state-trie-migration = [] +# When enabled the `state_version` is set to `1`. +# This means that the chain will start using the new state format. The migration is lazy, so +# it requires to write a storage value to use the new state format. To migrate all the other +# storage values that aren't touched the state migration pallet is added as well. +# This pallet will migrate the entire state, controlled through some account. +# +# This feature should be removed when the main-net will be migrated. +state-trie-migration = ["pallet-state-trie-migration"] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", diff --git a/parachains/runtimes/assets/statemine/src/lib.rs b/parachains/runtimes/assets/statemine/src/lib.rs index c4753ce2d1f..09c4b42c9ed 100644 --- a/parachains/runtimes/assets/statemine/src/lib.rs +++ b/parachains/runtimes/assets/statemine/src/lib.rs @@ -88,7 +88,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("statemine"), impl_name: create_runtime_str!("statemine"), authoring_version: 1, - spec_version: 9301, + spec_version: 9300, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 8, @@ -612,7 +612,7 @@ construct_runtime!( Uniques: pallet_uniques::{Pallet, Call, Storage, Event} = 51, #[cfg(feature = "state-trie-migration")] - StateTrieMigration: pallet_state_trie_migration = 52, + StateTrieMigration: pallet_state_trie_migration = 70, } ); @@ -997,6 +997,7 @@ cumulus_pallet_parachain_system::register_validate_block! { CheckInherents = CheckInherents, } +#[cfg(feature = "state-trie-migration")] parameter_types! { // The deposit configuration for the singed migration. Specially if you want to allow any signed account to do the migration (see `SignedFilter`, these deposits should be high) pub const MigrationSignedDepositPerItem: Balance = 1 * CENTS; @@ -1014,7 +1015,6 @@ impl pallet_state_trie_migration::Config for Runtime { type ControlOrigin = frame_system::EnsureSignedBy; // specific account for the migration, can trigger the signed migrations. type SignedFilter = frame_system::EnsureSignedBy; - //type SignedFilter = frame_system::EnsureSigned; // Replace this with weight based on your runtime. type WeightInfo = pallet_state_trie_migration::weights::SubstrateWeight; @@ -1022,11 +1022,13 @@ impl pallet_state_trie_migration::Config for Runtime { type MaxKeyLen = MigrationMaxKeyLen; } +#[cfg(feature = "state-trie-migration")] frame_support::ord_parameter_types! { pub const MigController: AccountId = AccountId::from(hex_literal::hex!("52bc71c1eca5353749542dfdf0af97bf764f9c2f44e860cd485f1cd86400f649")); pub const RootMigController: AccountId = AccountId::from(hex_literal::hex!("52bc71c1eca5353749542dfdf0af97bf764f9c2f44e860cd485f1cd86400f649")); } +#[cfg(feature = "state-trie-migration")] #[test] fn ensure_key_ss58() { use frame_support::traits::SortedMembers; From ed72c46f42b6f7442aa1c9a3e21e2e462297df24 Mon Sep 17 00:00:00 2001 From: Emeric Chevalier Date: Fri, 14 Oct 2022 14:16:54 +0200 Subject: [PATCH 6/8] Change controller addresses. --- parachains/runtimes/assets/statemine/src/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/parachains/runtimes/assets/statemine/src/lib.rs b/parachains/runtimes/assets/statemine/src/lib.rs index 09c4b42c9ed..10c5242f875 100644 --- a/parachains/runtimes/assets/statemine/src/lib.rs +++ b/parachains/runtimes/assets/statemine/src/lib.rs @@ -1024,8 +1024,8 @@ impl pallet_state_trie_migration::Config for Runtime { #[cfg(feature = "state-trie-migration")] frame_support::ord_parameter_types! { - pub const MigController: AccountId = AccountId::from(hex_literal::hex!("52bc71c1eca5353749542dfdf0af97bf764f9c2f44e860cd485f1cd86400f649")); - pub const RootMigController: AccountId = AccountId::from(hex_literal::hex!("52bc71c1eca5353749542dfdf0af97bf764f9c2f44e860cd485f1cd86400f649")); + pub const MigController: AccountId = AccountId::from(hex_literal::hex!("8458ed39dc4b6f6c7255f7bc42be50c2967db126357c999d44e12ca7ac80dc52")); + pub const RootMigController: AccountId = AccountId::from(hex_literal::hex!("8458ed39dc4b6f6c7255f7bc42be50c2967db126357c999d44e12ca7ac80dc52")); } #[cfg(feature = "state-trie-migration")] @@ -1034,11 +1034,11 @@ fn ensure_key_ss58() { use frame_support::traits::SortedMembers; use sp_core::crypto::Ss58Codec; let acc = - AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap(); + AccountId::from_ss58check("5F4EbSkZz18X36xhbsjvDNs6NuZ82HyYtq5UiJ1h9SBHJXZD").unwrap(); //panic!("{:x?}", acc); assert_eq!(acc, MigController::sorted_members()[0]); let acc = - AccountId::from_ss58check("5DwBmEFPXRESyEam5SsQF1zbWSCn2kCjyLW51hJHXe9vW4xs").unwrap(); + AccountId::from_ss58check("5F4EbSkZz18X36xhbsjvDNs6NuZ82HyYtq5UiJ1h9SBHJXZD").unwrap(); assert_eq!(acc, RootMigController::sorted_members()[0]); //panic!("{:x?}", acc); } From 895521f7e0a5898c85f7ef91249fa59b573f1332 Mon Sep 17 00:00:00 2001 From: cheme Date: Mon, 7 Nov 2022 11:37:21 +0100 Subject: [PATCH 7/8] fix --- parachains/runtimes/assets/statemine/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parachains/runtimes/assets/statemine/Cargo.toml b/parachains/runtimes/assets/statemine/Cargo.toml index bb88f1b95d0..d1a63c60b62 100644 --- a/parachains/runtimes/assets/statemine/Cargo.toml +++ b/parachains/runtimes/assets/statemine/Cargo.toml @@ -107,6 +107,7 @@ runtime-benchmarks = [ "pallet-collator-selection/runtime-benchmarks", "cumulus-pallet-xcmp-queue/runtime-benchmarks", "pallet-xcm-benchmarks/runtime-benchmarks", + "pallet-state-trie-migration/runtime-benchmarks", ] try-runtime = [ "cumulus-pallet-aura-ext/try-runtime", @@ -132,6 +133,7 @@ try-runtime = [ "pallet-utility/try-runtime", "pallet-xcm/try-runtime", "parachain-info/try-runtime", + "pallet-state-trie-migration/try-runtime", ] std = [ "codec/std", From 1d48ad48e5a9398875978b5d2fd976c1c7d80020 Mon Sep 17 00:00:00 2001 From: cheme Date: Mon, 7 Nov 2022 11:40:21 +0100 Subject: [PATCH 8/8] rename feature to state-trie-version-1 --- parachains/runtimes/assets/statemine/Cargo.toml | 2 +- parachains/runtimes/assets/statemine/src/lib.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/parachains/runtimes/assets/statemine/Cargo.toml b/parachains/runtimes/assets/statemine/Cargo.toml index d1a63c60b62..aefd5422bba 100644 --- a/parachains/runtimes/assets/statemine/Cargo.toml +++ b/parachains/runtimes/assets/statemine/Cargo.toml @@ -87,7 +87,7 @@ default = [ "std" ] # This pallet will migrate the entire state, controlled through some account. # # This feature should be removed when the main-net will be migrated. -state-trie-migration = ["pallet-state-trie-migration"] +state-trie-version-1 = ["pallet-state-trie-migration"] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", diff --git a/parachains/runtimes/assets/statemine/src/lib.rs b/parachains/runtimes/assets/statemine/src/lib.rs index 0d2ab51e1db..0beba44ea33 100644 --- a/parachains/runtimes/assets/statemine/src/lib.rs +++ b/parachains/runtimes/assets/statemine/src/lib.rs @@ -82,7 +82,7 @@ impl_opaque_keys! { } } -#[cfg(feature = "state-trie-migration")] +#[cfg(feature = "state-trie-version-1")] #[sp_version::runtime_version] pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("statemine"), @@ -95,7 +95,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { state_version: 1, }; -#[cfg(not(feature = "state-trie-migration"))] +#[cfg(not(feature = "state-trie-version-1"))] #[sp_version::runtime_version] pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("statemine"), @@ -611,7 +611,7 @@ construct_runtime!( Assets: pallet_assets::{Pallet, Call, Storage, Event} = 50, Uniques: pallet_uniques::{Pallet, Call, Storage, Event} = 51, - #[cfg(feature = "state-trie-migration")] + #[cfg(feature = "state-trie-version-1")] StateTrieMigration: pallet_state_trie_migration = 70, } ); @@ -997,7 +997,7 @@ cumulus_pallet_parachain_system::register_validate_block! { CheckInherents = CheckInherents, } -#[cfg(feature = "state-trie-migration")] +#[cfg(feature = "state-trie-version-1")] parameter_types! { // The deposit configuration for the singed migration. Specially if you want to allow any signed account to do the migration (see `SignedFilter`, these deposits should be high) pub const MigrationSignedDepositPerItem: Balance = 1 * CENTS; @@ -1005,7 +1005,7 @@ parameter_types! { pub const MigrationMaxKeyLen: u32 = 512; } -#[cfg(feature = "state-trie-migration")] +#[cfg(feature = "state-trie-version-1")] impl pallet_state_trie_migration::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = Balances; @@ -1022,13 +1022,13 @@ impl pallet_state_trie_migration::Config for Runtime { type MaxKeyLen = MigrationMaxKeyLen; } -#[cfg(feature = "state-trie-migration")] +#[cfg(feature = "state-trie-version-1")] frame_support::ord_parameter_types! { pub const MigController: AccountId = AccountId::from(hex_literal::hex!("8458ed39dc4b6f6c7255f7bc42be50c2967db126357c999d44e12ca7ac80dc52")); pub const RootMigController: AccountId = AccountId::from(hex_literal::hex!("8458ed39dc4b6f6c7255f7bc42be50c2967db126357c999d44e12ca7ac80dc52")); } -#[cfg(feature = "state-trie-migration")] +#[cfg(feature = "state-trie-version-1")] #[test] fn ensure_key_ss58() { use frame_support::traits::SortedMembers;