diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 223dfde7e..98bcd84d9 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -45,6 +45,8 @@ jobs: components: rustfmt target: wasm32-unknown-unknown default: true + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.12 # - name: Install additional dependencies # run: | # sudo apt update -y && diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 903c59ec8..b8754718e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,6 +42,8 @@ jobs: components: rustfmt target: wasm32-unknown-unknown default: true + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.12 - name: Check format run: cargo fmt --all -- --check - name: Build @@ -74,6 +76,8 @@ jobs: components: rustfmt target: wasm32-unknown-unknown default: true + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.12 - name: Run benchmarking tests run: make test-benchmarking checks-and-tests: @@ -94,6 +98,8 @@ jobs: components: rustfmt target: wasm32-unknown-unknown default: true + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.12 - name: Run runtime tests run: make test-runtimes - name: Run eth tests @@ -122,6 +128,8 @@ jobs: components: rustfmt target: wasm32-unknown-unknown default: true + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.12 - name: Run e2e tests run: make test-e2e - name: Use Node.js diff --git a/Cargo.lock b/Cargo.lock index 32a6c2525..596bccfe2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,7 +28,7 @@ version = "2.8.3" dependencies = [ "acala-inspect", "acala-service", - "clap 3.1.18", + "clap 3.2.12", "cumulus-client-cli", "cumulus-client-service", "cumulus-primitives-core", @@ -53,7 +53,7 @@ dependencies = [ name = "acala-inspect" version = "2.8.3" dependencies = [ - "clap 3.1.18", + "clap 3.2.12", "derive_more", "log", "parity-scale-codec", @@ -374,7 +374,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.7", "once_cell", "version_check", ] @@ -405,9 +405,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" +checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" [[package]] name = "approx" @@ -494,14 +494,14 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "2.0.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43" +checksum = "5262ed948da60dd8956c6c5aca4d4163593dddb7b32d73267c93dab7b2e98940" dependencies = [ "async-channel", "async-executor", "async-io", - "async-mutex", + "async-lock", "blocking", "futures-lite", "num_cpus", @@ -536,15 +536,6 @@ dependencies = [ "event-listener", ] -[[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -dependencies = [ - "event-listener", -] - [[package]] name = "async-process" version = "1.4.0" @@ -564,9 +555,9 @@ dependencies = [ [[package]] name = "async-std" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52580991739c5cdb36cde8b2a516371c0a3b70dda36d916cc08b82372916808c" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ "async-attributes", "async-channel", @@ -583,7 +574,6 @@ dependencies = [ "kv-log-macro", "log", "memchr", - "num_cpus", "once_cell", "pin-project-lite 0.2.9", "pin-utils", @@ -608,15 +598,15 @@ dependencies = [ [[package]] name = "async-task" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" +checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" dependencies = [ "proc-macro2", "quote", @@ -636,15 +626,6 @@ dependencies = [ "pin-project-lite 0.2.9", ] -[[package]] -name = "atomic" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg", -] - [[package]] name = "atomic-waker" version = "1.0.0" @@ -687,7 +668,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom 0.2.6", + "getrandom 0.2.7", "instant", "pin-project-lite 0.2.9", "rand 0.8.5", @@ -696,24 +677,24 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.28.4", + "object 0.29.0", "rustc-demangle", ] [[package]] name = "base-x" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" [[package]] name = "base16ct" @@ -757,9 +738,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "base64ct" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179" +checksum = "3bdca834647821e0b13d9539a8634eb62d3501b6b6c2cec1722786ee6671b851" [[package]] name = "bech32" @@ -779,7 +760,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-primitives", "fnv", @@ -788,7 +769,7 @@ dependencies = [ "hex", "log", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-chain-spec", "sc-client-api", "sc-finality-grandpa", @@ -813,7 +794,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -821,7 +802,7 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-rpc", "sc-utils", "serde", @@ -833,12 +814,16 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "beefy-primitives", + "sp-api", +] [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -910,9 +895,9 @@ dependencies = [ [[package]] name = "bitvec" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium 0.7.0", @@ -1055,160 +1040,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bp-header-chain" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "bp-runtime", - "finality-grandpa", - "frame-support", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-message-dispatch" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "bp-runtime", - "frame-support", - "parity-scale-codec", - "scale-info", - "sp-std", -] - -[[package]] -name = "bp-messages" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "bitvec 1.0.0", - "bp-runtime", - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-std", -] - -[[package]] -name = "bp-polkadot-core" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "bp-messages", - "bp-runtime", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-core", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-rococo" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "bp-messages", - "bp-polkadot-core", - "bp-runtime", - "frame-support", - "parity-scale-codec", - "smallvec", - "sp-api", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-runtime" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "frame-support", - "hash-db", - "num-traits", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", -] - -[[package]] -name = "bp-test-utils" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "bp-header-chain", - "ed25519-dalek", - "finality-grandpa", - "parity-scale-codec", - "sp-application-crypto", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-wococo" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "bp-messages", - "bp-polkadot-core", - "bp-rococo", - "bp-runtime", - "parity-scale-codec", - "sp-api", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bridge-runtime-common" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "bp-message-dispatch", - "bp-messages", - "bp-runtime", - "frame-support", - "frame-system", - "hash-db", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", - "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", -] - [[package]] name = "bs58" version = "0.4.0" @@ -1244,9 +1075,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.9.1" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" +checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" [[package]] name = "byte-slice-cast" @@ -1315,19 +1146,16 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.9", + "semver 1.0.12", "serde", "serde_json", ] [[package]] name = "cast" -version = "0.2.7" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" -dependencies = [ - "rustc_version", -] +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" @@ -1367,9 +1195,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chacha20" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" +checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if 1.0.0", "cipher", @@ -1379,9 +1207,9 @@ dependencies = [ [[package]] name = "chacha20poly1305" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a" +checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead", "chacha20", @@ -1436,9 +1264,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6b561dcf059c85bbe388e0a7b0a1469acb3934cc0cfa148613a830629e3049" +checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b" dependencies = [ "glob", "libc", @@ -1462,16 +1290,16 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.18" +version = "3.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" +checksum = "ab8b79fe3946ceb4a0b1c080b4018992b8d27e9ff363644c1c9b6387c854614d" dependencies = [ "atty", "bitflags", "clap_derive", "clap_lex", "indexmap", - "lazy_static", + "once_cell", "strsim 0.10.0", "termcolor", "textwrap 0.15.0", @@ -1479,9 +1307,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.18" +version = "3.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" +checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -1492,13 +1320,22 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" dependencies = [ "os_str_bytes", ] +[[package]] +name = "cmake" +version = "0.1.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +dependencies = [ + "cc", +] + [[package]] name = "coarsetime" version = "0.1.22" @@ -1521,7 +1358,7 @@ dependencies = [ "bs58", "coins-core", "digest 0.9.0", - "getrandom 0.2.6", + "getrandom 0.2.7", "hmac 0.11.0", "k256", "lazy_static", @@ -1538,7 +1375,7 @@ checksum = "8f473ea37dfc9d2cb94fdde50c3d41f28c3f384b367573d66386fea38d76d466" dependencies = [ "bitvec 0.17.4", "coins-bip32", - "getrandom 0.2.6", + "getrandom 0.2.7", "hex", "hmac 0.11.0", "pbkdf2 0.8.0", @@ -1651,59 +1488,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", @@ -1711,11 +1549,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", @@ -1724,9 +1568,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", @@ -1749,9 +1593,9 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" dependencies = [ "atty", "cast", @@ -1777,9 +1621,9 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" +checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" dependencies = [ "cast", "itertools", @@ -1787,9 +1631,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1808,15 +1652,15 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "lazy_static", "memoffset", + "once_cell", "scopeguard", ] @@ -1832,12 +1676,12 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" dependencies = [ "cfg-if 1.0.0", - "lazy_static", + "once_cell", ] [[package]] @@ -1860,9 +1704,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "2ccfd8c0ee4cce11e45b3fd6f9d5e69e0cc62912aa6a0cb1bf4617b0eba5a12f" dependencies = [ "generic-array 0.14.5", "typenum", @@ -1943,18 +1787,22 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ - "clap 3.1.18", + "clap 3.2.12", + "parity-scale-codec", + "sc-chain-spec", "sc-cli", "sc-service", + "sp-core", + "sp-runtime", "url", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1962,7 +1810,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.21", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1978,7 +1826,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -2007,7 +1855,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -2028,14 +1876,14 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-client-api", "sc-consensus", "sp-api", @@ -2052,7 +1900,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -2060,7 +1908,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-node-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2077,7 +1925,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -2101,7 +1949,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -2109,11 +1957,9 @@ dependencies = [ "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-overseer", "polkadot-primitives", - "sc-chain-spec", "sc-client-api", "sc-consensus", "sc-consensus-babe", @@ -2131,7 +1977,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-executive", "frame-support", @@ -2149,7 +1995,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2167,7 +2013,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -2197,7 +2043,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2208,7 +2054,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-support", "frame-system", @@ -2221,7 +2067,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2238,7 +2084,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2256,7 +2102,7 @@ dependencies = [ [[package]] name = "cumulus-ping" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-pallet-xcm", "cumulus-primitives-core", @@ -2273,7 +2119,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-support", "parity-scale-codec", @@ -2289,7 +2135,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2312,7 +2158,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "futures 0.3.21", @@ -2325,7 +2171,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2342,14 +2188,14 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-cli", "polkadot-client", "polkadot-service", @@ -2357,8 +2203,7 @@ dependencies = [ "sc-client-api", "sc-consensus-babe", "sc-network", - "sc-service", - "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23)", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", "sc-telemetry", "sc-tracing", "sp-api", @@ -2373,7 +2218,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2381,11 +2226,10 @@ dependencies = [ "futures 0.3.21", "jsonrpsee-core", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-overseer", "polkadot-service", "sc-client-api", - "sc-service", "sp-api", "sp-blockchain", "sp-core", @@ -2397,7 +2241,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "backoff", @@ -2407,7 +2251,7 @@ dependencies = [ "futures-timer", "jsonrpsee", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-service", "sc-client-api", "sc-rpc-api", @@ -2423,7 +2267,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2436,9 +2280,10 @@ dependencies = [ [[package]] name = "cumulus-test-relay-validation-worker-provider" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "polkadot-node-core-pvf", + "toml", ] [[package]] @@ -2654,9 +2499,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" +checksum = "9d07a982d1fb29db01e5a59b1918e03da4df7297eaeee7686ac45542fd4e59c8" [[package]] name = "e2e-tests" @@ -2761,9 +2606,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" [[package]] name = "elliptic-curve" @@ -2889,9 +2734,9 @@ dependencies = [ [[package]] name = "ethabi" -version = "17.0.0" +version = "17.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69517146dfab88e9238c00c724fd8e277951c3cc6f22b016d72f422a832213e" +checksum = "f186de076b3e77b8e6d73c99d1b52edc2a229e604f4b5eb6992c06c11d79d537" dependencies = [ "ethereum-types", "hex", @@ -3142,11 +2987,23 @@ dependencies = [ "log", ] +[[package]] +name = "filetime" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "windows-sys", +] + [[package]] name = "finality-grandpa" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9def033d8505edf199f6a5d07aa7e6d2d6185b164293b77f0efd108f4f3e11d" +checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" dependencies = [ "either", "futures 0.3.21", @@ -3154,7 +3011,7 @@ dependencies = [ "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "scale-info", ] @@ -3172,19 +3029,17 @@ dependencies = [ [[package]] name = "fixedbitset" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "libc", "libz-sys", "miniz_oxide", ] @@ -3198,7 +3053,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", ] @@ -3216,7 +3071,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -3238,15 +3093,16 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "Inflector", "chrono", - "clap 3.1.18", + "clap 3.2.12", "comfy-table", "frame-benchmarking", "frame-support", "frame-system", + "gethostname", "handlebars", "hash-db", "hex", @@ -3265,7 +3121,7 @@ dependencies = [ "sc-client-db", "sc-executor", "sc-service", - "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596)", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "serde", "serde_json", "serde_nanos", @@ -3288,7 +3144,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3299,7 +3155,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3315,7 +3171,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -3343,7 +3199,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "bitflags", "frame-metadata", @@ -3373,7 +3229,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -3385,7 +3241,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -3397,7 +3253,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro2", "quote", @@ -3407,7 +3263,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "log", @@ -3424,7 +3280,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -3439,7 +3295,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sp-api", @@ -3448,7 +3304,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "sp-api", @@ -3625,6 +3481,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" @@ -3644,6 +3509,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "getrandom" version = "0.1.16" @@ -3659,14 +3534,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if 1.0.0", "js-sys", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -3699,9 +3574,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "globset" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" +checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" dependencies = [ "aho-corasick", "bstr", @@ -3760,9 +3635,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "handlebars" -version = "4.3.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d113a9853e5accd30f43003560b5563ffbb007e3f325e8b103fa0d0029c6e6df" +checksum = "36641a8b9deb60e23fb9bb47ac631d664a780b088909b89179a4eab5618b076b" dependencies = [ "log", "pest", @@ -3798,9 +3673,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" +checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022" dependencies = [ "ahash", ] @@ -3891,9 +3766,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", @@ -3931,9 +3806,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.19" +version = "0.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" +checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" dependencies = [ "bytes", "futures-channel", @@ -3991,9 +3866,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "1.0.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8f4a3c3d4c89351ca83e120c1c00b27df945d38e05695668c9d4b4f7bc52f3" +checksum = "015a7df1eb6dda30df37f34b63ada9b7b352984b0e84de2a20ed526345000791" dependencies = [ "async-io", "core-foundation", @@ -4047,12 +3922,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.11.2", + "hashbrown 0.12.2", "serde", ] @@ -4067,9 +3942,9 @@ dependencies = [ [[package]] name = "integer-encoding" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e85a1509a128c855368e135cffcde7eac17d8e1083f41e2b98c58bc1a5074be" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "integer-sqrt" @@ -4086,6 +3961,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" @@ -4142,18 +4023,18 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.57" +version = "0.3.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonrpsee" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f2ab5a60e558e74ea93bcf5164ebc47939a7fff8938fa9b5233bbc63e16061" +checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-server", @@ -4166,15 +4047,15 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d682f4a55081a2be3e639280c640523070e4aeb8ee2fd8dd9168fdae57a9db" +checksum = "ce395539a14d3ad4ec1256fde105abd36a2da25d578a291cabe98f45adfdb111" dependencies = [ "futures-util", "http", "jsonrpsee-core", "jsonrpsee-types", - "pin-project 1.0.10", + "pin-project", "rustls-native-certs", "soketto", "thiserror", @@ -4187,9 +4068,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e27462b21279edf9a6a91f46ffbe125e9cdc58b901d2e08bf59b31a47d7d0ab" +checksum = "16efcd4477de857d4a2195a45769b2fe9ebb54f3ef5a4221d3b014a4fe33ec0b" dependencies = [ "anyhow", "arrayvec 0.7.2", @@ -4199,9 +4080,11 @@ dependencies = [ "futures-channel", "futures-timer", "futures-util", + "globset", "hyper", "jsonrpsee-types", - "parking_lot 0.12.0", + "lazy_static", + "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", "serde", @@ -4210,32 +4093,31 @@ dependencies = [ "thiserror", "tokio", "tracing", + "unicase", ] [[package]] name = "jsonrpsee-http-server" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7178f16eabd7154c094e24d295b9ee355ec1e5f24c328759c56255ff7bbd4548" +checksum = "bdd69efeb3ce2cba767f126872f4eeb4624038a29098e75d77608b2b4345ad03" dependencies = [ "futures-channel", "futures-util", - "globset", "hyper", "jsonrpsee-core", "jsonrpsee-types", - "lazy_static", + "serde", "serde_json", "tokio", "tracing", - "unicase", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8d7f449cab3b747f12c3efc27f5cad537f3b597c6a3838b0fac628f4bf730a" +checksum = "874cf3f6a027cebf36cae767feca9aa2e8a8f799880e49eb5540819fcbd8eada" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4245,9 +4127,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd11763134104122ddeb0f97e4bbe393058017dfb077db63fbf44b4dd0dd86e" +checksum = "3bcf76cd316f5d3ad48138085af1f45e2c58c98e02f0779783dbb034d43f7c86" dependencies = [ "anyhow", "beef", @@ -4259,9 +4141,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f15180afb3761c7a3a32c0a8b680788176dcfdfe725b24c1758c90b1d1595b" +checksum = "ee043cb5dd0d51d3eb93432e998d5bae797691a7b10ec4a325e036bcdb48c48a" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -4270,9 +4152,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-server" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb6c21556c551582b56e4e8e6e6249b0bbdb69bb7fa39efe9b9a6b54af9f206" +checksum = "2bd2e4d266774a671f8def3794255b28eddd09b18d76e0b913fa439f34588c0a" dependencies = [ "futures-channel", "futures-util", @@ -4281,6 +4163,7 @@ dependencies = [ "serde_json", "soketto", "tokio", + "tokio-stream", "tokio-util", "tracing", ] @@ -4423,11 +4306,11 @@ checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "kusama-runtime" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec 1.0.1", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -4437,7 +4320,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants 0.9.23 (git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0)", + "kusama-runtime-constants", "log", "pallet-authority-discovery", "pallet-authorship", @@ -4458,7 +4341,6 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-multisig", - "pallet-nicks", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", "pallet-offences", @@ -4516,32 +4398,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.23" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.23#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", - "smallvec", - "sp-runtime", -] - -[[package]] -name = "kusama-runtime-constants" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", - "smallvec", - "sp-runtime", -] - -[[package]] -name = "kusama-runtime-constants" -version = "0.9.24" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "polkadot-primitives", @@ -4577,7 +4435,7 @@ checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.12.0", + "parking_lot 0.12.1", ] [[package]] @@ -4592,7 +4450,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "regex", "rocksdb", "smallvec", @@ -4647,15 +4505,14 @@ checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" [[package]] name = "libp2p" -version = "0.44.0" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475ce2ac4a9727e53a519f6ee05b38abfcba8f0d39c4d24f103d184e36fd5b0f" +checksum = "81327106887e42d004fbdab1fef93675be2e2e07c1b95fce45e2cc813485611d" dependencies = [ - "atomic", "bytes", "futures 0.3.21", "futures-timer", - "getrandom 0.2.6", + "getrandom 0.2.7", "instant", "lazy_static", "libp2p-autonat", @@ -4684,17 +4541,17 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multiaddr", - "parking_lot 0.12.0", - "pin-project 1.0.10", + "parking_lot 0.12.1", + "pin-project", "rand 0.7.3", "smallvec", ] [[package]] name = "libp2p-autonat" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13b690e65046af6a09c0b27bd9508fa1cab0efce889de74b0b643b9d2a98f9a" +checksum = "4decc51f3573653a9f4ecacb31b1b922dd20c25a6322bb15318ec04287ec46f9" dependencies = [ "async-trait", "futures 0.3.21", @@ -4704,16 +4561,16 @@ dependencies = [ "libp2p-request-response", "libp2p-swarm", "log", - "prost 0.9.0", + "prost", "prost-build", "rand 0.8.5", ] [[package]] name = "libp2p-core" -version = "0.32.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db5b02602099fb75cb2d16f9ea860a320d6eb82ce41e95ab680912c454805cd5" +checksum = "fbf9b94cefab7599b2d3dff2f93bee218c6621d68590b23ede4485813cbcece6" dependencies = [ "asn1_der", "bs58", @@ -4729,9 +4586,9 @@ dependencies = [ "multiaddr", "multihash", "multistream-select", - "parking_lot 0.12.0", - "pin-project 1.0.10", - "prost 0.9.0", + "parking_lot 0.12.1", + "pin-project", + "prost", "prost-build", "rand 0.8.5", "ring", @@ -4746,9 +4603,9 @@ dependencies = [ [[package]] name = "libp2p-deflate" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d37f042f748e224f04785d0e987ae09a2aa518d6401d82d412dad83e360ed" +checksum = "d0183dc2a3da1fbbf85e5b6cf51217f55b14f5daea0c455a9536eef646bfec71" dependencies = [ "flate2", "futures 0.3.21", @@ -4757,23 +4614,24 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.32.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066e33e854e10b5c93fc650458bf2179c7e0d143db260b0963e44a94859817f1" +checksum = "6cbf54723250fa5d521383be789bf60efdabe6bacfb443f87da261019a49b4b5" dependencies = [ "async-std-resolver", "futures 0.3.21", "libp2p-core", "log", + "parking_lot 0.12.1", "smallvec", "trust-dns-resolver", ] [[package]] name = "libp2p-floodsub" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733d3ea6ebe7a7a85df2bc86678b93f24b015fae5fe3b3acc4c400e795a55d2d" +checksum = "98a4b6ffd53e355775d24b76f583fdda54b3284806f678499b57913adb94f231" dependencies = [ "cuckoofilter", "fnv", @@ -4781,7 +4639,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.9.0", + "prost", "prost-build", "rand 0.7.3", "smallvec", @@ -4789,9 +4647,9 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.37.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90c989a7c0969c2ab63e898da9bc735e3be53fb4f376e9c045ce516bcc9f928" +checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0" dependencies = [ "asynchronous-codec", "base64 0.13.0", @@ -4805,7 +4663,7 @@ dependencies = [ "libp2p-swarm", "log", "prometheus-client", - "prost 0.9.0", + "prost", "prost-build", "rand 0.7.3", "regex", @@ -4817,28 +4675,32 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ef5a5b57904c7c33d6713ef918d239dc6b7553458f3475d87f8a18e9c651c8" +checksum = "c50b585518f8efd06f93ac2f976bd672e17cdac794644b3117edd078e96bda06" dependencies = [ + "asynchronous-codec", "futures 0.3.21", "futures-timer", "libp2p-core", "libp2p-swarm", "log", - "lru 0.7.6", - "prost 0.9.0", + "lru 0.7.7", + "prost", "prost-build", + "prost-codec", "smallvec", + "thiserror", + "void", ] [[package]] name = "libp2p-kad" -version = "0.36.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "564e6bd64d177446399ed835b9451a8825b07929d6daa6a94e6405592974725e" +checksum = "740862893bb5f06ac24acc9d49bdeadc3a5e52e51818a30a25c1f3519da2c851" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.7.2", "asynchronous-codec", "bytes", "either", @@ -4849,7 +4711,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.9.0", + "prost", "prost-build", "rand 0.7.3", "sha2 0.10.2", @@ -4862,9 +4724,9 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.36.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611ae873c8e280ccfab0d57c7a13cac5644f364529e233114ff07863946058b0" +checksum = "66e5e5919509603281033fd16306c61df7a4428ce274b67af5e14b07de5cdcb2" dependencies = [ "async-io", "data-encoding", @@ -4883,9 +4745,9 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985be799bb3796e0c136c768208c3c06604a38430571906a13dcfeda225a3b9d" +checksum = "ef8aff4a1abef42328fbb30b17c853fff9be986dc39af17ee39f9c5f755c5e0c" dependencies = [ "libp2p-core", "libp2p-gossipsub", @@ -4899,9 +4761,9 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442eb0c9fff0bf22a34f015724b4143ce01877e079ed0963c722d94c07c72160" +checksum = "61fd1b20638ec209c5075dfb2e8ce6a7ea4ec3cd3ad7b77f7a477c06d53322e2" dependencies = [ "asynchronous-codec", "bytes", @@ -4909,7 +4771,7 @@ dependencies = [ "libp2p-core", "log", "nohash-hasher", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "rand 0.7.3", "smallvec", "unsigned-varint", @@ -4917,9 +4779,9 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd7e0c94051cda67123be68cf6b65211ba3dde7277be9068412de3e7ffd63ef" +checksum = "762408cb5d84b49a600422d7f9a42c18012d8da6ebcd570f9a4a4290ba41fb6f" dependencies = [ "bytes", "curve25519-dalek 3.2.0", @@ -4927,7 +4789,7 @@ dependencies = [ "lazy_static", "libp2p-core", "log", - "prost 0.9.0", + "prost", "prost-build", "rand 0.8.5", "sha2 0.10.2", @@ -4939,9 +4801,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf57a3c2e821331dda9fe612d4654d676ab6e33d18d9434a18cced72630df6ad" +checksum = "100a6934ae1dbf8a693a4e7dd1d730fd60b774dafc45688ed63b554497c6c925" dependencies = [ "futures 0.3.21", "futures-timer", @@ -4955,16 +4817,16 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962c0fb0e7212fb96a69b87f2d09bcefd317935239bdc79cda900e7a8897a3fe" +checksum = "be27bf0820a6238a4e06365b096d428271cce85a129cf16f2fe9eb1610c4df86" dependencies = [ "asynchronous-codec", "bytes", "futures 0.3.21", "libp2p-core", "log", - "prost 0.9.0", + "prost", "prost-build", "unsigned-varint", "void", @@ -4978,7 +4840,7 @@ checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c" dependencies = [ "futures 0.3.21", "log", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "salsa20", "sha3 0.9.1", @@ -4986,9 +4848,9 @@ dependencies = [ [[package]] name = "libp2p-relay" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa754cb7bccef51ebc3c458c6bbcef89d83b578a9925438389be841527d408f" +checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3" dependencies = [ "asynchronous-codec", "bytes", @@ -4999,22 +4861,22 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "pin-project 1.0.10", - "prost 0.9.0", + "pin-project", + "prost", "prost-build", + "prost-codec", "rand 0.8.5", "smallvec", "static_assertions", "thiserror", - "unsigned-varint", "void", ] [[package]] name = "libp2p-rendezvous" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd0baab894c5b84da510b915d53264d566c3c35889f09931fe9edbd2a773bee" +checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e" dependencies = [ "asynchronous-codec", "bimap", @@ -5024,7 +4886,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.9.0", + "prost", "prost-build", "rand 0.8.5", "sha2 0.10.2", @@ -5035,9 +4897,9 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6a6fc6c9ad95661f46989473b34bd2993d14a4de497ff3b2668a910d4b869" +checksum = "508a189e2795d892c8f5c1fa1e9e0b1845d32d7b0b249dbf7b05b18811361843" dependencies = [ "async-trait", "bytes", @@ -5053,9 +4915,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0c69ad9e8f7c5fc50ad5ad9c7c8b57f33716532a2b623197f69f93e374d14c" +checksum = "95ac5be6c2de2d1ff3f7693fda6faf8a827b1f3e808202277783fea9f527d114" dependencies = [ "either", "fnv", @@ -5064,7 +4926,7 @@ dependencies = [ "instant", "libp2p-core", "log", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "smallvec", "thiserror", @@ -5073,9 +4935,9 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf2fe8c80b43561355f4d51875273b5b6dfbac37952e8f64b1270769305c9d7" +checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76" dependencies = [ "quote", "syn", @@ -5083,9 +4945,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193447aa729c85aac2376828df76d171c1a589c9e6b58fcc7f9d9a020734122c" +checksum = "8a6771dc19aa3c65d6af9a8c65222bfc8fcd446630ddca487acd161fa6096f3b" dependencies = [ "async-io", "futures 0.3.21", @@ -5100,9 +4962,9 @@ dependencies = [ [[package]] name = "libp2p-uds" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24bdab114f7f2701757d6541266e1131b429bbae382008f207f2114ee4222dcb" +checksum = "d125e3e5f0d58f3c6ac21815b20cf4b6a88b8db9dc26368ea821838f4161fd4d" dependencies = [ "async-std", "futures 0.3.21", @@ -5112,9 +4974,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6ea0f84a967ef59a16083f222c18115ae2e91db69809dce275df62e101b279" +checksum = "ec894790eec3c1608f8d1a8a0bdf0dbeb79ed4de2dce964222011c2896dfa05a" dependencies = [ "futures 0.3.21", "js-sys", @@ -5126,15 +4988,16 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c932834c3754501c368d1bf3d0fb458487a642b90fc25df082a3a2f3d3b32e37" +checksum = "9808e57e81be76ff841c106b4c5974fb4d41a233a7bdd2afbf1687ac6def3818" dependencies = [ "either", "futures 0.3.21", "futures-rustls", "libp2p-core", "log", + "parking_lot 0.12.1", "quicksink", "rw-stream-sink", "soketto", @@ -5144,13 +5007,13 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.36.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be902ebd89193cd020e89e89107726a38cfc0d16d18f613f4a37d046e92c7517" +checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c" dependencies = [ "futures 0.3.21", "libp2p-core", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "thiserror", "yamux", ] @@ -5172,9 +5035,9 @@ dependencies = [ [[package]] name = "libsecp256k1" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37" +checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" dependencies = [ "arrayref", "base64 0.13.0", @@ -5231,9 +5094,9 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linked_hash_set" @@ -5260,6 +5123,12 @@ version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" +[[package]] +name = "linux-raw-sys" +version = "0.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" + [[package]] name = "lock_api" version = "0.4.7" @@ -5291,9 +5160,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8015d95cb7b2ddd3c0d32ca38283ceb1eea09b4713ee380bceb942d85a244228" +checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a" dependencies = [ "hashbrown 0.11.2", ] @@ -5527,9 +5396,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f" +checksum = "3a79b39c93a7a5a27eeaf9a23b5ff43f1b9e0ad6b1cdd441140ae53c35613fc7" dependencies = [ "libc", ] @@ -5550,7 +5419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" dependencies = [ "hash-db", - "hashbrown 0.12.1", + "hashbrown 0.12.2", "parity-util-mem", ] @@ -5600,18 +5469,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log", @@ -6470,7 +6339,7 @@ dependencies = [ "bytes", "futures 0.3.21", "log", - "pin-project 1.0.10", + "pin-project", "smallvec", "unsigned-varint", ] @@ -6485,7 +6354,7 @@ dependencies = [ "matrixmultiply", "nalgebra-macros", "num-complex", - "num-rational 0.4.0", + "num-rational 0.4.1", "num-traits", "rand 0.8.5", "rand_distr", @@ -6533,9 +6402,9 @@ dependencies = [ [[package]] name = "netlink-packet-route" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733ea73609acfd7fa7ddadfb7bf709b0471668c456ad9513685af543a06342b2" +checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" dependencies = [ "anyhow", "bitflags", @@ -6559,23 +6428,24 @@ dependencies = [ [[package]] name = "netlink-proto" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8785b8141e8432aa45fceb922a7e876d7da3fad37fa7e7ec702ace3aa0826b" +checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" dependencies = [ "bytes", "futures 0.3.21", "log", "netlink-packet-core", "netlink-sys", + "thiserror", "tokio", ] [[package]] name = "netlink-sys" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c9f9547a08241bee7b6558b9b98e1f290d187de8b7cfca2bbb4937bcaa8f8" +checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" dependencies = [ "async-io", "bytes", @@ -6586,15 +6456,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.22.3" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" dependencies = [ "bitflags", - "cc", "cfg-if 1.0.0", "libc", - "memoffset", ] [[package]] @@ -6629,7 +6497,7 @@ dependencies = [ "num-complex", "num-integer", "num-iter", - "num-rational 0.4.0", + "num-rational 0.4.1", "num-traits", ] @@ -6657,9 +6525,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fbc387afefefd5e9e39493299f3069e14a140dd34dc19b4c1c1a8fddb6a790" +checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" dependencies = [ "num-traits", ] @@ -6709,9 +6577,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-bigint 0.4.3", @@ -6778,29 +6646,30 @@ dependencies = [ [[package]] name = "object" -version = "0.27.1" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ "crc32fast", + "hashbrown 0.11.2", "indexmap", "memchr", ] [[package]] name = "object" -version = "0.28.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "oorandom" @@ -6829,14 +6698,14 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orchestra" version = "0.0.1" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "dyn-clonable", "futures 0.3.21", "futures-timer", "orchestra-proc-macro", - "pin-project 1.0.10", + "pin-project", "prioritized-metered-channel", "thiserror", "tracing", @@ -6845,9 +6714,10 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" version = "0.0.1" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "expander 0.0.6", + "itertools", "petgraph", "proc-macro-crate", "proc-macro2", @@ -6908,7 +6778,7 @@ dependencies = [ "hash-db", "linregress", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "paste", "rand 0.8.5", "sc-client-db", @@ -6925,6 +6795,7 @@ dependencies = [ "sp-std", "sp-storage", "tempfile", + "thiserror", "toml", "walkdir", "wasm-gc-api", @@ -7282,7 +7153,7 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -7299,7 +7170,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7313,7 +7184,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -7329,7 +7200,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -7345,7 +7216,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -7360,7 +7231,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7384,7 +7255,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7404,7 +7275,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7419,7 +7290,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-primitives", "frame-support", @@ -7435,7 +7306,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -7458,7 +7329,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7473,70 +7344,10 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-bridge-dispatch" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "bp-message-dispatch", - "bp-runtime", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-bridge-grandpa" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "bp-header-chain", - "bp-runtime", - "bp-test-utils", - "finality-grandpa", - "frame-support", - "frame-system", - "log", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", - "sp-trie", -] - -[[package]] -name = "pallet-bridge-messages" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "bitvec 1.0.0", - "bp-message-dispatch", - "bp-messages", - "bp-runtime", - "frame-support", - "frame-system", - "log", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7555,7 +7366,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-benchmarking", "frame-support", @@ -7575,7 +7386,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7592,7 +7403,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7608,7 +7419,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7631,7 +7442,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7644,7 +7455,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7662,7 +7473,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7677,7 +7488,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7700,7 +7511,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "enumflags2 0.7.5", "frame-benchmarking", @@ -7716,7 +7527,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7736,7 +7547,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7753,7 +7564,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7770,7 +7581,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -7788,7 +7599,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -7803,7 +7614,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7815,24 +7626,10 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-nicks" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-io", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -7840,6 +7637,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core", + "sp-io", "sp-runtime", "sp-staking", "sp-std", @@ -7848,7 +7646,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7867,7 +7665,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -7884,7 +7682,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7907,7 +7705,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7923,7 +7721,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7938,7 +7736,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7953,7 +7751,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7969,7 +7767,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -7990,7 +7788,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8006,7 +7804,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -8020,7 +7818,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8043,7 +7841,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8054,7 +7852,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "sp-arithmetic", @@ -8063,7 +7861,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -8077,7 +7875,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8095,7 +7893,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8114,7 +7912,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -8130,7 +7928,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -8145,7 +7943,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -8156,7 +7954,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8173,7 +7971,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8188,7 +7986,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8204,7 +8002,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8218,8 +8016,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "frame-system", @@ -8236,8 +8034,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-benchmarking", "frame-support", @@ -8254,7 +8052,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -8267,7 +8065,7 @@ dependencies = [ [[package]] name = "parachains-common" version = "1.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-executive", "frame-support", @@ -8293,9 +8091,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a7901b85874402471e131de3332dde0e51f38432c69a3853627c8e25433048" +checksum = "966eb23bd3a09758b8dac09f82b9d417c00f14e5d46171bf04cffdd9cb2e1eb1" dependencies = [ "blake2-rfc", "crc32fast", @@ -8312,12 +8110,12 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.1.2" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" +checksum = "9182e4a71cae089267ab03e67c99368db7cd877baf50f931e5d6d4b71e195ac0" dependencies = [ "arrayvec 0.7.2", - "bitvec 1.0.0", + "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", @@ -8326,9 +8124,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.2" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" +checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8349,10 +8147,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.12.1", + "hashbrown 0.12.2", "impl-trait-for-tuples", "parity-util-mem-derive", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "primitive-types", "smallvec", "tikv-jemalloc-ctl", @@ -8405,9 +8203,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", "parking_lot_core 0.9.3", @@ -8536,9 +8334,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" dependencies = [ "fixedbitset", "indexmap", @@ -8546,38 +8344,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" -dependencies = [ - "pin-project-internal 0.4.29", -] - -[[package]] -name = "pin-project" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" -dependencies = [ - "pin-project-internal 1.0.10", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.29" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" +checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" dependencies = [ - "proc-macro2", - "quote", - "syn", + "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" dependencies = [ "proc-macro2", "quote", @@ -8633,9 +8411,9 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "plotters" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" +checksum = "9428003b84df1496fb9d6eeee9c5f8145cb41ca375eb0dad204328888832811f" dependencies = [ "num-traits", "plotters-backend", @@ -8646,23 +8424,23 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" +checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" [[package]] name = "plotters-svg" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" +checksum = "e0918736323d1baff32ee0eade54984f6f201ad7e97d5cfb5d6ab4a358529615" dependencies = [ "plotters-backend", ] [[package]] name = "polkadot-approval-distribution" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -8676,8 +8454,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -8690,13 +8468,13 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", "fatality", "futures 0.3.21", - "lru 0.7.6", + "lru 0.7.7", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -8713,12 +8491,12 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "fatality", "futures 0.3.21", - "lru 0.7.6", + "lru 0.7.7", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -8734,10 +8512,10 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "clap 3.1.18", + "clap 3.2.12", "frame-benchmarking-cli", "futures 0.3.21", "log", @@ -8748,7 +8526,7 @@ dependencies = [ "polkadot-service", "sc-cli", "sc-service", - "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23)", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", "sc-tracing", "sp-core", "sp-trie", @@ -8759,8 +8537,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -8800,8 +8578,8 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "always-assert", "fatality", @@ -8821,8 +8599,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -8834,13 +8612,13 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", "fatality", "futures 0.3.21", - "lru 0.7.6", + "lru 0.7.7", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -8857,8 +8635,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -8871,8 +8649,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "futures 0.3.21", "futures-timer", @@ -8891,15 +8669,15 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "always-assert", "async-trait", "bytes", "futures 0.3.21", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -8912,8 +8690,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "futures 0.3.21", "parity-scale-codec", @@ -8930,15 +8708,15 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "bitvec 1.0.0", + "bitvec 1.0.1", "derive_more", "futures 0.3.21", "futures-timer", "kvdb", - "lru 0.7.6", + "lru 0.7.7", "merlin", "parity-scale-codec", "polkadot-node-jaeger", @@ -8959,10 +8737,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "bitvec 1.0.0", + "bitvec 1.0.1", "futures 0.3.21", "futures-timer", "kvdb", @@ -8979,10 +8757,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "bitvec 1.0.0", + "bitvec 1.0.1", "fatality", "futures 0.3.21", "polkadot-erasure-coding", @@ -8998,8 +8776,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -9013,8 +8791,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "futures 0.3.21", @@ -9031,8 +8809,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -9046,8 +8824,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9063,13 +8841,13 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "fatality", "futures 0.3.21", "kvdb", - "lru 0.7.6", + "lru 0.7.7", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -9082,8 +8860,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "futures 0.3.21", @@ -9099,10 +8877,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "bitvec 1.0.0", + "bitvec 1.0.1", "fatality", "futures 0.3.21", "futures-timer", @@ -9117,8 +8895,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "always-assert", "assert_matches", @@ -9127,11 +8905,12 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parity-scale-codec", - "pin-project 1.0.10", + "pin-project", "polkadot-core-primitives", "polkadot-node-subsystem-util", "polkadot-parachain", "rand 0.8.5", + "rayon", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", @@ -9148,8 +8927,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -9164,8 +8943,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "futures 0.3.21", "memory-lru", @@ -9181,15 +8960,15 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-std", "lazy_static", "log", "mick-jaeger", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-node-primitives", "polkadot-primitives", "sc-network", @@ -9199,8 +8978,8 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bs58", "futures 0.3.21", @@ -9218,8 +8997,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "derive_more", @@ -9232,15 +9011,15 @@ dependencies = [ "rand 0.8.5", "sc-authority-discovery", "sc-network", - "strum 0.24.0", + "strum 0.24.1", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bounded-vec", "futures 0.3.21", @@ -9261,8 +9040,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -9271,8 +9050,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", "futures 0.3.21", @@ -9290,8 +9069,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "derive_more", @@ -9299,12 +9078,12 @@ dependencies = [ "futures 0.3.21", "itertools", "kvdb", - "lru 0.7.6", + "lru 0.7.7", "parity-db", "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.2", - "pin-project 1.0.10", + "pin-project", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -9323,15 +9102,15 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "futures 0.3.21", "futures-timer", - "lru 0.7.6", + "lru 0.7.7", "orchestra", "parity-util-mem", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -9345,8 +9124,8 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", "frame-support", @@ -9362,8 +9141,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "env_logger", "kusama-runtime", @@ -9377,10 +9156,10 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "bitvec 1.0.0", + "bitvec 1.0.1", "frame-system", "hex-literal", "parity-scale-codec", @@ -9407,8 +9186,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -9439,11 +9218,11 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec 1.0.1", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -9472,7 +9251,6 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-multisig", - "pallet-nicks", "pallet-offences", "pallet-offences-benchmarking", "pallet-preimage", @@ -9493,7 +9271,7 @@ dependencies = [ "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", - "polkadot-runtime-constants 0.9.23 (git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0)", + "polkadot-runtime-constants 0.9.26 (git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59)", "polkadot-runtime-parachains", "rustc-hex", "scale-info", @@ -9525,11 +9303,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec 1.0.1", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -9572,20 +9350,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.23" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.23#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" -dependencies = [ - "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", - "smallvec", - "sp-runtime", -] - -[[package]] -name = "polkadot-runtime-constants" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "polkadot-primitives", @@ -9596,8 +9362,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.24" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "polkadot-primitives", @@ -9608,8 +9374,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bs58", "parity-scale-codec", @@ -9620,11 +9386,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitflags", - "bitvec 1.0.0", + "bitvec 1.0.1", "derive_more", "frame-benchmarking", "frame-support", @@ -9663,8 +9429,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "beefy-gadget", @@ -9675,7 +9441,7 @@ dependencies = [ "kusama-runtime", "kvdb", "kvdb-rocksdb", - "lru 0.7.6", + "lru 0.7.7", "pallet-babe", "pallet-im-online", "pallet-staking", @@ -9713,7 +9479,7 @@ dependencies = [ "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", - "polkadot-runtime-constants 0.9.23 (git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0)", + "polkadot-runtime-constants 0.9.26 (git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59)", "polkadot-runtime-parachains", "polkadot-statement-distribution", "rococo-runtime", @@ -9735,7 +9501,7 @@ dependencies = [ "sc-offchain", "sc-service", "sc-sync-state-rpc", - "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23)", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", "sc-telemetry", "sc-transaction-pool", "serde", @@ -9767,8 +9533,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -9788,8 +9554,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -9798,11 +9564,11 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec 1.0.1", "frame-election-provider-support", "frame-executive", "frame-support", @@ -9815,7 +9581,6 @@ dependencies = [ "pallet-balances", "pallet-grandpa", "pallet-indices", - "pallet-nicks", "pallet-offences", "pallet-session", "pallet-staking", @@ -9860,12 +9625,11 @@ dependencies = [ [[package]] name = "polkadot-test-service" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-benchmarking", "frame-system", - "futures 0.1.31", "futures 0.3.21", "hex", "pallet-balances", @@ -9971,7 +9735,7 @@ dependencies = [ [[package]] name = "prioritized-metered-channel" version = "0.2.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "coarsetime", "crossbeam-queue", @@ -10019,9 +9783,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] @@ -10036,15 +9800,15 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "thiserror", ] [[package]] name = "prometheus-client" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a896938cc6018c64f279888b8c7559d3725210d5db9a3a1ee6bc7188d51d34" +checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825" dependencies = [ "dtoa", "itoa 1.0.2", @@ -10063,16 +9827,6 @@ dependencies = [ "syn", ] -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive 0.9.0", -] - [[package]] name = "prost" version = "0.10.4" @@ -10080,23 +9834,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" dependencies = [ "bytes", - "prost-derive 0.10.1", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" dependencies = [ "bytes", - "heck 0.3.3", + "cfg-if 1.0.0", + "cmake", + "heck 0.4.0", "itertools", "lazy_static", "log", "multimap", "petgraph", - "prost 0.9.0", + "prost", "prost-types", "regex", "tempfile", @@ -10104,16 +9860,16 @@ dependencies = [ ] [[package]] -name = "prost-derive" -version = "0.9.0" +name = "prost-codec" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007" dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", + "asynchronous-codec", + "bytes", + "prost", + "thiserror", + "unsigned-varint", ] [[package]] @@ -10131,19 +9887,19 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" +checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" dependencies = [ "bytes", - "prost 0.9.0", + "prost", ] [[package]] name = "psm" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871372391786ccec00d3c5d3d6608905b3d4db263639cfe075d3b60a736d115a" +checksum = "accd89aa18fbf9533a581355a22438101fe9c2ed8c9e2f0dcf520552a3afddf2" dependencies = [ "cc", ] @@ -10167,9 +9923,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -10246,7 +10002,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.7", ] [[package]] @@ -10331,7 +10087,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.7", "redox_syscall", "thiserror", ] @@ -10351,18 +10107,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685d58625b6c2b83e4cc88a27c4bf65adb7b6b16dbdc413e515c9405b47432ab" +checksum = "776c8940430cf563f66a93f9111d1cd39306dc6c68149ecc6b934742a44a828a" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f" +checksum = "5f26c4704460286103bff62ea1fb78d137febc86aaf76952e6c5a2249af01f54" dependencies = [ "proc-macro2", "quote", @@ -10370,21 +10126,22 @@ 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", ] [[package]] name = "regex" -version = "1.5.6" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -10402,9 +10159,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.26" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "region" @@ -10421,7 +10178,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "env_logger", "jsonrpsee", @@ -10530,16 +10287,11 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-merkle-tree", "beefy-primitives", - "bp-messages", - "bp-rococo", - "bp-runtime", - "bp-wococo", - "bridge-runtime-common", "frame-benchmarking", "frame-executive", "frame-support", @@ -10554,9 +10306,6 @@ dependencies = [ "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", "pallet-collective", "pallet-grandpa", "pallet-im-online", @@ -10607,8 +10356,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "polkadot-primitives", @@ -10629,9 +10378,9 @@ dependencies = [ [[package]] name = "rtnetlink" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f54290e54521dac3de4149d83ddf9f62a359b3cc93bcb494a794a41e6f4744b" +checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ "async-global-executor", "futures 0.3.21", @@ -10729,7 +10478,7 @@ dependencies = [ "hex-literal", "karura-runtime", "kusama-runtime", - "kusama-runtime-constants 0.9.24", + "kusama-runtime-constants", "libsecp256k1", "log", "mandala-runtime", @@ -10801,7 +10550,7 @@ dependencies = [ "polkadot-parachain", "polkadot-primitives", "polkadot-runtime", - "polkadot-runtime-constants 0.9.24", + "polkadot-runtime-constants 0.9.26 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.26)", "polkadot-runtime-parachains", "runtime-common", "serde", @@ -10855,7 +10604,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.9", + "semver 1.0.12", ] [[package]] @@ -10866,12 +10615,26 @@ 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", +] + [[package]] name = "rustls" version = "0.20.6" @@ -10907,18 +10670,18 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" [[package]] name = "rw-stream-sink" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" +checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" dependencies = [ "futures 0.3.21", - "pin-project 0.4.29", + "pin-project", "static_assertions", ] @@ -10949,7 +10712,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "sp-core", @@ -10960,7 +10723,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "futures 0.3.21", @@ -10969,7 +10732,7 @@ dependencies = [ "libp2p", "log", "parity-scale-codec", - "prost 0.10.4", + "prost", "prost-build", "rand 0.7.3", "sc-client-api", @@ -10987,7 +10750,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "futures-timer", @@ -11010,7 +10773,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -11026,10 +10789,10 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-trait-for-tuples", - "memmap2 0.5.3", + "memmap2 0.5.5", "parity-scale-codec", "sc-chain-spec-derive", "sc-network", @@ -11043,7 +10806,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11054,10 +10817,10 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "chrono", - "clap 3.1.18", + "clap 3.2.12", "fdlimit", "futures 0.3.21", "hex", @@ -11093,14 +10856,14 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "fnv", "futures 0.3.21", "hash-db", "log", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -11121,7 +10884,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "kvdb", @@ -11131,7 +10894,7 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-client-api", "sc-state-db", "sp-arithmetic", @@ -11146,14 +10909,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "libp2p", "log", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-client-api", "sc-utils", "serde", @@ -11170,7 +10933,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "futures 0.3.21", @@ -11199,7 +10962,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "fork-tree", @@ -11210,7 +10973,7 @@ dependencies = [ "num-rational 0.2.4", "num-traits", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -11242,7 +11005,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "jsonrpsee", @@ -11264,7 +11027,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "fork-tree", "parity-scale-codec", @@ -11277,7 +11040,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "assert_matches", "async-trait", @@ -11311,7 +11074,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "futures 0.3.21", @@ -11336,7 +11099,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "sc-client-api", "sp-authorship", @@ -11347,12 +11110,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "lazy_static", - "lru 0.7.6", + "lru 0.7.7", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -11374,7 +11137,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "environmental", "parity-scale-codec", @@ -11391,7 +11154,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "parity-scale-codec", @@ -11406,13 +11169,15 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "cfg-if 1.0.0", "libc", "log", + "once_cell", "parity-scale-codec", "parity-wasm 0.42.2", + "rustix 0.35.7", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -11424,7 +11189,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ahash", "async-trait", @@ -11436,7 +11201,7 @@ dependencies = [ "hex", "log", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "rand 0.8.5", "sc-block-builder", "sc-chain-spec", @@ -11464,7 +11229,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "finality-grandpa", "futures 0.3.21", @@ -11485,7 +11250,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ansi_term", "futures 0.3.21", @@ -11502,11 +11267,11 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "hex", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "serde_json", "sp-application-crypto", "sp-core", @@ -11517,7 +11282,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "asynchronous-codec", @@ -11535,11 +11300,11 @@ dependencies = [ "linked-hash-map", "linked_hash_set", "log", - "lru 0.7.6", + "lru 0.7.7", "parity-scale-codec", - "parking_lot 0.12.0", - "pin-project 1.0.10", - "prost 0.10.4", + "parking_lot 0.12.1", + "pin-project", + "prost", "prost-build", "rand 0.7.3", "sc-block-builder", @@ -11569,7 +11334,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "libp2p", @@ -11582,14 +11347,14 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ahash", "futures 0.3.21", "futures-timer", "libp2p", "log", - "lru 0.7.6", + "lru 0.7.7", "sc-network", "sp-runtime", "substrate-prometheus-endpoint", @@ -11599,13 +11364,13 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "libp2p", "log", "parity-scale-codec", - "prost 0.10.4", + "prost", "prost-build", "sc-client-api", "sc-network-common", @@ -11619,7 +11384,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "bitflags", "either", @@ -11627,9 +11392,9 @@ dependencies = [ "futures 0.3.21", "libp2p", "log", - "lru 0.7.6", + "lru 0.7.7", "parity-scale-codec", - "prost 0.10.4", + "prost", "prost-build", "sc-client-api", "sc-consensus", @@ -11648,7 +11413,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "bytes", "fnv", @@ -11660,7 +11425,7 @@ dependencies = [ "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "rand 0.7.3", "sc-client-api", "sc-network", @@ -11676,7 +11441,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "libp2p", @@ -11689,7 +11454,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -11698,14 +11463,14 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "hash-db", "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -11728,13 +11493,13 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-chain-spec", "sc-transaction-pool-api", "scale-info", @@ -11751,7 +11516,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "jsonrpsee", @@ -11764,7 +11529,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "directories", @@ -11776,8 +11541,8 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.12.0", - "pin-project 1.0.10", + "parking_lot 0.12.1", + "pin-project", "rand 0.7.3", "sc-block-builder", "sc-chain-spec", @@ -11792,7 +11557,7 @@ dependencies = [ "sc-offchain", "sc-rpc", "sc-rpc-server", - "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596)", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "sc-telemetry", "sc-tracing", "sc-transaction-pool", @@ -11829,13 +11594,13 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-client-api", "sp-core", ] @@ -11843,7 +11608,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -11862,7 +11627,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "libc", @@ -11881,7 +11646,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "libc", @@ -11900,14 +11665,14 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "chrono", "futures 0.3.21", "libp2p", "log", - "parking_lot 0.12.0", - "pin-project 1.0.10", + "parking_lot 0.12.1", + "pin-project", "rand 0.7.3", "serde", "serde_json", @@ -11918,7 +11683,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ansi_term", "atty", @@ -11927,7 +11692,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "regex", "rustc-hash", "sc-client-api", @@ -11949,7 +11714,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11960,7 +11725,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "futures-timer", @@ -11968,7 +11733,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -11987,7 +11752,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "log", @@ -12000,13 +11765,13 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "futures-timer", "lazy_static", "log", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "prometheus", ] @@ -12016,7 +11781,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a" dependencies = [ - "bitvec 1.0.0", + "bitvec 1.0.1", "cfg-if 1.0.0", "derive_more", "parity-scale-codec", @@ -12154,9 +11919,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" +checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" dependencies = [ "serde", ] @@ -12169,9 +11934,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.137" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" dependencies = [ "serde_derive", ] @@ -12188,9 +11953,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" dependencies = [ "proc-macro2", "quote", @@ -12199,9 +11964,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ "itoa 1.0.2", "ryu", @@ -12362,10 +12127,16 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" +[[package]] +name = "slice-group-by" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" + [[package]] name = "slot-range-helper" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "enumn", "parity-scale-codec", @@ -12385,9 +12156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "snap" @@ -12441,7 +12212,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "log", @@ -12458,7 +12229,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "blake2 0.10.4", "proc-macro-crate", @@ -12470,7 +12241,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -12483,7 +12254,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "integer-sqrt", "num-traits", @@ -12498,7 +12269,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -12511,7 +12282,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "parity-scale-codec", @@ -12523,7 +12294,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sp-api", @@ -12535,13 +12306,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "log", - "lru 0.7.6", + "lru 0.7.7", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sp-api", "sp-consensus", "sp-database", @@ -12553,7 +12324,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "futures 0.3.21", @@ -12572,7 +12343,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "parity-scale-codec", @@ -12590,7 +12361,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "merlin", @@ -12613,7 +12384,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -12627,7 +12398,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -12640,7 +12411,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "base58 0.2.0", "bitflags", @@ -12660,7 +12431,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "primitive-types", "rand 0.7.3", "regex", @@ -12686,7 +12457,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "blake2 0.10.4", "byteorder", @@ -12700,7 +12471,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro2", "quote", @@ -12711,16 +12482,16 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "kvdb", - "parking_lot 0.12.0", + "parking_lot 0.12.1", ] [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro2", "quote", @@ -12730,7 +12501,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "environmental", "parity-scale-codec", @@ -12741,7 +12512,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "finality-grandpa", "log", @@ -12759,7 +12530,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -12773,14 +12544,14 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "hash-db", "libsecp256k1", "log", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "secp256k1", "sp-core", "sp-externalities", @@ -12798,7 +12569,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "lazy_static", "sp-core", @@ -12809,13 +12580,13 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "futures 0.3.21", "merlin", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "schnorrkel", "serde", "sp-core", @@ -12826,7 +12597,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "thiserror", "zstd", @@ -12835,7 +12606,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "parity-scale-codec", @@ -12850,7 +12621,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -12864,7 +12635,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "sp-api", "sp-core", @@ -12874,7 +12645,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "backtrace", "lazy_static", @@ -12884,7 +12655,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "rustc-hash", "serde", @@ -12894,7 +12665,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "either", "hash256-std-hasher", @@ -12916,7 +12687,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -12933,7 +12704,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "Inflector", "proc-macro-crate", @@ -12945,7 +12716,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "parity-scale-codec", @@ -12959,7 +12730,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "serde", "serde_json", @@ -12968,7 +12739,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -12982,7 +12753,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -12993,13 +12764,13 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "log", "num-traits", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "rand 0.7.3", "smallvec", "sp-core", @@ -13015,12 +12786,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13033,7 +12804,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "sp-core", @@ -13046,7 +12817,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "futures-timer", @@ -13062,7 +12833,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sp-std", @@ -13074,7 +12845,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "sp-api", "sp-runtime", @@ -13083,7 +12854,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "log", @@ -13099,7 +12870,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "memory-db", @@ -13115,7 +12886,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13132,7 +12903,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -13143,7 +12914,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-trait-for-tuples", "log", @@ -13171,9 +12942,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.20.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1e7c268f5610088463d23188fc9e764cda491784360e5e4ea3a8ce1e0e2ac9" +checksum = "77ef98aedad3dc52e10995e7ed15f1279e11d4da35795f5dac7305742d0feb66" dependencies = [ "Inflector", "num-format", @@ -13193,7 +12964,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "statemine-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -13209,7 +12980,7 @@ dependencies = [ "frame-support", "frame-system", "frame-system-rpc-runtime-api", - "kusama-runtime-constants 0.9.23 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.23)", + "kusama-runtime-constants", "log", "pallet-asset-tx-payment", "pallet-assets", @@ -13256,7 +13027,7 @@ dependencies = [ [[package]] name = "statemint-runtime" version = "1.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -13294,7 +13065,7 @@ dependencies = [ "polkadot-core-primitives", "polkadot-parachain", "polkadot-runtime-common", - "polkadot-runtime-constants 0.9.23 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.23)", + "polkadot-runtime-constants 0.9.26 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.26)", "scale-info", "serde", "smallvec", @@ -13383,11 +13154,11 @@ dependencies = [ [[package]] name = "strum" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros 0.24.0", + "strum_macros 0.24.2", ] [[package]] @@ -13405,9 +13176,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" +checksum = "4faebde00e8ff94316c01800f9054fd2ba77d30d9e922541913051d1d978918b" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -13445,7 +13216,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "platforms 2.0.0", ] @@ -13453,7 +13224,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -13474,7 +13245,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures-util", "hyper", @@ -13487,7 +13258,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "jsonrpsee", "log", @@ -13508,7 +13279,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "futures 0.3.21", @@ -13534,7 +13305,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "futures 0.3.21", "substrate-test-utils-derive", @@ -13544,7 +13315,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -13555,11 +13326,12 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", + "filetime", "sp-maybe-compressed-blob", "strum 0.23.0", "tempfile", @@ -13576,9 +13348,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", @@ -13655,8 +13427,8 @@ dependencies = [ [[package]] name = "test-runtime-constants" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "polkadot-primitives", @@ -13702,7 +13474,7 @@ dependencies = [ "pallet-sudo", "pallet-transaction-payment", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-primitives", "polkadot-service", "polkadot-test-service", @@ -13916,17 +13688,18 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.18.2" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" +checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" dependencies = [ + "autocfg", "bytes", "libc", "memchr", "mio", "num_cpus", "once_cell", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "pin-project-lite 0.2.9", "signal-hook-registry", "socket2", @@ -13936,9 +13709,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", @@ -13956,11 +13729,22 @@ dependencies = [ "webpki", ] +[[package]] +name = "tokio-stream" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.9", + "tokio", +] + [[package]] name = "tokio-util" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ "bytes", "futures-core", @@ -13982,15 +13766,15 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ "cfg-if 1.0.0", "pin-project-lite 0.2.9", @@ -14000,9 +13784,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" dependencies = [ "proc-macro2", "quote", @@ -14011,11 +13795,11 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.26" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" dependencies = [ - "lazy_static", + "once_cell", "valuable", ] @@ -14025,14 +13809,14 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.10", + "pin-project", "tracing", ] [[package]] name = "tracing-gum" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -14042,8 +13826,8 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -14061,7 +13845,7 @@ dependencies = [ "ahash", "lazy_static", "log", - "lru 0.7.6", + "lru 0.7.7", "tracing-core", ] @@ -14105,7 +13889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83" dependencies = [ "hash-db", - "hashbrown 0.12.1", + "hashbrown 0.12.2", "log", "rustc-hex", "smallvec", @@ -14166,7 +13950,7 @@ dependencies = [ "lazy_static", "log", "lru-cache", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", @@ -14182,9 +13966,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "clap 3.1.18", + "clap 3.2.12", "jsonrpsee", "log", "parity-scale-codec", @@ -14230,9 +14014,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" [[package]] name = "uint" @@ -14263,15 +14047,15 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" dependencies = [ "tinyvec", ] @@ -14421,9 +14205,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -14431,9 +14215,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" dependencies = [ "bumpalo", "lazy_static", @@ -14446,9 +14230,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" +checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -14458,9 +14242,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -14468,9 +14252,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" dependencies = [ "proc-macro2", "quote", @@ -14481,9 +14265,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" [[package]] name = "wasm-gc-api" @@ -14547,15 +14331,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", @@ -14565,7 +14352,7 @@ dependencies = [ "lazy_static", "libc", "log", - "object 0.27.1", + "object 0.28.4", "once_cell", "paste", "psm", @@ -14584,9 +14371,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 0.13.0", @@ -14594,7 +14381,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix", + "rustix 0.33.7", "serde", "sha2 0.9.9", "toml", @@ -14604,9 +14391,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", @@ -14617,7 +14404,7 @@ dependencies = [ "gimli", "log", "more-asserts", - "object 0.27.1", + "object 0.28.4", "target-lexicon", "thiserror", "wasmparser", @@ -14626,9 +14413,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", @@ -14636,7 +14423,7 @@ dependencies = [ "indexmap", "log", "more-asserts", - "object 0.27.1", + "object 0.28.4", "serde", "target-lexicon", "thiserror", @@ -14646,9 +14433,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", @@ -14657,10 +14444,10 @@ dependencies = [ "cpp_demangle", "gimli", "log", - "object 0.27.1", + "object 0.28.4", "region", "rustc-demangle", - "rustix", + "rustix 0.33.7", "serde", "target-lexicon", "thiserror", @@ -14672,20 +14459,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 0.27.1", - "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", @@ -14700,7 +14487,7 @@ dependencies = [ "more-asserts", "rand 0.8.5", "region", - "rustix", + "rustix 0.33.7", "thiserror", "wasmtime-environ", "wasmtime-jit-debug", @@ -14709,9 +14496,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", @@ -14721,9 +14508,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.57" +version = "0.3.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" +checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90" dependencies = [ "js-sys", "wasm-bindgen", @@ -14741,9 +14528,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.3" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" +checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" dependencies = [ "webpki", ] @@ -14778,11 +14565,11 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec 1.0.1", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -14809,7 +14596,6 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-multisig", - "pallet-nicks", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", "pallet-offences", @@ -14867,8 +14653,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "polkadot-primitives", @@ -14927,15 +14713,15 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.29.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac7fef12f4b59cd0a29339406cc9203ab44e440ddff6b3f5a41455349fa9cf3" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" dependencies = [ - "windows_aarch64_msvc 0.29.0", - "windows_i686_gnu 0.29.0", - "windows_i686_msvc 0.29.0", - "windows_x86_64_gnu 0.29.0", - "windows_x86_64_msvc 0.29.0", + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", ] [[package]] @@ -14953,9 +14739,9 @@ dependencies = [ [[package]] name = "windows_aarch64_msvc" -version = "0.29.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_aarch64_msvc" @@ -14965,9 +14751,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_i686_gnu" -version = "0.29.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_gnu" @@ -14977,9 +14763,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_msvc" -version = "0.29.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_i686_msvc" @@ -14989,9 +14775,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_x86_64_gnu" -version = "0.29.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_gnu" @@ -15001,9 +14787,9 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_msvc" -version = "0.29.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "windows_x86_64_msvc" @@ -15042,21 +14828,22 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derivative", "impl-trait-for-tuples", "log", "parity-scale-codec", "scale-info", + "sp-runtime", "xcm-procedural", ] [[package]] name = "xcm-builder" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "frame-system", @@ -15076,7 +14863,7 @@ dependencies = [ [[package]] name = "xcm-emulator" version = "0.1.0" -source = "git+https://github.com/shaunxw/xcm-simulator?rev=651af78d6d7521dc76e1f6bb257af485f8a454c7#651af78d6d7521dc76e1f6bb257af485f8a454c7" +source = "git+https://github.com/shaunxw/xcm-simulator?rev=ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe#ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -15091,6 +14878,7 @@ dependencies = [ "paste", "polkadot-primitives", "polkadot-runtime-parachains", + "quote", "sp-io", "sp-std", "xcm", @@ -15099,8 +14887,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-benchmarking", "frame-support", @@ -15118,7 +14906,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "Inflector", "proc-macro2", @@ -15128,8 +14916,8 @@ dependencies = [ [[package]] name = "xcm-simulator" -version = "0.9.23" -source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "parity-scale-codec", @@ -15152,16 +14940,16 @@ dependencies = [ "futures 0.3.21", "log", "nohash-hasher", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "rand 0.8.5", "static_assertions", ] [[package]] name = "zeroize" -version = "1.4.3" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" +checksum = "20b578acffd8516a6c3f2a1bdefc1ec37e547bb4e0fb8b6b01a4cafc886b4442" dependencies = [ "zeroize_derive", ] @@ -15180,18 +14968,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", @@ -15199,9 +14987,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/Cargo.toml b/Cargo.toml index eeef2ae22..d4ae10e73 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -128,202 +128,202 @@ yamux = { opt-level = 3 } zeroize = { opt-level = 3 } [patch."https://github.com/paritytech/substrate"] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -frame-executive = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-gilt = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-nicks = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-society = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-beefy = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-bags-list = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -pallet-preimage = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -beefy-primitives = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -beefy-merkle-tree = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -beefy-gadget = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -beefy-gadget-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-cli = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-consensus-uncles = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-informant = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-network = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-service = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-serializer = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -substrate-test-client = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } -substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +frame-executive = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-gilt = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-society = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-beefy = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-bags-list = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +pallet-preimage = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +beefy-primitives = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +beefy-merkle-tree = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +beefy-gadget = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +beefy-gadget-rpc = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-cli = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-consensus-uncles = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-informant = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-network = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-service = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-serializer = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +substrate-test-client = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } +substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" } [patch."https://github.com/paritytech/polkadot"] -kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -test-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -xcm = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +kusama-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +test-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "d8785970175dce344f2a6ad1cd88297529a6dd59" } [patch."https://github.com/paritytech/cumulus"] -cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -statemine-runtime = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -statemint-runtime = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } -parachains-common = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +statemine-runtime = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +statemint-runtime = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +parachains-common = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } diff --git a/ecosystem-modules/compound-cash/Cargo.toml b/ecosystem-modules/compound-cash/Cargo.toml index 10e1eda40..8fe9f9365 100644 --- a/ecosystem-modules/compound-cash/Cargo.toml +++ b/ecosystem-modules/compound-cash/Cargo.toml @@ -8,16 +8,16 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } module-support = { path = "../../modules/support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/ecosystem-modules/ren/renvm-bridge/Cargo.toml b/ecosystem-modules/ren/renvm-bridge/Cargo.toml index 958ab52ed..f5c54b917 100644 --- a/ecosystem-modules/ren/renvm-bridge/Cargo.toml +++ b/ecosystem-modules/ren/renvm-bridge/Cargo.toml @@ -8,12 +8,12 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } support = { package = "module-support", path = "../../../modules/support", default-features = false } orml-traits = { path = "../../../orml/traits", default-features = false } primitives = { package = "acala-primitives", path = "../../../primitives", default-features = false } @@ -22,7 +22,7 @@ primitives = { package = "acala-primitives", path = "../../../primitives", defau hex-literal = "0.3.1" orml-currencies = { path = "../../../orml/currencies" } orml-tokens = { path = "../../../orml/tokens" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/ecosystem-modules/stable-asset b/ecosystem-modules/stable-asset index e923cc8e8..8a41498bc 160000 --- a/ecosystem-modules/stable-asset +++ b/ecosystem-modules/stable-asset @@ -1 +1 @@ -Subproject commit e923cc8e8f143adc9aa3a0a8da6bb414fb035aa3 +Subproject commit 8a41498bc8c0a0d85f439b4da15d13677fc4e522 diff --git a/ecosystem-modules/starport/Cargo.toml b/ecosystem-modules/starport/Cargo.toml index 7df479436..829d63458 100644 --- a/ecosystem-modules/starport/Cargo.toml +++ b/ecosystem-modules/starport/Cargo.toml @@ -7,18 +7,18 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens"} diff --git a/evm-tests b/evm-tests index 45e4b8b16..ccbfc268d 160000 --- a/evm-tests +++ b/evm-tests @@ -1 +1 @@ -Subproject commit 45e4b8b16a99d893746fe0705b92416a2c915276 +Subproject commit ccbfc268dd5be2f290a31f318623a4fe9afacc1c diff --git a/inspect/Cargo.toml b/inspect/Cargo.toml index d4aa4902e..34174be89 100644 --- a/inspect/Cargo.toml +++ b/inspect/Cargo.toml @@ -9,9 +9,9 @@ codec = { package = "parity-scale-codec", version = "3.0.0" } clap = { version = "3.1.6", features = ["derive"] } derive_more = "0.99" log = "0.4.17" -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } diff --git a/modules/aggregated-dex/Cargo.toml b/modules/aggregated-dex/Cargo.toml index d23c5e3a7..5938cfc57 100644 --- a/modules/aggregated-dex/Cargo.toml +++ b/modules/aggregated-dex/Cargo.toml @@ -8,11 +8,11 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } @@ -22,9 +22,9 @@ orml-tokens = { path = "../../orml/tokens", default-features = false } [dev-dependencies] orml-tokens = { path = "../../orml/tokens" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/modules/aggregated-dex/src/lib.rs b/modules/aggregated-dex/src/lib.rs index 92a66b3d4..a6c829a64 100644 --- a/modules/aggregated-dex/src/lib.rs +++ b/modules/aggregated-dex/src/lib.rs @@ -93,7 +93,6 @@ pub mod module { /// The specific swap paths for AggregatedSwap do aggreated_swap to swap TokenA to TokenB /// /// AggregatedSwapPaths: Map: (token_a: CurrencyId, token_b: CurrencyId) => paths: Vec - #[pallet::storage] #[pallet::getter(fn aggregated_swap_paths)] pub type AggregatedSwapPaths = diff --git a/modules/asset-registry/Cargo.toml b/modules/asset-registry/Cargo.toml index 31dd10168..e829f40f6 100644 --- a/modules/asset-registry/Cargo.toml +++ b/modules/asset-registry/Cargo.toml @@ -9,23 +9,23 @@ log = { version = "0.4.17", default-features = false } serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] serde_json = "1.0.68" hex = "0.4" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } module-evm = { path = "../evm" } module-evm-bridge = { path = "../evm-bridge" } diff --git a/modules/asset-registry/src/lib.rs b/modules/asset-registry/src/lib.rs index ee3d05af3..73ce30a78 100644 --- a/modules/asset-registry/src/lib.rs +++ b/modules/asset-registry/src/lib.rs @@ -558,7 +558,7 @@ fn key_to_currency(location: MultiLocation) -> Option { MultiLocation { parents: 0, interior: X1(Junction::GeneralKey(key)), - } => CurrencyId::decode(&mut &*key).ok(), + } => CurrencyId::decode(&mut &*key.into_inner()).ok(), _ => None, } } diff --git a/modules/auction-manager/Cargo.toml b/modules/auction-manager/Cargo.toml index 263beaec6..8bf6b1240 100644 --- a/modules/auction-manager/Cargo.toml +++ b/modules/auction-manager/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-auction = { path = "../../orml/auction" } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } module-dex = { path = "../dex" } diff --git a/modules/cdp-engine/Cargo.toml b/modules/cdp-engine/Cargo.toml index 020cbad85..2b239a23b 100644 --- a/modules/cdp-engine/Cargo.toml +++ b/modules/cdp-engine/Cargo.toml @@ -8,14 +8,14 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } @@ -23,9 +23,9 @@ rand_chacha = { version = "0.2", default-features = false } nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-currencies = { path = "../../orml/currencies" } dex = { package = "module-dex", path = "../dex"} cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } diff --git a/modules/cdp-treasury/Cargo.toml b/modules/cdp-treasury/Cargo.toml index 941ff3828..a502b01d8 100644 --- a/modules/cdp-treasury/Cargo.toml +++ b/modules/cdp-treasury/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-currencies = { path = "../../orml/currencies" } orml-auction = { path = "../../orml/auction" } module-dex = { path = "../dex" } diff --git a/modules/cdp-treasury/src/mock.rs b/modules/cdp-treasury/src/mock.rs index 98aedd058..cd2d8914e 100644 --- a/modules/cdp-treasury/src/mock.rs +++ b/modules/cdp-treasury/src/mock.rs @@ -23,7 +23,7 @@ use super::*; use frame_support::{ construct_runtime, ord_parameter_types, parameter_types, - traits::{ConstU128, ConstU32, ConstU64, EnsureOneOf, Everything, Nothing}, + traits::{ConstU128, ConstU32, ConstU64, EitherOfDiverse, Everything, Nothing}, }; use frame_system::{EnsureRoot, EnsureSignedBy}; use nutsfinance_stable_asset::traits::StableAsset; @@ -211,7 +211,7 @@ impl Config for Runtime { type Currency = Currencies; type GetStableCurrencyId = GetStableCurrencyId; type AuctionManagerHandler = MockAuctionManager; - type UpdateOrigin = EnsureOneOf, EnsureSignedBy>; + type UpdateOrigin = EitherOfDiverse, EnsureSignedBy>; type DEX = DEXModule; type Swap = SpecificJointsSwap; type MaxAuctionsCount = ConstU32<5>; diff --git a/modules/collator-selection/Cargo.toml b/modules/collator-selection/Cargo.toml index 293e65c77..8b7f66367 100644 --- a/modules/collator-selection/Cargo.toml +++ b/modules/collator-selection/Cargo.toml @@ -13,26 +13,26 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ['std'] diff --git a/modules/currencies/Cargo.toml b/modules/currencies/Cargo.toml index c545c213b..4b65fbcf4 100644 --- a/modules/currencies/Cargo.toml +++ b/modules/currencies/Cargo.toml @@ -8,13 +8,13 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } @@ -26,9 +26,9 @@ support = { package = "module-support", path = "../support", default-features = serde_json = "1.0.68" hex = "0.4" hex-literal = "0.3.1" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } tokens = { package = "orml-tokens", path = "../../orml/tokens" } module-evm = { path = "../evm" } module-evm-bridge = { path = "../evm-bridge" } diff --git a/modules/dex-oracle/Cargo.toml b/modules/dex-oracle/Cargo.toml index 7dfa2bee0..2d289c324 100644 --- a/modules/dex-oracle/Cargo.toml +++ b/modules/dex-oracle/Cargo.toml @@ -8,20 +8,20 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/modules/dex/Cargo.toml b/modules/dex/Cargo.toml index 8d8995886..77483a49b 100644 --- a/modules/dex/Cargo.toml +++ b/modules/dex/Cargo.toml @@ -8,20 +8,20 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] orml-tokens = { path = "../../orml/tokens" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/modules/earning/Cargo.toml b/modules/earning/Cargo.toml index 4f0037e95..0292ecd12 100644 --- a/modules/earning/Cargo.toml +++ b/modules/earning/Cargo.toml @@ -9,11 +9,11 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } @@ -23,8 +23,8 @@ primitives = { package = "acala-primitives", path = "../../primitives", default- paste = "1.0" [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/modules/emergency-shutdown/Cargo.toml b/modules/emergency-shutdown/Cargo.toml index b176c7f4c..608757272 100644 --- a/modules/emergency-shutdown/Cargo.toml +++ b/modules/emergency-shutdown/Cargo.toml @@ -8,18 +8,18 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-currencies = { path = "../../orml/currencies" } orml-traits = { path = "../../orml/traits" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/evm-accounts/Cargo.toml b/modules/evm-accounts/Cargo.toml index 81b0ba6ca..835c26693 100644 --- a/modules/evm-accounts/Cargo.toml +++ b/modules/evm-accounts/Cargo.toml @@ -10,12 +10,12 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = libsecp256k1 = { version = "0.7", default-features = false, features = ["hmac", "static-context"], optional = true } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } @@ -24,7 +24,7 @@ module-support = { path = "../support", default-features = false } module-evm-utility-macro = { path = "../evm-utility/macro" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/evm-bridge/Cargo.toml b/modules/evm-bridge/Cargo.toml index 27d269549..c202a3c21 100644 --- a/modules/evm-bridge/Cargo.toml +++ b/modules/evm-bridge/Cargo.toml @@ -11,12 +11,12 @@ targets = ["x86_64-unknown-linux-gnu"] serde = { version = "1.0.136", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder"] } impl-trait-for-tuples = "0.2.2" ethereum-types = { version = "0.13.1", default-features = false } @@ -29,8 +29,8 @@ num_enum = { version = "0.5.1", default-features = false } [dev-dependencies] serde_json = "1.0.68" hex = "0.4" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml index 631c6c9bf..8f2fe8989 100644 --- a/modules/evm-utility/Cargo.toml +++ b/modules/evm-utility/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] sha3 = { version = "0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } evm = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false, features = ["with-codec"] } evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false } diff --git a/modules/evm-utility/macro/Cargo.toml b/modules/evm-utility/macro/Cargo.toml index 9419ef5b6..ace028f7a 100644 --- a/modules/evm-utility/macro/Cargo.toml +++ b/modules/evm-utility/macro/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" proc-macro = true [dependencies] -quote = "1.0.10" -syn = { version = "1.0.80", features = ["full", "fold", "extra-traits", "visit"] } -proc-macro2 = "1.0.30" +quote = "1.0.20" +syn = { version = "1.0.98", features = ["full", "fold", "extra-traits", "visit"] } +proc-macro2 = "1.0.40" module-evm-utility = { path = ".." } diff --git a/modules/evm/Cargo.toml b/modules/evm/Cargo.toml index 2e27da4e9..5d6cbb6f9 100644 --- a/modules/evm/Cargo.toml +++ b/modules/evm/Cargo.toml @@ -24,15 +24,15 @@ hex = { version = "0.4", default-features = false, features = ["alloc"], optiona num = { version = "0.4", features = ["alloc"], default-features = false } bn = { package = "substrate-bn", version = "0.6", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-bencher = { path = "../../orml/bencher", default-features = false, optional = true } orml-currencies = { path = "../../orml/currencies", default-features = false, optional = true } @@ -45,7 +45,7 @@ module-idle-scheduler = { path = "../idle-scheduler", default-features = false, module-transaction-payment = { path = "../../modules/transaction-payment", default-features = false } module-dex = { path = "../dex", default-features = false, optional = true } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } [dev-dependencies] hex = "0.4" diff --git a/modules/evm/rpc/Cargo.toml b/modules/evm/rpc/Cargo.toml index 5d51f7bbd..1d83669df 100644 --- a/modules/evm/rpc/Cargo.toml +++ b/modules/evm/rpc/Cargo.toml @@ -5,20 +5,20 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } rustc-hex = "2.1.0" serde = { version = "1.0.136", features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } primitives = { package = "acala-primitives", path = "../../../primitives" } module-evm-rpc-runtime-api = { path = "runtime_api" } diff --git a/modules/evm/rpc/runtime_api/Cargo.toml b/modules/evm/rpc/runtime_api/Cargo.toml index 6d6d3b8e2..0403f7c40 100644 --- a/modules/evm/rpc/runtime_api/Cargo.toml +++ b/modules/evm/rpc/runtime_api/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } primitives = { package = "acala-primitives", path = "../../../../primitives", default-features = false } [features] diff --git a/modules/evm/src/lib.rs b/modules/evm/src/lib.rs index c3d222934..452d2bc2e 100644 --- a/modules/evm/src/lib.rs +++ b/modules/evm/src/lib.rs @@ -37,7 +37,7 @@ use frame_support::{ pallet_prelude::*, parameter_types, traits::{ - BalanceStatus, Currency, EnsureOneOf, EnsureOrigin, ExistenceRequirement, FindAuthor, Get, + BalanceStatus, Currency, EitherOfDiverse, EnsureOrigin, ExistenceRequirement, FindAuthor, Get, NamedReservableCurrency, OnKilledAccount, }, transactional, @@ -69,7 +69,6 @@ use scale_info::TypeInfo; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; use sha3::{Digest, Keccak256}; -use sp_io::KillStorageResult::{AllRemoved, SomeRemaining}; use sp_runtime::{ traits::{Convert, DispatchInfoOf, One, PostDispatchInfoOf, SignedExtension, UniqueSaturatedInto, Zero}, transaction_validity::TransactionValidityError, @@ -1576,7 +1575,8 @@ impl Pallet { } fn ensure_root_or_signed(o: T::Origin) -> Result, BadOrigin> { - EnsureOneOf::, EnsureSigned>::try_origin(o).map_or(Err(BadOrigin), Ok) + EitherOfDiverse::, EnsureSigned>::try_origin(o) + .map_or(Err(BadOrigin), Ok) } fn can_call_contract(address: &H160, caller: &H160) -> bool { @@ -1969,40 +1969,34 @@ impl DispatchableTask for EvmTask { 100, ) as u32; - match >::remove_prefix(contract, Some(limit)) { - AllRemoved(count) => { - let res = Pallet::::refund_storage(&caller, &contract, &maintainer); - log::debug!( - target: "evm", - "EvmTask::Remove: [from: {:?}, contract: {:?}, maintainer: {:?}, count: {:?}, result: {:?}]", - caller, contract, maintainer, count, res - ); - - // Remove account after all of the storages are cleared. - Pallet::::remove_account_if_empty(&contract); - - TaskResult { - result: res, - used_weight: ::DbWeight::get() - .write - .saturating_mul(count.into()), - finished: true, - } + let r = >::clear_prefix(contract, limit, None); + let count = r.unique; + let used_weight = ::DbWeight::get() + .write + .saturating_mul(count.into()); + log::debug!( + target: "evm", + "EvmTask::Remove: [from: {:?}, contract: {:?}, maintainer: {:?}, count: {:?}]", + caller, contract, maintainer, count + ); + if r.maybe_cursor.is_none() { + // AllRemoved + let result = Pallet::::refund_storage(&caller, &contract, &maintainer); + + // Remove account after all of the storages are cleared. + Pallet::::remove_account_if_empty(&contract); + + TaskResult { + result, + used_weight, + finished: true, } - SomeRemaining(count) => { - log::debug!( - target: "evm", - "EvmTask::Remove: [from: {:?}, contract: {:?}, maintainer: {:?}, count: {:?}]", - caller, contract, maintainer, count - ); - - TaskResult { - result: Ok(()), - used_weight: ::DbWeight::get() - .write - .saturating_mul(count.into()), - finished: false, - } + } else { + // SomeRemaining + TaskResult { + result: Ok(()), + used_weight, + finished: false, } } } diff --git a/modules/evm/src/runner/stack.rs b/modules/evm/src/runner/stack.rs index d1fc75a98..afd818247 100644 --- a/modules/evm/src/runner/stack.rs +++ b/modules/evm/src/runner/stack.rs @@ -776,7 +776,7 @@ impl<'vicinity, 'config, T: Config> StackStateT<'config> for SubstrateStackState } fn reset_storage(&mut self, address: H160) { - >::remove_prefix(address, None); + let _ = >::clear_prefix(address, u32::MAX, None); } fn log(&mut self, address: H160, topics: Vec, data: Vec) { diff --git a/modules/example/Cargo.toml b/modules/example/Cargo.toml index 0544f4ff1..6b3b1e74d 100644 --- a/modules/example/Cargo.toml +++ b/modules/example/Cargo.toml @@ -8,13 +8,13 @@ edition = "2021" serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/modules/homa-lite/Cargo.toml b/modules/homa-lite/Cargo.toml index 2b45276de..620c3d8a9 100644 --- a/modules/homa-lite/Cargo.toml +++ b/modules/homa-lite/Cargo.toml @@ -7,27 +7,27 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } module-relaychain = { path = "../relaychain", features = ["kusama"] } [features] diff --git a/modules/homa-validator-list/Cargo.toml b/modules/homa-validator-list/Cargo.toml index 9167b8c52..fa02e1ce2 100644 --- a/modules/homa-validator-list/Cargo.toml +++ b/modules/homa-validator-list/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-tokens = { path = "../../orml/tokens" } orml-currencies = { path = "../../orml/currencies" } diff --git a/modules/homa/Cargo.toml b/modules/homa/Cargo.toml index c550cfede..8e6144942 100644 --- a/modules/homa/Cargo.toml +++ b/modules/homa/Cargo.toml @@ -7,23 +7,23 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } [features] default = ["std"] diff --git a/modules/honzon-bridge/Cargo.toml b/modules/honzon-bridge/Cargo.toml index 478d78f5a..76770511d 100644 --- a/modules/honzon-bridge/Cargo.toml +++ b/modules/honzon-bridge/Cargo.toml @@ -8,20 +8,20 @@ edition = "2021" serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } [dev-dependencies] serde_json = "1.0.68" hex = "0.4" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } module-currencies = { path = "../../modules/currencies" } module-evm = { path = "../evm" } diff --git a/modules/honzon/Cargo.toml b/modules/honzon/Cargo.toml index 3ac7a63bc..ba0648bb7 100644 --- a/modules/honzon/Cargo.toml +++ b/modules/honzon/Cargo.toml @@ -8,20 +8,20 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } cdp-engine = { package = "module-cdp-engine", path = "../cdp-engine", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-currencies = { path = "../../orml/currencies" } orml-traits = { path = "../../orml/traits" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/honzon/src/lib.rs b/modules/honzon/src/lib.rs index 2665d66d0..6ed31ceaa 100644 --- a/modules/honzon/src/lib.rs +++ b/modules/honzon/src/lib.rs @@ -256,7 +256,7 @@ pub mod module { #[transactional] pub fn unauthorize_all(origin: OriginFor) -> DispatchResult { let from = ensure_signed(origin)?; - Authorization::::remove_prefix(&from, None); + let _ = Authorization::::clear_prefix(&from, u32::MAX, None); ::Currency::unreserve_all_named(&RESERVE_ID, &from); Self::deposit_event(Event::UnAuthorizationAll { authorizer: from }); Ok(()) diff --git a/modules/honzon/src/tests.rs b/modules/honzon/src/tests.rs index ce0cce65a..5dad83098 100644 --- a/modules/honzon/src/tests.rs +++ b/modules/honzon/src/tests.rs @@ -35,7 +35,7 @@ fn authorize_should_work() { assert_ok!(HonzonModule::authorize(Origin::signed(ALICE), BTC, BOB)); assert_eq!( PalletBalances::reserved_balance(ALICE), - ::DepositPerAuthorization::get() + <::DepositPerAuthorization as sp_runtime::traits::Get>::get() ); System::assert_last_event(Event::HonzonModule(crate::Event::Authorization { authorizer: ALICE, @@ -57,7 +57,7 @@ fn unauthorize_should_work() { assert_ok!(HonzonModule::authorize(Origin::signed(ALICE), BTC, BOB)); assert_eq!( PalletBalances::reserved_balance(ALICE), - ::DepositPerAuthorization::get() + <::DepositPerAuthorization as sp_runtime::traits::Get>::get() ); assert_ok!(HonzonModule::check_authorization(&ALICE, &BOB, BTC)); diff --git a/modules/idle-scheduler/Cargo.toml b/modules/idle-scheduler/Cargo.toml index e3d4e7882..090620a50 100644 --- a/modules/idle-scheduler/Cargo.toml +++ b/modules/idle-scheduler/Cargo.toml @@ -8,16 +8,16 @@ edition = "2021" serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } acala-primitives = { path = "../../primitives", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/modules/idle-scheduler/src/lib.rs b/modules/idle-scheduler/src/lib.rs index 2b81d05dc..7ad718b44 100644 --- a/modules/idle-scheduler/src/lib.rs +++ b/modules/idle-scheduler/src/lib.rs @@ -23,10 +23,10 @@ #![cfg_attr(not(feature = "std"), no_std)] #![allow(clippy::unused_unit)] #![allow(unused_must_use)] + use acala_primitives::{task::TaskResult, BlockNumber, Nonce}; use codec::FullCodec; -use frame_support::log; -use frame_support::pallet_prelude::*; +use frame_support::{log, pallet_prelude::*}; use frame_system::pallet_prelude::*; pub use module_support::{DispatchableTask, IdleScheduler}; use scale_info::TypeInfo; diff --git a/modules/incentives/Cargo.toml b/modules/incentives/Cargo.toml index e0eb2d1fd..9c77b6be5 100644 --- a/modules/incentives/Cargo.toml +++ b/modules/incentives/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-rewards = { path = "../../orml/rewards", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-tokens = { path = "../../orml/tokens" } orml-rewards = { path = "../../orml/rewards" } diff --git a/modules/loans/Cargo.toml b/modules/loans/Cargo.toml index 24e593815..9268bd505 100644 --- a/modules/loans/Cargo.toml +++ b/modules/loans/Cargo.toml @@ -8,18 +8,18 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } diff --git a/modules/nft/Cargo.toml b/modules/nft/Cargo.toml index 8f644b5a7..58ece3fc6 100644 --- a/modules/nft/Cargo.toml +++ b/modules/nft/Cargo.toml @@ -9,22 +9,22 @@ serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-nft = { path = "../../orml/nft", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-tokens = { path = "../../orml/tokens" } module-currencies = { path = "../../modules/currencies" } diff --git a/modules/nominees-election/Cargo.toml b/modules/nominees-election/Cargo.toml index 2d73b2b01..76403c068 100644 --- a/modules/nominees-election/Cargo.toml +++ b/modules/nominees-election/Cargo.toml @@ -8,18 +8,18 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/prices/Cargo.toml b/modules/prices/Cargo.toml index 10bac1b3e..3d684e5d1 100644 --- a/modules/prices/Cargo.toml +++ b/modules/prices/Cargo.toml @@ -8,17 +8,17 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-tokens = { path = "../../orml/tokens" } [features] diff --git a/modules/relaychain/Cargo.toml b/modules/relaychain/Cargo.toml index 51a11104b..f26bb1ec3 100644 --- a/modules/relaychain/Cargo.toml +++ b/modules/relaychain/Cargo.toml @@ -7,18 +7,18 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } module-support = { path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/modules/session-manager/Cargo.toml b/modules/session-manager/Cargo.toml index e8d964f8f..a834a557b 100644 --- a/modules/session-manager/Cargo.toml +++ b/modules/session-manager/Cargo.toml @@ -9,15 +9,15 @@ log = { version = "0.4.17", default-features = false } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/modules/support/Cargo.toml b/modules/support/Cargo.toml index 8eeb40525..4da08c33a 100644 --- a/modules/support/Cargo.toml +++ b/modules/support/Cargo.toml @@ -8,14 +8,14 @@ edition = "2021" impl-trait-for-tuples = "0.2.2" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } [features] diff --git a/modules/transaction-pause/Cargo.toml b/modules/transaction-pause/Cargo.toml index 291f1f05e..2c5567b05 100644 --- a/modules/transaction-pause/Cargo.toml +++ b/modules/transaction-pause/Cargo.toml @@ -7,15 +7,15 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-tokens = { path = "../../orml/tokens" } orml-traits = { path = "../../orml/traits" } primitives = { package = "acala-primitives", path = "../../primitives" } diff --git a/modules/transaction-payment/Cargo.toml b/modules/transaction-payment/Cargo.toml index d28a26596..70b3439c9 100644 --- a/modules/transaction-payment/Cargo.toml +++ b/modules/transaction-payment/Cargo.toml @@ -8,22 +8,22 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-tokens = { path = "../../orml/tokens" } module-currencies = { path = "../../modules/currencies" } module-dex = { path = "../dex" } diff --git a/modules/transaction-payment/src/tests.rs b/modules/transaction-payment/src/tests.rs index 7ea86a12d..c093e1073 100644 --- a/modules/transaction-payment/src/tests.rs +++ b/modules/transaction-payment/src/tests.rs @@ -959,7 +959,8 @@ fn charge_fee_by_alternative_swap_first_priority() { let init_balance = FeePoolSize::get(); let dot_ed = Currencies::minimum_balance(DOT); let ed = Currencies::minimum_balance(ACA); - let alternative_fee_swap_deposit: u128 = ::AlternativeFeeSwapDeposit::get(); + let alternative_fee_swap_deposit: u128 = + <::AlternativeFeeSwapDeposit as frame_support::traits::Get>::get(); assert_eq!(DEXModule::get_liquidity_pool(ACA, AUSD), (10000, 1000)); assert_eq!(DEXModule::get_liquidity_pool(DOT, AUSD), (100, 1000)); @@ -1024,7 +1025,8 @@ fn charge_fee_by_default_fee_tokens_second_priority() { let init_balance = FeePoolSize::get(); let dot_ed = Currencies::minimum_balance(DOT); let ed = Currencies::minimum_balance(ACA); - let alternative_fee_swap_deposit: u128 = ::AlternativeFeeSwapDeposit::get(); + let alternative_fee_swap_deposit: u128 = + <::AlternativeFeeSwapDeposit as frame_support::traits::Get>::get(); assert_eq!(DEXModule::get_liquidity_pool(ACA, AUSD), (10000, 1000)); assert_eq!(DEXModule::get_liquidity_pool(DOT, AUSD), (100, 1000)); @@ -1449,7 +1451,7 @@ impl Convert> for CurrencyIdConvert { MultiLocation { interior: X1(GeneralKey(key)), .. - } => match &key[..] { + } => match &key.into_inner()[..] { key => { if let Ok(currency_id) = CurrencyId::decode(&mut &*key) { Some(currency_id) @@ -1473,7 +1475,7 @@ fn buy_weight_transaction_fee_pool_works() { // Token not in charge fee pool let currency_id = CurrencyId::Token(TokenSymbol::LDOT); - let location = MultiLocation::new(1, X1(GeneralKey(currency_id.encode()))); + let location = MultiLocation::new(1, X1(GeneralKey(currency_id.encode().try_into().unwrap()))); let rate = >::calculate_rate(location); assert_eq!(rate, None); @@ -1874,7 +1876,8 @@ fn charge_fee_failed_when_disable_dex() { #[test] fn charge_fee_pool_operation_works() { ExtBuilder::default().build().execute_with(|| { - let alternative_fee_swap_deposit: u128 = ::AlternativeFeeSwapDeposit::get(); + let alternative_fee_swap_deposit: u128 = + <::AlternativeFeeSwapDeposit as frame_support::traits::Get>::get(); assert_ok!(Currencies::update_balance( Origin::root(), ALICE, diff --git a/modules/xcm-interface/Cargo.toml b/modules/xcm-interface/Cargo.toml index 069b53476..f9540e4a7 100644 --- a/modules/xcm-interface/Cargo.toml +++ b/modules/xcm-interface/Cargo.toml @@ -7,25 +7,25 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } module-relaychain = { path = "../relaychain", features = ["kusama"] } [features] diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 65b5dc03d..e2516265f 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -9,22 +9,22 @@ log = "0.4.17" clap = { version = "3.1.6", features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", optional = true } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", optional = true } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", optional = true } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", optional = true } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", optional = true } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", optional = true } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } inspect = { package = "acala-inspect", path = "../../inspect" } service = { package = "acala-service", path = "../service", default-features = false, optional = true } diff --git a/node/cli/src/cli.rs b/node/cli/src/cli.rs index 6599fb092..db6e3c3af 100644 --- a/node/cli/src/cli.rs +++ b/node/cli/src/cli.rs @@ -28,12 +28,10 @@ use service::chain_spec; #[derive(Debug, Parser)] pub enum Subcommand { /// Export the genesis state of the parachain. - #[clap(name = "export-genesis-state")] - ExportGenesisState(ExportGenesisStateCommand), + ExportGenesisState(cumulus_client_cli::ExportGenesisStateCommand), /// Export the genesis wasm of the parachain. - #[clap(name = "export-genesis-wasm")] - ExportGenesisWasm(ExportGenesisWasmCommand), + ExportGenesisWasm(cumulus_client_cli::ExportGenesisWasmCommand), /// Key management cli utilities #[clap(subcommand)] @@ -87,38 +85,6 @@ pub enum Subcommand { Revert(sc_cli::RevertCmd), } -/// Command for exporting the genesis state of the parachain -#[derive(Debug, Parser)] -pub struct ExportGenesisStateCommand { - /// Output file name or stdout if unspecified. - #[clap(parse(from_os_str))] - pub output: Option, - - /// Write output in binary. Default is to write in hex. - #[clap(short, long)] - pub raw: bool, - - /// The name of the chain for that the genesis state should be exported. - #[clap(long)] - pub chain: Option, -} - -/// Command for exporting the genesis wasm file. -#[derive(Debug, Parser)] -pub struct ExportGenesisWasmCommand { - /// Output file name or stdout if unspecified. - #[clap(parse(from_os_str))] - pub output: Option, - - /// Write output in binary. Default is to write in hex. - #[clap(short, long)] - pub raw: bool, - - /// The name of the chain for that the genesis wasm file should be exported. - #[clap(long)] - pub chain: Option, -} - /// An overarching CLI command definition. #[derive(Debug, Parser)] #[clap( diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs index 5678e3568..610ad11df 100644 --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -20,8 +20,6 @@ #![allow(clippy::borrowed_box)] use crate::cli::{Cli, RelayChainCli, Subcommand}; -use codec::Encode; -use cumulus_client_service::genesis::generate_genesis_block; use cumulus_primitives_core::ParaId; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use log::info; @@ -31,9 +29,7 @@ use sc_cli::{ }; use sc_service::config::{BasePath, PrometheusConfig}; use service::{chain_spec, new_partial, IdentifyVariant}; -use sp_core::hexdisplay::HexDisplay; -use sp_runtime::traits::Block as BlockT; -use std::{io::Write, net::SocketAddr}; +use std::net::SocketAddr; fn chain_name() -> String { "Acala".into() @@ -220,15 +216,6 @@ fn ensure_dev(spec: &Box) -> std::result::Result<(), Str } } -fn extract_genesis_wasm(chain_spec: &Box) -> Result> { - let mut storage = chain_spec.build_storage()?; - - storage - .top - .remove(sp_core::storage::well_known_keys::CODE) - .ok_or_else(|| "Could not find wasm file in genesis state!".into()) -} - macro_rules! with_runtime_or_err { ($chain_spec:expr, { $( $code:tt )* }) => { if $chain_spec.is_acala() { @@ -413,54 +400,25 @@ pub fn run() -> sc_cli::Result<()> { }) } - Some(Subcommand::ExportGenesisState(params)) => { - let mut builder = sc_cli::LoggerBuilder::new(""); - builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); - let _ = builder.init(); - - let chain_spec = cli.load_spec(¶ms.chain.clone().unwrap_or_default())?; - let state_version = Cli::native_runtime_version(&chain_spec).state_version(); - let output_buf = with_runtime_or_err!(chain_spec, { - { - let block: Block = - generate_genesis_block(&chain_spec, state_version).map_err(|e| format!("{:?}", e))?; - let raw_header = block.header().encode(); - if params.raw { - raw_header - } else { - format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes() - } - } - }); - - if let Some(output) = ¶ms.output { - std::fs::write(output, output_buf)?; - } else { - std::io::stdout().write_all(&output_buf)?; - } + Some(Subcommand::ExportGenesisState(cmd)) => { + let runner = cli.create_runner(cmd)?; + let chain_spec = &runner.config().chain_spec; - Ok(()) + with_runtime_or_err!(chain_spec, { + return runner.sync_run(|_config| { + let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?; + let state_version = Cli::native_runtime_version(&spec).state_version(); + cmd.run::(&*spec, state_version) + }); + }) } - Some(Subcommand::ExportGenesisWasm(params)) => { - let mut builder = sc_cli::LoggerBuilder::new(""); - builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); - let _ = builder.init(); - - let raw_wasm_blob = extract_genesis_wasm(&cli.load_spec(¶ms.chain.clone().unwrap_or_default())?)?; - let output_buf = if params.raw { - raw_wasm_blob - } else { - format!("0x{:?}", HexDisplay::from(&raw_wasm_blob)).into_bytes() - }; - - if let Some(output) = ¶ms.output { - std::fs::write(output, output_buf)?; - } else { - std::io::stdout().write_all(&output_buf)?; - } - - Ok(()) + Some(Subcommand::ExportGenesisWasm(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.sync_run(|_config| { + let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?; + cmd.run(&*spec) + }) } #[cfg(feature = "try-runtime")] diff --git a/node/e2e-tests/test-service/Cargo.toml b/node/e2e-tests/test-service/Cargo.toml index 4cc9f2479..58102e859 100644 --- a/node/e2e-tests/test-service/Cargo.toml +++ b/node/e2e-tests/test-service/Cargo.toml @@ -12,7 +12,7 @@ async-trait = "0.1.42" tokio = { version = "1.10", features = ["macros"] } criterion = { version = "0.3.5", features = [ "async_tokio" ] } parking_lot = "0.12.0" -jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } log = "0.4.17" futures = { package = "futures", version = "0.3", features = ["compat"] } hex-literal = "0.3.1" @@ -21,60 +21,60 @@ rlp = "0.5" sha3 = "0.10" # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", features = [ "wasmtime" ] } -sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", features = [ "wasmtime" ] } +sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } # Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } # Cumulus dependencies -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } runtime-common = { path = "../../../runtime/common" } node-runtime = { package = "mandala-runtime", path = "../../../runtime/mandala" } @@ -91,5 +91,5 @@ ecosystem-renvm-bridge = { path = "../../../ecosystem-modules/ren/renvm-bridge" [dev-dependencies] # Substrate dependencies -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } diff --git a/node/e2e-tests/test-service/src/lib.rs b/node/e2e-tests/test-service/src/lib.rs index 61ea6d35e..958415675 100644 --- a/node/e2e-tests/test-service/src/lib.rs +++ b/node/e2e-tests/test-service/src/lib.rs @@ -27,13 +27,12 @@ mod service; use futures::channel::{mpsc, oneshot}; use std::{future::Future, sync::Arc, time::Duration}; -use cumulus_client_cli::CollatorOptions; +use cumulus_client_cli::{generate_genesis_block, CollatorOptions}; use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; use cumulus_client_consensus_common::{ParachainCandidate, ParachainConsensus}; use cumulus_client_network::BlockAnnounceValidator; use cumulus_client_service::{ - genesis::generate_genesis_block, prepare_node_config, start_collator, start_full_node, StartCollatorParams, - StartFullNodeParams, + prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; use cumulus_primitives_core::ParaId; use cumulus_relay_chain_inprocess_interface::RelayChainInProcessInterface; @@ -234,8 +233,8 @@ pub fn run_relay_chain_validator_node( /// Returns the initial head data for a parachain ID. pub fn initial_head_data() -> HeadData { - let spec = Box::new(dev_testnet_config(None).unwrap()); - let block: Block = generate_genesis_block(&(spec as Box<_>), sp_runtime::StateVersion::V1).unwrap(); + let spec = dev_testnet_config(None).unwrap(); + let block: Block = generate_genesis_block(&spec, sp_runtime::StateVersion::V1).unwrap(); let genesis_state = block.header().encode(); genesis_state.into() } diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index c6ab3373a..3bc46b02f 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -13,7 +13,7 @@ serde_json = "1.0.68" codec = { package = "parity-scale-codec", version = "3.0.0" } futures = "0.3.21" hex = "0.4.0" -jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } coins-bip32 = "0.6.0" coins-bip39 = "0.6.0" @@ -21,63 +21,63 @@ elliptic-curve = { version = "0.11.12", default-features = false, features = ["h k256 = { version = "0.10.4", default-features = false, features = ["keccak256", "ecdsa", "std"] } tiny-keccak = { version = "2.0", features = ["keccak"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24"} -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26"} +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } ecosystem-renvm-bridge = { path = "../../ecosystem-modules/ren/renvm-bridge" } module-collator-selection = { path = "../../modules/collator-selection" } diff --git a/node/service/src/chain_spec/acala.rs b/node/service/src/chain_spec/acala.rs index 9ba10c2b8..20b05368a 100644 --- a/node/service/src/chain_spec/acala.rs +++ b/node/service/src/chain_spec/acala.rs @@ -119,26 +119,26 @@ fn acala_dev_genesis( sudo: SudoConfig { key: Some(root_key) }, general_council: Default::default(), general_council_membership: GeneralCouncilMembershipConfig { - members: general_councils, + members: general_councils.try_into().unwrap(), phantom: Default::default(), }, financial_council: Default::default(), financial_council_membership: FinancialCouncilMembershipConfig { - members: vec![], + members: vec![].try_into().unwrap(), phantom: Default::default(), }, homa_council: Default::default(), homa_council_membership: HomaCouncilMembershipConfig { - members: vec![], + members: vec![].try_into().unwrap(), phantom: Default::default(), }, technical_committee: Default::default(), technical_committee_membership: TechnicalCommitteeMembershipConfig { - members: vec![], + members: vec![].try_into().unwrap(), phantom: Default::default(), }, operator_membership_acala: OperatorMembershipAcalaConfig { - members: vec![], + members: vec![].try_into().unwrap(), phantom: Default::default(), }, democracy: Default::default(), diff --git a/node/service/src/chain_spec/karura.rs b/node/service/src/chain_spec/karura.rs index 720a53dbc..15d6e9f1d 100644 --- a/node/service/src/chain_spec/karura.rs +++ b/node/service/src/chain_spec/karura.rs @@ -119,26 +119,26 @@ fn karura_dev_genesis( sudo: SudoConfig { key: Some(root_key) }, general_council: Default::default(), general_council_membership: GeneralCouncilMembershipConfig { - members: general_councils, + members: general_councils.try_into().unwrap(), phantom: Default::default(), }, financial_council: Default::default(), financial_council_membership: FinancialCouncilMembershipConfig { - members: vec![], + members: vec![].try_into().unwrap(), phantom: Default::default(), }, homa_council: Default::default(), homa_council_membership: HomaCouncilMembershipConfig { - members: vec![], + members: vec![].try_into().unwrap(), phantom: Default::default(), }, technical_committee: Default::default(), technical_committee_membership: TechnicalCommitteeMembershipConfig { - members: vec![], + members: vec![].try_into().unwrap(), phantom: Default::default(), }, operator_membership_acala: OperatorMembershipAcalaConfig { - members: vec![], + members: vec![].try_into().unwrap(), phantom: Default::default(), }, democracy: Default::default(), diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs index 946e0c98c..f8d7841bf 100644 --- a/node/service/src/chain_spec/mandala.rs +++ b/node/service/src/chain_spec/mandala.rs @@ -24,6 +24,15 @@ use k256::{ ecdsa::{SigningKey, VerifyingKey}, EncodedPoint as K256PublicKey, }; +use mandala_runtime::{ + cent, dollar, get_all_module_accounts, AssetRegistryConfig, BalancesConfig, CdpEngineConfig, CdpTreasuryConfig, + CollatorSelectionConfig, DexConfig, EVMConfig, EnabledTradingPairs, ExistentialDeposits, + FinancialCouncilMembershipConfig, GeneralCouncilMembershipConfig, HomaCouncilMembershipConfig, IndicesConfig, + NativeTokenExistentialDeposit, OperatorMembershipAcalaConfig, OrmlNFTConfig, ParachainInfoConfig, + PolkadotXcmConfig, RenVmBridgeConfig, SessionConfig, SessionDuration, SessionKeys, SessionManagerConfig, + StarportConfig, SudoConfig, SystemConfig, TechnicalCommitteeMembershipConfig, TokensConfig, VestingConfig, ACA, + AUSD, DOT, LDOT, RENBTC, +}; use runtime_common::evm_genesis; use sc_chain_spec::ChainType; use sc_telemetry::TelemetryEndpoints; @@ -307,16 +316,6 @@ fn testnet_genesis( endowed_accounts: Vec, evm_accounts: Vec, ) -> mandala_runtime::GenesisConfig { - use mandala_runtime::{ - dollar, get_all_module_accounts, AssetRegistryConfig, BalancesConfig, CdpEngineConfig, CdpTreasuryConfig, - CollatorSelectionConfig, DexConfig, EVMConfig, EnabledTradingPairs, ExistentialDeposits, - FinancialCouncilMembershipConfig, GeneralCouncilMembershipConfig, HomaCouncilMembershipConfig, IndicesConfig, - NativeTokenExistentialDeposit, OperatorMembershipAcalaConfig, OrmlNFTConfig, ParachainInfoConfig, - PolkadotXcmConfig, RenVmBridgeConfig, SessionConfig, SessionDuration, SessionKeys, SessionManagerConfig, - StarportConfig, SudoConfig, SystemConfig, TechnicalCommitteeMembershipConfig, TokensConfig, VestingConfig, ACA, - AUSD, DOT, LDOT, RENBTC, - }; - let existential_deposit = NativeTokenExistentialDeposit::get(); let initial_balance: u128 = 10_000_000 * dollar(ACA); @@ -348,6 +347,8 @@ fn testnet_genesis( .into_iter() .collect::>(); + let member = vec![root_key.clone()]; + mandala_runtime::GenesisConfig { system: SystemConfig { // Add Wasm runtime to storage. @@ -358,31 +359,29 @@ fn testnet_genesis( }, indices: IndicesConfig { indices: vec![] }, balances: BalancesConfig { balances }, - sudo: SudoConfig { - key: Some(root_key.clone()), - }, + sudo: SudoConfig { key: Some(root_key) }, general_council: Default::default(), general_council_membership: GeneralCouncilMembershipConfig { - members: vec![root_key.clone()], + members: member.clone().try_into().unwrap(), phantom: Default::default(), }, financial_council: Default::default(), financial_council_membership: FinancialCouncilMembershipConfig { - members: vec![root_key.clone()], + members: member.clone().try_into().unwrap(), phantom: Default::default(), }, homa_council: Default::default(), homa_council_membership: HomaCouncilMembershipConfig { - members: vec![root_key.clone()], + members: member.clone().try_into().unwrap(), phantom: Default::default(), }, technical_committee: Default::default(), technical_committee_membership: TechnicalCommitteeMembershipConfig { - members: vec![root_key.clone()], + members: member.clone().try_into().unwrap(), phantom: Default::default(), }, operator_membership_acala: OperatorMembershipAcalaConfig { - members: vec![root_key], + members: member.try_into().unwrap(), phantom: Default::default(), }, democracy: Default::default(), @@ -507,16 +506,6 @@ fn mandala_genesis( root_key: AccountId, endowed_accounts: Vec, ) -> mandala_runtime::GenesisConfig { - use mandala_runtime::{ - cent, dollar, get_all_module_accounts, AssetRegistryConfig, BalancesConfig, CdpEngineConfig, CdpTreasuryConfig, - CollatorSelectionConfig, DexConfig, EVMConfig, EnabledTradingPairs, ExistentialDeposits, - FinancialCouncilMembershipConfig, GeneralCouncilMembershipConfig, HomaCouncilMembershipConfig, IndicesConfig, - NativeTokenExistentialDeposit, OperatorMembershipAcalaConfig, OrmlNFTConfig, ParachainInfoConfig, - PolkadotXcmConfig, RenVmBridgeConfig, SessionConfig, SessionDuration, SessionKeys, SessionManagerConfig, - StarportConfig, SudoConfig, SystemConfig, TechnicalCommitteeMembershipConfig, TokensConfig, VestingConfig, ACA, - AUSD, DOT, LDOT, RENBTC, - }; - let existential_deposit = NativeTokenExistentialDeposit::get(); let initial_balance: u128 = 1_000_000 * dollar(ACA); @@ -548,6 +537,8 @@ fn mandala_genesis( .into_iter() .collect::>(); + let member = vec![root_key.clone()]; + mandala_runtime::GenesisConfig { system: SystemConfig { // Add Wasm runtime to storage. @@ -563,26 +554,26 @@ fn mandala_genesis( }, general_council: Default::default(), general_council_membership: GeneralCouncilMembershipConfig { - members: vec![root_key.clone()], + members: member.clone().try_into().unwrap(), phantom: Default::default(), }, financial_council: Default::default(), financial_council_membership: FinancialCouncilMembershipConfig { - members: vec![root_key.clone()], + members: member.clone().try_into().unwrap(), phantom: Default::default(), }, homa_council: Default::default(), homa_council_membership: HomaCouncilMembershipConfig { - members: vec![root_key.clone()], + members: member.clone().try_into().unwrap(), phantom: Default::default(), }, technical_committee: Default::default(), technical_committee_membership: TechnicalCommitteeMembershipConfig { - members: vec![root_key.clone()], + members: member.clone().try_into().unwrap(), phantom: Default::default(), }, operator_membership_acala: OperatorMembershipAcalaConfig { - members: endowed_accounts, + members: member.try_into().unwrap(), phantom: Default::default(), }, democracy: Default::default(), diff --git a/orml b/orml index b57f88b39..8c625a5ab 160000 --- a/orml +++ b/orml @@ -1 +1 @@ -Subproject commit b57f88b39cd547e2fb51727d8bb9bcc64fddf8b5 +Subproject commit 8c625a5ab43c1c56cdeed5f8d814a891566d4cf8 diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index bcf5a2f39..20ac130ca 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -15,13 +15,13 @@ scale-info = { version = "2.1", default-features = false, features = ["derive"] enumflags2 = { version = "0.6.3" } paste = "1.0" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } orml-traits = { path = "../orml/traits", default-features = false } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 036440157..0f3d45b33 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -6,20 +6,20 @@ edition = "2021" [dependencies] futures = "0.3.21" -jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } codec = { package = "parity-scale-codec", version = "3.0.0" } primitives = { package = "acala-primitives", path = "../primitives" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } orml-oracle-rpc = { path = "../orml/oracle/rpc" } runtime-common = { path = "../runtime/common" } diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml index cd978f898..ed0a4b735 100644 --- a/runtime/acala/Cargo.toml +++ b/runtime/acala/Cargo.toml @@ -15,64 +15,64 @@ hex = { version = "0.4", default-features = false } hex-literal = { version = "0.3.1" } # substrate -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, features = ["historical"] } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, features = ["historical"] } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -128,13 +128,13 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = # benchmarking deps libsecp256k1 = { version = "0.7", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/runtime/acala/src/constants.rs b/runtime/acala/src/constants.rs index 4d387b2b0..f16d563ca 100644 --- a/runtime/acala/src/constants.rs +++ b/runtime/acala/src/constants.rs @@ -109,7 +109,7 @@ mod tests { let q = Balance::from(ExtrinsicBaseWeight::get()); assert_eq!(p, 1_000_000_000); - assert_eq!(q, 85_795_000); + assert_eq!(q, 86_298_000); assert_eq!(p / q, 11) } } diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index cebd36e84..0290f3d9a 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -574,6 +574,7 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = EnsureRootOrHalfGeneralCouncil; type RejectOrigin = EnsureRootOrHalfGeneralCouncil; + type SpendOrigin = frame_support::traits::NeverEnsureOrigin; type Event = Event; type OnSlash = Treasury; type ProposalBond = ProposalBond; @@ -1443,6 +1444,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type OutboundXcmpMessageSource = XcmpQueue; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; + type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; } impl parachain_info::Config for Runtime {} @@ -1641,7 +1643,7 @@ construct_runtime!( CollatorSelection: module_collator_selection = 41, Session: pallet_session = 42, Aura: pallet_aura = 43, - AuraExt: cumulus_pallet_aura_ext exclude_parts { Call } = 44, + AuraExt: cumulus_pallet_aura_ext = 44, SessionManager: module_session_manager = 45, // XCM diff --git a/runtime/acala/src/xcm_config.rs b/runtime/acala/src/xcm_config.rs index 45aa3389f..e2bd9fa4f 100644 --- a/runtime/acala/src/xcm_config.rs +++ b/runtime/acala/src/xcm_config.rs @@ -37,7 +37,10 @@ use orml_xcm_support::{DepositToAlternative, IsNativeConcrete, MultiCurrencyAdap use pallet_xcm::XcmPassthrough; use polkadot_parachain::primitives::Sibling; use primitives::evm::is_system_contract; -use runtime_common::{native_currency_location, AcalaDropAssets, EnsureRootOrHalfGeneralCouncil, FixedRateOfAsset}; +use runtime_common::{ + local_currency_location, native_currency_location, AcalaDropAssets, EnsureRootOrHalfGeneralCouncil, + FixedRateOfAsset, +}; use xcm::latest::prelude::*; pub use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, @@ -121,25 +124,16 @@ parameter_types! { pub const MaxInstructions: u32 = 100; pub DotPerSecond: (AssetId, u128) = (MultiLocation::parent().into(), dot_per_second()); pub AusdPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 0, - X1(GeneralKey(AUSD.encode())), - ).into(), + local_currency_location(AUSD).into(), // aUSD:DOT = 40:1 dot_per_second() * 40 ); pub AcaPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 0, - X1(GeneralKey(ACA.encode())), - ).into(), + local_currency_location(ACA).into(), aca_per_second() ); pub TapPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 0, - X1(GeneralKey(TAP.encode())), - ).into(), + local_currency_location(TAP).into(), // TODO: No price yet, assumed set at 4340 // TAP:tDOT = 4340:1 dot_per_second() * 4340 @@ -254,12 +248,12 @@ impl Convert> for CurrencyIdConvert { match id { Token(DOT) => Some(MultiLocation::parent()), Token(ACA) | Token(AUSD) | Token(LDOT) | Token(TAP) => { - Some(native_currency_location(ParachainInfo::get().into(), id)) + Some(native_currency_location(ParachainInfo::get().into(), id.encode())) } Erc20(address) if !is_system_contract(address) => { - Some(native_currency_location(ParachainInfo::get().into(), id)) + Some(native_currency_location(ParachainInfo::get().into(), id.encode())) } - StableAssetPoolToken(_pool_id) => Some(native_currency_location(ParachainInfo::get().into(), id)), + StableAssetPoolToken(_pool_id) => Some(native_currency_location(ParachainInfo::get().into(), id.encode())), ForeignAsset(foreign_asset_id) => AssetIdMaps::::get_multi_location(foreign_asset_id), _ => None, } @@ -283,7 +277,7 @@ impl Convert> for CurrencyIdConvert { parents, interior: X2(Parachain(para_id), GeneralKey(key)), } if parents == 1 => { - match (para_id, &key[..]) { + match (para_id, &key.into_inner()[..]) { (id, key) if id == u32::from(ParachainInfo::get()) => { // Acala if let Ok(currency_id) = CurrencyId::decode(&mut &*key) { @@ -307,7 +301,7 @@ impl Convert> for CurrencyIdConvert { parents: 0, interior: X1(GeneralKey(key)), } => { - let key = &key[..]; + let key = &key.into_inner()[..]; let currency_id = CurrencyId::decode(&mut &*key).ok()?; match currency_id { Token(ACA) | Token(AUSD) | Token(LDOT) | Token(TAP) => Some(currency_id), diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 2f75ab1e0..6ad7d5f4a 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -21,28 +21,28 @@ ethabi = { version = "17.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } # cumulus -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false, optional = true } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false, optional = true } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } # modules module-currencies = { path = "../../modules/currencies", default-features = false } diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 909e55819..bf8af3256 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -24,7 +24,7 @@ use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{ parameter_types, - traits::{Contains, EnsureOneOf, Get}, + traits::{Contains, EitherOfDiverse, Get}, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_PER_MILLIS}, DispatchClass, Weight, @@ -53,7 +53,7 @@ pub use primitives::{ }, AccountId, }; -pub use xcm_impl::{native_currency_location, AcalaDropAssets, FixedRateOfAsset}; +pub use xcm_impl::{local_currency_location, native_currency_location, AcalaDropAssets, FixedRateOfAsset}; #[cfg(feature = "std")] use sp_core::bytes::from_hex; @@ -215,108 +215,108 @@ pub type TechnicalCommitteeMembershipInstance = pallet_membership::Instance4; pub type OperatorMembershipInstanceAcala = pallet_membership::Instance5; // General Council -pub type EnsureRootOrAllGeneralCouncil = EnsureOneOf< +pub type EnsureRootOrAllGeneralCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrHalfGeneralCouncil = EnsureOneOf< +pub type EnsureRootOrHalfGeneralCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrOneThirdsGeneralCouncil = EnsureOneOf< +pub type EnsureRootOrOneThirdsGeneralCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrTwoThirdsGeneralCouncil = EnsureOneOf< +pub type EnsureRootOrTwoThirdsGeneralCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrThreeFourthsGeneralCouncil = EnsureOneOf< +pub type EnsureRootOrThreeFourthsGeneralCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrOneGeneralCouncil = - EnsureOneOf, pallet_collective::EnsureMember>; + EitherOfDiverse, pallet_collective::EnsureMember>; // Financial Council -pub type EnsureRootOrAllFinancialCouncil = EnsureOneOf< +pub type EnsureRootOrAllFinancialCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrHalfFinancialCouncil = EnsureOneOf< +pub type EnsureRootOrHalfFinancialCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrOneThirdsFinancialCouncil = EnsureOneOf< +pub type EnsureRootOrOneThirdsFinancialCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrTwoThirdsFinancialCouncil = EnsureOneOf< +pub type EnsureRootOrTwoThirdsFinancialCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrThreeFourthsFinancialCouncil = EnsureOneOf< +pub type EnsureRootOrThreeFourthsFinancialCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; // Homa Council -pub type EnsureRootOrAllHomaCouncil = EnsureOneOf< +pub type EnsureRootOrAllHomaCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrHalfHomaCouncil = EnsureOneOf< +pub type EnsureRootOrHalfHomaCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrOneThirdsHomaCouncil = EnsureOneOf< +pub type EnsureRootOrOneThirdsHomaCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrTwoThirdsHomaCouncil = EnsureOneOf< +pub type EnsureRootOrTwoThirdsHomaCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrThreeFourthsHomaCouncil = EnsureOneOf< +pub type EnsureRootOrThreeFourthsHomaCouncil = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; // Technical Committee Council -pub type EnsureRootOrAllTechnicalCommittee = EnsureOneOf< +pub type EnsureRootOrAllTechnicalCommittee = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrHalfTechnicalCommittee = EnsureOneOf< +pub type EnsureRootOrHalfTechnicalCommittee = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf< +pub type EnsureRootOrOneThirdsTechnicalCommittee = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrTwoThirdsTechnicalCommittee = EnsureOneOf< +pub type EnsureRootOrTwoThirdsTechnicalCommittee = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; -pub type EnsureRootOrThreeFourthsTechnicalCommittee = EnsureOneOf< +pub type EnsureRootOrThreeFourthsTechnicalCommittee = EitherOfDiverse< EnsureRoot, pallet_collective::EnsureProportionAtLeast, >; diff --git a/runtime/common/src/precompile/homa.rs b/runtime/common/src/precompile/homa.rs index 89803fd2b..0ee61ca70 100644 --- a/runtime/common/src/precompile/homa.rs +++ b/runtime/common/src/precompile/homa.rs @@ -32,7 +32,7 @@ use module_support::HomaManager; use module_homa::WeightInfo; use num_enum::{IntoPrimitive, TryFromPrimitive}; use primitives::Balance; -use sp_runtime::{traits::Convert, FixedPointNumber, RuntimeDebug}; +use sp_runtime::{traits::Convert, RuntimeDebug}; use sp_std::{marker::PhantomData, prelude::*}; /// The Homa precompile @@ -240,7 +240,7 @@ mod tests { }; use frame_support::assert_ok; use hex_literal::hex; - use sp_runtime::FixedU128; + use sp_runtime::{FixedPointNumber, FixedU128}; type HomaPrecompile = super::HomaPrecompile; diff --git a/runtime/common/src/precompile/honzon.rs b/runtime/common/src/precompile/honzon.rs index 4745490ef..eae0e4025 100644 --- a/runtime/common/src/precompile/honzon.rs +++ b/runtime/common/src/precompile/honzon.rs @@ -31,7 +31,7 @@ use module_honzon::WeightInfo; use module_support::HonzonManager; use num_enum::{IntoPrimitive, TryFromPrimitive}; use primitives::{Amount, Balance, CurrencyId, Position}; -use sp_runtime::{traits::Convert, FixedPointNumber, RuntimeDebug}; +use sp_runtime::{traits::Convert, RuntimeDebug}; use sp_std::{marker::PhantomData, prelude::*}; /// The Honzon precomnpile diff --git a/runtime/common/src/precompile/incentives.rs b/runtime/common/src/precompile/incentives.rs index 5df749b47..2a19f1c43 100644 --- a/runtime/common/src/precompile/incentives.rs +++ b/runtime/common/src/precompile/incentives.rs @@ -31,7 +31,7 @@ use module_incentives::WeightInfo; use module_support::{IncentivesManager, PoolId}; use num_enum::{IntoPrimitive, TryFromPrimitive}; use primitives::{Balance, CurrencyId}; -use sp_runtime::{traits::Convert, FixedPointNumber, RuntimeDebug}; +use sp_runtime::{traits::Convert, RuntimeDebug}; use sp_std::{marker::PhantomData, prelude::*}; /// The Incentives precompile @@ -380,7 +380,7 @@ mod tests { use module_support::Rate; use orml_rewards::PoolInfo; use orml_traits::MultiCurrency; - use sp_runtime::FixedU128; + use sp_runtime::{FixedPointNumber, FixedU128}; type IncentivesPrecompile = super::IncentivesPrecompile; diff --git a/runtime/common/src/precompile/oracle.rs b/runtime/common/src/precompile/oracle.rs index 6db7016fd..4b7edcf4d 100644 --- a/runtime/common/src/precompile/oracle.rs +++ b/runtime/common/src/precompile/oracle.rs @@ -22,7 +22,7 @@ use super::{ weights::PrecompileWeights, }; use crate::WeightToGas; -use frame_support::{log, sp_runtime::FixedPointNumber}; +use frame_support::log; use module_evm::{ precompiles::Precompile, runner::state::{PrecompileFailure, PrecompileOutput, PrecompileResult}, diff --git a/runtime/common/src/xcm_impl.rs b/runtime/common/src/xcm_impl.rs index 44f03b047..d6dabea07 100644 --- a/runtime/common/src/xcm_impl.rs +++ b/runtime/common/src/xcm_impl.rs @@ -26,7 +26,10 @@ use frame_support::{ use module_support::BuyWeightRate; use orml_traits::GetByKey; use primitives::{Balance, CurrencyId}; -use sp_runtime::{traits::Convert, FixedPointNumber, FixedU128}; +use sp_runtime::{ + traits::{ConstU32, Convert}, + FixedPointNumber, FixedU128, WeakBoundedVec, +}; use sp_std::{marker::PhantomData, prelude::*}; use xcm::latest::prelude::*; use xcm_builder::TakeRevenue; @@ -35,8 +38,24 @@ use xcm_executor::{ Assets, }; -pub fn native_currency_location(para_id: u32, id: CurrencyId) -> MultiLocation { - MultiLocation::new(1, X2(Parachain(para_id), GeneralKey(id.encode()))) +pub fn local_currency_location(key: CurrencyId) -> MultiLocation { + MultiLocation::new( + 0, + X1(GeneralKey(WeakBoundedVec::>::force_from( + key.encode(), + None, + ))), + ) +} + +pub fn native_currency_location(para_id: u32, key: Vec) -> MultiLocation { + MultiLocation::new( + 1, + X2( + Parachain(para_id), + GeneralKey(WeakBoundedVec::>::force_from(key, None)), + ), + ) } /// `ExistentialDeposit` for tokens, give priority to match native token, then handled by @@ -245,6 +264,58 @@ mod tests { FixedRate: Ratio = Ratio::one(); } + #[test] + fn currency_id_encode_as_general_key_works() { + use primitives::DexShare; + use primitives::TokenSymbol::ACA; + let evm_addr = sp_core::H160(hex_literal::hex!("0000000000000000000000000000000000000400")); + + assert_eq!(native_currency_location(0, CurrencyId::Token(ACA).encode()).parents, 1); + assert_eq!( + native_currency_location(0, CurrencyId::Erc20(evm_addr).encode()).parents, + 1 + ); + assert_eq!( + native_currency_location(0, CurrencyId::StableAssetPoolToken(0).encode()).parents, + 1 + ); + assert_eq!( + native_currency_location(0, CurrencyId::ForeignAsset(0).encode()).parents, + 1 + ); + assert_eq!( + native_currency_location(0, CurrencyId::LiquidCrowdloan(0).encode()).parents, + 1 + ); + + assert_eq!( + native_currency_location( + 0, + CurrencyId::DexShare(DexShare::Token(ACA), DexShare::ForeignAsset(0)).encode() + ) + .parents, + 1 + ); + assert_eq!( + native_currency_location( + 0, + CurrencyId::DexShare(DexShare::Token(ACA), DexShare::Erc20(evm_addr)).encode() + ) + .parents, + 1 + ); + + // DexShare of two Erc20 limit to 32 length. + assert_eq!( + native_currency_location( + 0, + CurrencyId::DexShare(DexShare::Erc20(evm_addr), DexShare::Erc20(evm_addr)).encode() + ) + .parents, + 1 + ); + } + #[test] fn buy_weight_rate_mock_works() { new_test_ext().execute_with(|| { diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index 8ac2aa75b..a4879ce5f 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -14,64 +14,64 @@ hex-literal = { version = "0.3.1" } libsecp256k1 = { version = "0.7" } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24"} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24"} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features =false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26"} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26"} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features =false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } # orml orml-auction = { path = "../../orml/auction" } @@ -130,22 +130,22 @@ ecosystem-compound-cash = { path = "../../ecosystem-modules/compound-cash" } [dev-dependencies] env_logger = "0.9.0" log = "0.4.17" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -statemint-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +statemint-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } +polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26" } -xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "651af78d6d7521dc76e1f6bb257af485f8a454c7" } +xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe" } acala-service = { path = "../../node/service", features = ["with-all-runtime"] } diff --git a/runtime/integration-tests/src/dex.rs b/runtime/integration-tests/src/dex.rs index adde4bfd7..b45853a6b 100644 --- a/runtime/integration-tests/src/dex.rs +++ b/runtime/integration-tests/src/dex.rs @@ -219,7 +219,9 @@ fn test_trading_pair() { assert_ok!(AssetRegistry::register_foreign_asset( Origin::root(), - Box::new(MultiLocation::new(1, X2(Parachain(2002), GeneralKey(KAR.encode()))).into()), + Box::new( + MultiLocation::new(1, X2(Parachain(2002), GeneralKey(KAR.encode().try_into().unwrap()))).into() + ), Box::new(AssetMetadata { name: b"Sibling Token".to_vec(), symbol: b"ST".to_vec(), diff --git a/runtime/integration-tests/src/evm.rs b/runtime/integration-tests/src/evm.rs index 0d0c65f81..38a179280 100644 --- a/runtime/integration-tests/src/evm.rs +++ b/runtime/integration-tests/src/evm.rs @@ -1017,11 +1017,11 @@ fn transaction_payment_module_works_with_evm_contract() { }; let fee = module_transaction_payment::Pallet::::compute_fee(len, &info, 0); #[cfg(feature = "with-mandala-runtime")] - assert_eq!(fee, 16000001166); + assert_eq!(fee, 16000001159); #[cfg(feature = "with-karura-runtime")] - assert_eq!(fee, 2500001166); + assert_eq!(fee, 2_500_001_159); #[cfg(feature = "with-acala-runtime")] - assert_eq!(fee, 2500001166); + assert_eq!(fee, 2_500_001_159); let surplus_perc = Percent::from_percent(25); let fee_surplus = surplus_perc.mul_ceil(fee); @@ -1042,11 +1042,11 @@ fn transaction_payment_module_works_with_evm_contract() { ); let erc20_fee = Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &sub_account); #[cfg(feature = "with-mandala-runtime")] - assert_eq!(erc20_fee, 12_013_104_258); + assert_eq!(erc20_fee, 12013104257); #[cfg(feature = "with-karura-runtime")] - assert_eq!(erc20_fee, 10_344_471_145); + assert_eq!(erc20_fee, 10_344_471_144); #[cfg(feature = "with-acala-runtime")] - assert_eq!(erc20_fee, 10_344_471_145); + assert_eq!(erc20_fee, 10_344_471_144); assert_eq!( Currencies::free_balance(NATIVE_CURRENCY, &sub_account), @@ -1172,7 +1172,7 @@ fn create_contract_use_none_native_token_to_charge_storage() { #[test] fn evm_limits() { ExtBuilder::default().build().execute_with(|| { - assert_eq!(runtime_common::EvmLimits::::max_gas_limit(), 33_323_800); + assert_eq!(runtime_common::EvmLimits::::max_gas_limit(), 33_323_744); assert_eq!(runtime_common::EvmLimits::::max_storage_limit(), 3_670_016); }); } diff --git a/runtime/integration-tests/src/payment.rs b/runtime/integration-tests/src/payment.rs index 73e0d59b7..0e91816dd 100644 --- a/runtime/integration-tests/src/payment.rs +++ b/runtime/integration-tests/src/payment.rs @@ -214,27 +214,6 @@ fn initial_charge_fee_pool_works() { }); } -#[test] -fn token_per_second_works() { - #[cfg(feature = "with-karura-runtime")] - { - let kar_per_second = karura_runtime::kar_per_second(); - assert_eq!(11_655_000_000_000, kar_per_second); - - let ksm_per_second = karura_runtime::ksm_per_second(); - assert_eq!(233_100_000_000, ksm_per_second); - } - - #[cfg(feature = "with-acala-runtime")] - { - let aca_per_second = acala_runtime::aca_per_second(); - assert_eq!(11_655_000_000_000, aca_per_second); - - let dot_per_second = acala_runtime::dot_per_second(); - assert_eq!(2_331_000_000, dot_per_second); - } -} - #[test] fn trader_works() { // 4 instructions, each instruction cost 200_000_000 @@ -251,38 +230,13 @@ fn trader_works() { beneficiary: Here.into(), }, ]); - #[cfg(feature = "with-mandala-runtime")] - let expect_weight: Weight = 4_000_000; - #[cfg(feature = "with-karura-runtime")] - let expect_weight: Weight = 800_000_000; - #[cfg(feature = "with-acala-runtime")] - let expect_weight: Weight = 800_000_000; - - #[cfg(feature = "with-mandala-runtime")] - let base_per_second = mandala_runtime::aca_per_second(); - #[cfg(feature = "with-karura-runtime")] - let base_per_second = karura_runtime::kar_per_second(); - #[cfg(feature = "with-acala-runtime")] - let base_per_second = acala_runtime::aca_per_second(); - - let xcm_weight: Weight = ::Weigher::weight(&mut message).unwrap(); - assert_eq!(xcm_weight, expect_weight); - let total_balance: Balance = 10_00_000_000; + let total_balance: Balance = 1_000_000_000; let asset: MultiAsset = (Parent, total_balance).into(); let assets: Assets = asset.into(); - // ksm_per_second/kar_per_second=1/50 - // v0.9.22: kar_per_second=8KAR, ksm_per_second=0.16KSM, - // fee=0.16*weight=0.16*800_000_000=128_000_000 - // v0.9.23: kar_per_second=11.655KAR, ksm_per_second=0.2331KSM - // fee=0.2331*weight=186_480_000 - #[cfg(feature = "with-mandala-runtime")] - let expect_unspent: MultiAsset = (Parent, 999_533_800).into(); // 466200 - #[cfg(feature = "with-karura-runtime")] - let expect_unspent: MultiAsset = (Parent, 813_520_000).into(); // 186480000 - #[cfg(feature = "with-acala-runtime")] - let expect_unspent: MultiAsset = (Parent, 998_135_200).into(); // 1864800 + let expect_unspent: MultiAsset = (Parent, total_balance - crate::relaychain::relay_per_second_as_fee(4)).into(); + let xcm_weight: Weight = ::Weigher::weight(&mut message).unwrap(); // when no runtime upgrade, the newly `TransactionFeePoolTrader` will failed. ExtBuilder::default().build().execute_with(|| { @@ -362,12 +316,8 @@ fn trader_works() { let relay_exchange_rate: Ratio = module_transaction_payment::Pallet::::token_exchange_rate(RELAY_CHAIN_CURRENCY).unwrap(); - let weight_ratio = Ratio::saturating_from_rational( - expect_weight as u128, - frame_support::weights::constants::WEIGHT_PER_SECOND as u128, - ); - let asset_per_second = relay_exchange_rate.saturating_mul_int(base_per_second); - let spent = weight_ratio.saturating_mul_int(asset_per_second); + + let spent = crate::relaychain::token_per_second_as_fee(4, relay_exchange_rate); let expect_unspent: MultiAsset = (Parent, total_balance - spent as u128).into(); // the newly `TransactionFeePoolTrader` works fine as first priority diff --git a/runtime/integration-tests/src/relaychain/erc20.rs b/runtime/integration-tests/src/relaychain/erc20.rs index cbc773d2c..03714f7db 100644 --- a/runtime/integration-tests/src/relaychain/erc20.rs +++ b/runtime/integration-tests/src/relaychain/erc20.rs @@ -93,7 +93,16 @@ fn erc20_transfer_between_sibling() { // register Karura's erc20 as foreign asset assert_ok!(AssetRegistry::register_foreign_asset( Origin::root(), - Box::new(MultiLocation::new(1, X2(Parachain(2000), GeneralKey(erc20_as_foreign_asset.encode()))).into()), + Box::new( + MultiLocation::new( + 1, + X2( + Parachain(2000), + GeneralKey(erc20_as_foreign_asset.encode().try_into().unwrap()) + ) + ) + .into() + ), Box::new(AssetMetadata { name: b"Karura USDC".to_vec(), symbol: b"kUSDC".to_vec(), @@ -203,7 +212,7 @@ fn erc20_transfer_between_sibling() { Sibling::execute_with(|| { // Sibling will take (1, 2000, GeneralKey(Erc20(address))) as foreign asset assert_eq!( - 9_999_067_600_000, + 9_999_073_040_000, Currencies::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); @@ -229,7 +238,7 @@ fn erc20_transfer_between_sibling() { )); assert_eq!( - 4_999_067_600_000, + 4_999_073_040_000, Currencies::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); }); @@ -242,11 +251,11 @@ fn erc20_transfer_between_sibling() { Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &sibling_reserve_account()) ); assert_eq!( - 4_990_676_000_000, + 4_990_730_400_000, Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &AccountId::from(BOB)) ); assert_eq!( - 9_324_000_000, + 9_269_600_000, Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &KaruraTreasuryAccount::get()) ); assert_eq!( @@ -279,13 +288,13 @@ fn erc20_transfer_between_sibling() { System::assert_has_event(Event::Currencies(module_currencies::Event::Deposited { currency_id: CurrencyId::Erc20(erc20_address_0()), who: AccountId::from(BOB), - amount: 4_990_676_000_000, + amount: 4_990_730_400_000, })); // TakeRevenue deposit from erc20 holding account to treasury account System::assert_has_event(Event::Currencies(module_currencies::Event::Deposited { currency_id: CurrencyId::Erc20(erc20_address_0()), who: KaruraTreasuryAccount::get(), - amount: 9_324_000_000, + amount: 9_269_600_000, })); }); } @@ -299,7 +308,16 @@ fn sibling_erc20_to_self_as_foreign_asset() { // register Karura's erc20 as foreign asset assert_ok!(AssetRegistry::register_foreign_asset( Origin::root(), - Box::new(MultiLocation::new(1, X2(Parachain(2002), GeneralKey(erc20_as_foreign_asset.encode()))).into()), + Box::new( + MultiLocation::new( + 1, + X2( + Parachain(2002), + GeneralKey(erc20_as_foreign_asset.encode().try_into().unwrap()) + ) + ) + .into() + ), Box::new(AssetMetadata { name: b"Sibling USDC".to_vec(), symbol: b"sUSDC".to_vec(), @@ -378,7 +396,7 @@ fn sibling_erc20_to_self_as_foreign_asset() { Karura::execute_with(|| { assert_eq!( - 9_999_067_600_000, + 9_999_073_040_000, Currencies::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); }); diff --git a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs b/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs index 4d094aaa9..cffd9677b 100644 --- a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs +++ b/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs @@ -18,6 +18,7 @@ //! Cross-chain transfer tests within Kusama network. +use crate::relaychain::fee_test::*; use crate::relaychain::kusama_test_net::*; use crate::setup::*; @@ -29,7 +30,6 @@ use karura_runtime::parachains::bifrost::{BNC_KEY, ID as BIFROST_ID}; use karura_runtime::{AssetRegistry, KaruraTreasuryAccount}; use module_relaychain::RelayChainCallBuilder; use module_support::CallBuilder; -use orml_traits::MultiCurrency; use primitives::currency::{AssetMetadata, BNC}; use xcm_emulator::TestExt; use xcm_executor::traits::Convert; @@ -68,14 +68,22 @@ fn transfer_from_relay_chain() { }); Karura::execute_with(|| { - // v0.9.22: 1_000_000_000_000-128_000_000=999_872_000_000 - // v0.9.23: 1_000_000_000_000-186_480_000=999_813_520_000 - assert_eq!(Tokens::free_balance(KSM, &AccountId::from(BOB)), 999_813_520_000); + assert_eq!( + Tokens::free_balance(KSM, &AccountId::from(BOB)), + dollar(KSM) - relay_per_second_as_fee(4) + ); }); } #[test] fn transfer_to_relay_chain() { + use frame_support::weights::{Weight, WeightToFee as WeightToFeeT}; + use kusama_runtime_constants::fee::WeightToFee; + + let weight: Weight = 298_368_000; + let fee = WeightToFee::weight_to_fee(&weight); + assert_eq!(11_523_248, fee); + Karura::execute_with(|| { assert_ok!(XTokens::transfer( Origin::signed(ALICE.into()), @@ -91,45 +99,137 @@ fn transfer_to_relay_chain() { ) .into() ), - 4_000_000_000 + weight )); }); KusamaNet::execute_with(|| { assert_eq!( kusama_runtime::Balances::free_balance(&AccountId::from(BOB)), - // v0.9.18: 1_000_000_000_000-999_893_333_340=106_666_660 - // v0.9.19: 1_000_000_000_000-999_834_059_328=165_940_672 - // v0.9.22: 1_000_000_000_000-999_988_476_752=11_523_248 - 999_988_476_752 + dollar(KSM) - fee + ); + }); +} + +#[test] +fn transfer_native_chain_asset() { + TestNet::reset(); + let dollar = dollar(BNC); + let minimal_balance = Balances::minimum_balance() / 10; // 10% + let foreign_fee = foreign_per_second_as_fee(4, minimal_balance); + let bnc_fee = bnc_per_second_as_fee(4); + + MockBifrost::execute_with(|| { + // Register native BNC's incoming address as a foreign asset so it can receive BNC + assert_ok!(AssetRegistry::register_foreign_asset( + Origin::root(), + Box::new(MultiLocation::new(0, X1(GeneralKey(BNC_KEY.to_vec().try_into().unwrap()))).into()), + Box::new(AssetMetadata { + name: b"Native BNC".to_vec(), + symbol: b"BNC".to_vec(), + decimals: 12, + minimal_balance + }) + )); + assert_ok!(Tokens::deposit( + CurrencyId::ForeignAsset(0), + &karura_reserve_account(), + 100 * dollar + )); + + assert_ok!(Tokens::deposit(BNC, &AccountId::from(ALICE), 100 * dollar)); + + assert_ok!(XTokens::transfer( + Origin::signed(ALICE.into()), + BNC, + 10 * dollar, + Box::new( + MultiLocation::new( + 1, + X2( + Parachain(KARURA_ID), + Junction::AccountId32 { + network: NetworkId::Any, + id: BOB.into(), + } + ) + ) + .into() + ), + 1_000_000_000, + )); + + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90 * dollar); + assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 10 * dollar); + }); + + Karura::execute_with(|| { + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 10 * dollar - bnc_fee); + + assert_ok!(XTokens::transfer( + Origin::signed(BOB.into()), + BNC, + 5 * dollar, + Box::new( + MultiLocation::new( + 1, + X2( + Parachain(MOCK_BIFROST_ID), + Junction::AccountId32 { + network: NetworkId::Any, + id: ALICE.into(), + } + ) + ) + .into() + ), + 1_000_000_000, + )); + + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 5 * dollar - bnc_fee); + }); + + MockBifrost::execute_with(|| { + // Due to the re-anchoring, BNC came back as registered ForeignAsset(0) + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90 * dollar); + assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 10 * dollar); + + assert_eq!( + Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)), + 5 * dollar - foreign_fee ); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90 * dollar); }); } #[test] fn transfer_sibling_chain_asset() { TestNet::reset(); + let dollar = dollar(BNC); + let minimal_balance = Balances::minimum_balance() / 10; // 10% + let foreign_fee = foreign_per_second_as_fee(4, minimal_balance); + let bnc_fee = bnc_per_second_as_fee(4); Karura::execute_with(|| { - assert_ok!(Tokens::deposit(BNC, &AccountId::from(ALICE), 100_000_000_000_000)); + assert_ok!(Tokens::deposit(BNC, &AccountId::from(ALICE), 100 * dollar)); }); MockBifrost::execute_with(|| { // Register native BNC's incoming address as a foreign asset so it can handle reserve transfers assert_ok!(AssetRegistry::register_foreign_asset( Origin::root(), - Box::new(MultiLocation::new(0, X1(GeneralKey(BNC_KEY.to_vec()))).into()), + Box::new(MultiLocation::new(0, X1(GeneralKey(BNC_KEY.to_vec().try_into().unwrap()))).into()), Box::new(AssetMetadata { name: b"Native BNC".to_vec(), symbol: b"BNC".to_vec(), decimals: 12, - minimal_balance: Balances::minimum_balance() / 10, // 10% + minimal_balance, }) )); assert_ok!(Tokens::deposit( CurrencyId::ForeignAsset(0), &karura_reserve_account(), - 100_000_000_000_000 + 100 * dollar )); }); @@ -137,7 +237,7 @@ fn transfer_sibling_chain_asset() { assert_ok!(XTokens::transfer( Origin::signed(ALICE.into()), BNC, - 10_000_000_000_000, + 10 * dollar, Box::new( MultiLocation::new( 1, @@ -154,7 +254,7 @@ fn transfer_sibling_chain_asset() { 1_000_000_000, )); - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90_000_000_000_000); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90 * dollar); }); MockBifrost::execute_with(|| { @@ -166,16 +266,19 @@ fn transfer_sibling_chain_asset() { // Karura -->(transfer 10_000_000_000_000)--> Sibling assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &karura_reserve_account()), - 90_000_000_000_000 + 90 * dollar ); assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()), - 9_999_067_600_000 + 10 * dollar - foreign_fee ); }); Sibling::execute_with(|| { - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 9_984_149_200_000); + assert_eq!( + Tokens::free_balance(BNC, &AccountId::from(BOB)), + 10 * dollar - foreign_fee - bnc_fee + ); assert_ok!(XTokens::transfer( Origin::signed(BOB.into()), @@ -197,244 +300,60 @@ fn transfer_sibling_chain_asset() { 1_000_000_000, )); - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 4_984_149_200_000); + assert_eq!( + Tokens::free_balance(BNC, &AccountId::from(BOB)), + 5 * dollar - foreign_fee - bnc_fee + ); }); MockBifrost::execute_with(|| { // Sibling -->(transfer 5_000_000_000_000)--> Karura assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &karura_reserve_account()), - 94_999_067_600_000 + 95 * dollar - foreign_fee ); assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()), - 4_999_067_600_000 + 5 * dollar - foreign_fee ); }); Karura::execute_with(|| { - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 94_984_149_200_000); - }); -} - -#[test] -fn transfer_from_relay_chain_deposit_to_treasury_if_below_ed() { - KusamaNet::execute_with(|| { - assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets( - kusama_runtime::Origin::signed(ALICE.into()), - Box::new(Parachain(KARURA_ID).into().into()), - Box::new( - Junction::AccountId32 { - id: BOB, - network: NetworkId::Any - } - .into() - .into() - ), - Box::new((Here, 186_480_111).into()), - 0 - )); - }); - - Karura::execute_with(|| { - assert_eq!(Tokens::free_balance(KSM, &AccountId::from(BOB)), 0); - assert_eq!( - Tokens::free_balance(KSM, &karura_runtime::KaruraTreasuryAccount::get()), - 1_000_186_480_111 - ); - }); -} - -#[test] -fn xcm_transfer_execution_barrier_trader_works() { - let expect_weight_limit = 600_000_000; - let weight_limit_too_low = 500_000_000; - let unit_instruction_weight = 200_000_000; - - // relay-chain use normal account to send xcm, destination para-chain can't pass Barrier check - let message = Xcm(vec![ - ReserveAssetDeposited((Parent, 100).into()), - BuyExecution { - fees: (Parent, 100).into(), - weight_limit: Unlimited, - }, - DepositAsset { - assets: All.into(), - max_assets: 1, - beneficiary: Here.into(), - }, - ]); - KusamaNet::execute_with(|| { - assert_ok!(pallet_xcm::Pallet::::send_xcm( - X1(Junction::AccountId32 { - network: NetworkId::Any, - id: ALICE.into(), - }), - Parachain(KARURA_ID).into(), - message - )); - }); - Karura::execute_with(|| { - assert!(System::events().iter().any(|r| matches!( - r.event, - Event::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { - outcome: Outcome::Error(XcmError::Barrier), - .. - }) - ))); - }); - - // AllowTopLevelPaidExecutionFrom barrier test case: - // para-chain use XcmExecutor `execute_xcm()` method to execute xcm. - // if `weight_limit` in BuyExecution is less than `xcm_weight(max_weight)`, then Barrier can't pass. - // other situation when `weight_limit` is `Unlimited` or large than `xcm_weight`, then it's ok. - let message = Xcm::(vec![ - ReserveAssetDeposited((Parent, 100).into()), - BuyExecution { - fees: (Parent, 100).into(), - weight_limit: Limited(weight_limit_too_low), - }, - DepositAsset { - assets: All.into(), - max_assets: 1, - beneficiary: Here.into(), - }, - ]); - Karura::execute_with(|| { - let r = XcmExecutor::::execute_xcm(Parent, message, expect_weight_limit); - assert_eq!(r, Outcome::Error(XcmError::Barrier)); - }); - - // trader inside BuyExecution have TooExpensive error if payment less than calculated weight amount. - // the minimum of calculated weight amount(`FixedRateOfFungible`) is 139_860_000 - let message = Xcm::(vec![ - ReserveAssetDeposited((Parent, 139_859_999).into()), - BuyExecution { - fees: (Parent, 139_859_999).into(), - weight_limit: Limited(expect_weight_limit), - }, - DepositAsset { - assets: All.into(), - max_assets: 1, - beneficiary: Here.into(), - }, - ]); - Karura::execute_with(|| { - let r = XcmExecutor::::execute_xcm(Parent, message, expect_weight_limit); assert_eq!( - r, - Outcome::Incomplete(expect_weight_limit - unit_instruction_weight, XcmError::TooExpensive) - ); - }); - - // all situation fulfilled, execute success - let message = Xcm::(vec![ - ReserveAssetDeposited((Parent, 139_860_000).into()), - BuyExecution { - fees: (Parent, 139_860_000).into(), - weight_limit: Limited(expect_weight_limit), - }, - DepositAsset { - assets: All.into(), - max_assets: 1, - beneficiary: Here.into(), - }, - ]); - Karura::execute_with(|| { - let r = XcmExecutor::::execute_xcm(Parent, message, expect_weight_limit); - assert_eq!(r, Outcome::Complete(expect_weight_limit)); - }); -} - -#[test] -fn subscribe_version_notify_works() { - // relay chain subscribe version notify of para chain - KusamaNet::execute_with(|| { - let r = pallet_xcm::Pallet::::force_subscribe_version_notify( - kusama_runtime::Origin::root(), - Box::new(Parachain(KARURA_ID).into().into()), - ); - assert_ok!(r); - }); - KusamaNet::execute_with(|| { - kusama_runtime::System::assert_has_event(kusama_runtime::Event::XcmPallet( - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { - parents: 0, - interior: X1(Parachain(KARURA_ID)), - }, - 2, - ), - )); - }); - - // para chain subscribe version notify of relay chain - Karura::execute_with(|| { - let r = pallet_xcm::Pallet::::force_subscribe_version_notify( - Origin::root(), - Box::new(Parent.into()), + Tokens::free_balance(BNC, &AccountId::from(ALICE)), + 95 * dollar - foreign_fee - bnc_fee ); - assert_ok!(r); - }); - Karura::execute_with(|| { - System::assert_has_event(karura_runtime::Event::PolkadotXcm( - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { - parents: 1, - interior: Here, - }, - 2, - ), - )); - }); - - // para chain subscribe version notify of sibling chain - Karura::execute_with(|| { - let r = pallet_xcm::Pallet::::force_subscribe_version_notify( - Origin::root(), - Box::new((Parent, Parachain(SIBLING_ID)).into()), - ); - assert_ok!(r); - }); - Karura::execute_with(|| { - assert!(karura_runtime::System::events().iter().any(|r| matches!( - r.event, - karura_runtime::Event::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent(Some(_))) - ))); - }); - Sibling::execute_with(|| { - assert!(System::events().iter().any(|r| matches!( - r.event, - karura_runtime::Event::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent(Some(_))) - | karura_runtime::Event::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Success(Some(_))) - ))); }); } #[test] -fn test_asset_registry_module() { +fn asset_registry_module_works() { TestNet::reset(); + let dollar = dollar(BNC); + let minimal_balance = Balances::minimum_balance() / 10; // 10% + let foreign_fee = foreign_per_second_as_fee(4, minimal_balance); + let bnc_fee = foreign_fee; // BuyWeightRateOfForeignAsset in prior to BncPerSecond Karura::execute_with(|| { - assert_ok!(Tokens::deposit(BNC, &AccountId::from(ALICE), 100_000_000_000_000)); + assert_ok!(Tokens::deposit(BNC, &AccountId::from(ALICE), 100 * dollar)); }); MockBifrost::execute_with(|| { // Register native BNC's incoming address as a foreign asset so it can handle reserve transfers assert_ok!(AssetRegistry::register_foreign_asset( Origin::root(), - Box::new(MultiLocation::new(0, X1(GeneralKey(BNC_KEY.to_vec()))).into()), + Box::new(MultiLocation::new(0, X1(GeneralKey(BNC_KEY.to_vec().try_into().unwrap()))).into()), Box::new(AssetMetadata { name: b"Native BNC".to_vec(), symbol: b"BNC".to_vec(), decimals: 12, - minimal_balance: Balances::minimum_balance() / 10, // 10% + minimal_balance }) )); assert_ok!(Tokens::deposit( CurrencyId::ForeignAsset(0), &karura_reserve_account(), - 100_000_000_000_000 + 100 * dollar )); }); @@ -442,12 +361,18 @@ fn test_asset_registry_module() { // Register BNC as foreign asset(0) assert_ok!(AssetRegistry::register_foreign_asset( Origin::root(), - Box::new(MultiLocation::new(1, X2(Parachain(BIFROST_ID), GeneralKey(BNC_KEY.to_vec()))).into()), + Box::new( + MultiLocation::new( + 1, + X2(Parachain(BIFROST_ID), GeneralKey(BNC_KEY.to_vec().try_into().unwrap())) + ) + .into() + ), Box::new(AssetMetadata { name: b"Bifrost BNC".to_vec(), symbol: b"BNC".to_vec(), decimals: 12, - minimal_balance: Balances::minimum_balance() / 10, // 10% + minimal_balance }) )); }); @@ -456,25 +381,31 @@ fn test_asset_registry_module() { // Register BNC as foreign asset(0) assert_ok!(AssetRegistry::register_foreign_asset( Origin::root(), - Box::new(MultiLocation::new(1, X2(Parachain(BIFROST_ID), GeneralKey(BNC_KEY.to_vec()))).into()), + Box::new( + MultiLocation::new( + 1, + X2(Parachain(BIFROST_ID), GeneralKey(BNC_KEY.to_vec().try_into().unwrap())) + ) + .into() + ), Box::new(AssetMetadata { name: b"Bifrost BNC".to_vec(), symbol: b"BNC".to_vec(), decimals: 12, - minimal_balance: Balances::minimum_balance() / 10, // 10% + minimal_balance }) )); assert_ok!(Tokens::deposit( CurrencyId::ForeignAsset(0), &AccountId::from(ALICE), - 100_000_000_000_000 + 100 * dollar )); assert_ok!(XTokens::transfer( Origin::signed(ALICE.into()), CurrencyId::ForeignAsset(0), - 10_000_000_000_000, + 10 * dollar, Box::new( MultiLocation::new( 1, @@ -493,7 +424,7 @@ fn test_asset_registry_module() { assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)), - 90_000_000_000_000 + 90 * dollar ); }); @@ -502,18 +433,18 @@ fn test_asset_registry_module() { // Karura -->(transfer 10_000_000_000_000)--> Sibling assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &karura_reserve_account()), - 90_000_000_000_000 + 90 * dollar ); assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()), - 9_999_067_600_000 + 10 * dollar - foreign_fee ); }); Sibling::execute_with(|| { assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)), - 9_998_135_200_000 + 10 * dollar - foreign_fee - bnc_fee ); assert_ok!(XTokens::transfer( @@ -538,7 +469,7 @@ fn test_asset_registry_module() { assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)), - 4_998_135_200_000 + 5 * dollar - foreign_fee - bnc_fee ); }); @@ -546,18 +477,18 @@ fn test_asset_registry_module() { // Sibling -->(transfer 5_000_000_000_000)--> Karura assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &karura_reserve_account()), - 94_999_067_600_000 + 95 * dollar - foreign_fee ); assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()), - 4_999_067_600_000 + 5 * dollar - foreign_fee ); }); Karura::execute_with(|| { assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)), - 94_998_135_200_000 + 95 * dollar - foreign_fee - bnc_fee ); }); } @@ -568,16 +499,27 @@ fn stable_asset_xtokens_works() { let stable_asset = CurrencyId::StableAssetPoolToken(0); let foreign_asset = CurrencyId::ForeignAsset(0); let dollar = dollar(KAR); + let minimal_balance = Balances::minimum_balance() / 10; // 10% + let foreign_fee = foreign_per_second_as_fee(4, minimal_balance); MockBifrost::execute_with(|| { assert_ok!(AssetRegistry::register_foreign_asset( Origin::root(), - Box::new(MultiLocation::new(1, X2(Parachain(KARURA_ID), GeneralKey(stable_asset.encode()))).into()), + Box::new( + MultiLocation::new( + 1, + X2( + Parachain(KARURA_ID), + GeneralKey(stable_asset.encode().try_into().unwrap()) + ) + ) + .into() + ), Box::new(AssetMetadata { name: b"Foreign Stable Asset".to_vec(), symbol: b"SA".to_vec(), decimals: 12, - minimal_balance: Balances::minimum_balance() / 10, // 10% + minimal_balance }) )); }); @@ -589,7 +531,7 @@ fn stable_asset_xtokens_works() { name: b"Stable Asset".to_vec(), symbol: b"SA".to_vec(), decimals: 12, - minimal_balance: Balances::minimum_balance() / 10, // 10% + minimal_balance }) )); assert_ok!(Tokens::deposit(stable_asset, &AccountId::from(BOB), 10 * dollar)); @@ -624,7 +566,7 @@ fn stable_asset_xtokens_works() { MockBifrost::execute_with(|| { assert_eq!( Tokens::free_balance(foreign_asset, &AccountId::from(ALICE)), - 4_999_067_600_000 + 5 * dollar - foreign_fee ); assert_ok!(XTokens::transfer( @@ -651,7 +593,7 @@ fn stable_asset_xtokens_works() { Karura::execute_with(|| { assert_eq!( Tokens::free_balance(stable_asset, &AccountId::from(BOB)), - 5_999_067_600_000 + 6 * dollar - foreign_fee ); assert_eq!( Tokens::free_balance(stable_asset, &bifrost_reserve_account()), @@ -660,6 +602,247 @@ fn stable_asset_xtokens_works() { }); } +#[test] +fn transfer_from_relay_chain_deposit_to_treasury_if_below_ed() { + let minimum = relay_per_second_as_fee(4); + let ksm_minimum = Tokens::minimum_balance(KSM); + assert_eq!(ksm_minimum, 100_000_000); + + fn below_ed_case(amount: Balance) { + TestNet::reset(); + KusamaNet::execute_with(|| { + assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets( + kusama_runtime::Origin::signed(ALICE.into()), + Box::new(Parachain(KARURA_ID).into().into()), + Box::new( + Junction::AccountId32 { + id: BOB, + network: NetworkId::Any + } + .into() + .into() + ), + Box::new((Here, amount).into()), + 0 + )); + }); + Karura::execute_with(|| { + assert_eq!(Tokens::free_balance(KSM, &AccountId::from(BOB)), 0); + assert_eq!( + Tokens::free_balance(KSM, &karura_runtime::KaruraTreasuryAccount::get()), + dollar(KSM) + amount + ); + }); + } + + fn upper_ed_case(amount: Balance) { + let minimum = relay_per_second_as_fee(4); + + TestNet::reset(); + KusamaNet::execute_with(|| { + assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets( + kusama_runtime::Origin::signed(ALICE.into()), + Box::new(Parachain(KARURA_ID).into().into()), + Box::new( + Junction::AccountId32 { + id: BOB, + network: NetworkId::Any + } + .into() + .into() + ), + Box::new((Here, amount).into()), + 0 + )); + }); + Karura::execute_with(|| { + assert_eq!(Tokens::free_balance(KSM, &AccountId::from(BOB)), amount - minimum); + assert_eq!( + Tokens::free_balance(KSM, &karura_runtime::KaruraTreasuryAccount::get()), + dollar(KSM) + minimum + ); + }); + } + + below_ed_case(minimum); + below_ed_case(minimum + ksm_minimum - 1); + upper_ed_case(minimum + ksm_minimum); + upper_ed_case(minimum + ksm_minimum + 1); +} + +#[test] +fn xcm_transfer_execution_barrier_trader_works() { + let unit_instruction_weight: Weight = karura_runtime::xcm_config::UnitWeightCost::get(); + let expect_weight_limit = unit_instruction_weight.saturating_mul(3); + let weight_limit_too_low = expect_weight_limit - 1; + let trap_asset_limit: Balance = relay_per_second_as_fee(3); + + // relay-chain use normal account to send xcm, destination para-chain can't pass Barrier check + let message = Xcm(vec![ + ReserveAssetDeposited((Parent, 100).into()), + BuyExecution { + fees: (Parent, 100).into(), + weight_limit: Unlimited, + }, + DepositAsset { + assets: All.into(), + max_assets: 1, + beneficiary: Here.into(), + }, + ]); + KusamaNet::execute_with(|| { + assert_ok!(pallet_xcm::Pallet::::send_xcm( + X1(Junction::AccountId32 { + network: NetworkId::Any, + id: ALICE.into(), + }), + Parachain(KARURA_ID).into(), + message + )); + }); + Karura::execute_with(|| { + assert!(System::events().iter().any(|r| matches!( + r.event, + Event::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { + outcome: Outcome::Error(XcmError::Barrier), + .. + }) + ))); + }); + + // AllowTopLevelPaidExecutionFrom barrier test case: + // para-chain use XcmExecutor `execute_xcm()` method to execute xcm. + // if `weight_limit` in BuyExecution is less than `xcm_weight(max_weight)`, then Barrier can't pass. + // other situation when `weight_limit` is `Unlimited` or large than `xcm_weight`, then it's ok. + let message = Xcm::(vec![ + ReserveAssetDeposited((Parent, 100).into()), + BuyExecution { + fees: (Parent, 100).into(), + weight_limit: Limited(weight_limit_too_low), + }, + DepositAsset { + assets: All.into(), + max_assets: 1, + beneficiary: Here.into(), + }, + ]); + Karura::execute_with(|| { + let r = XcmExecutor::::execute_xcm(Parent, message, expect_weight_limit); + assert_eq!(r, Outcome::Error(XcmError::Barrier)); + }); + + // trader inside BuyExecution have TooExpensive error if payment less than calculated weight amount. + // the minimum of calculated weight amount(`FixedRateOfFungible`). + let message = Xcm::(vec![ + ReserveAssetDeposited((Parent, trap_asset_limit - 1).into()), + BuyExecution { + fees: (Parent, trap_asset_limit - 1).into(), + weight_limit: Limited(expect_weight_limit), + }, + DepositAsset { + assets: All.into(), + max_assets: 1, + beneficiary: Here.into(), + }, + ]); + Karura::execute_with(|| { + let r = XcmExecutor::::execute_xcm(Parent, message, expect_weight_limit); + assert_eq!( + r, + Outcome::Incomplete(expect_weight_limit - unit_instruction_weight, XcmError::TooExpensive) + ); + }); + + // all situation fulfilled, execute success + let message = Xcm::(vec![ + ReserveAssetDeposited((Parent, trap_asset_limit).into()), + BuyExecution { + fees: (Parent, trap_asset_limit).into(), + weight_limit: Limited(expect_weight_limit), + }, + DepositAsset { + assets: All.into(), + max_assets: 1, + beneficiary: Here.into(), + }, + ]); + Karura::execute_with(|| { + let r = XcmExecutor::::execute_xcm(Parent, message, expect_weight_limit); + assert_eq!(r, Outcome::Complete(expect_weight_limit)); + }); +} + +#[test] +fn subscribe_version_notify_works() { + // relay chain subscribe version notify of para chain + KusamaNet::execute_with(|| { + let r = pallet_xcm::Pallet::::force_subscribe_version_notify( + kusama_runtime::Origin::root(), + Box::new(Parachain(KARURA_ID).into().into()), + ); + assert_ok!(r); + }); + KusamaNet::execute_with(|| { + kusama_runtime::System::assert_has_event(kusama_runtime::Event::XcmPallet( + pallet_xcm::Event::SupportedVersionChanged( + MultiLocation { + parents: 0, + interior: X1(Parachain(KARURA_ID)), + }, + 2, + ), + )); + }); + + // para chain subscribe version notify of relay chain + Karura::execute_with(|| { + let r = pallet_xcm::Pallet::::force_subscribe_version_notify( + Origin::root(), + Box::new(Parent.into()), + ); + assert_ok!(r); + }); + Karura::execute_with(|| { + System::assert_has_event(karura_runtime::Event::PolkadotXcm( + pallet_xcm::Event::SupportedVersionChanged( + MultiLocation { + parents: 1, + interior: Here, + }, + 2, + ), + )); + }); + + // para chain subscribe version notify of sibling chain + Karura::execute_with(|| { + let r = pallet_xcm::Pallet::::force_subscribe_version_notify( + Origin::root(), + Box::new((Parent, Parachain(SIBLING_ID)).into()), + ); + assert_ok!(r); + }); + Karura::execute_with(|| { + assert!(karura_runtime::System::events().iter().any(|r| matches!( + r.event, + karura_runtime::Event::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { + message_hash: Some(_) + }) + ))); + }); + Sibling::execute_with(|| { + assert!(System::events().iter().any(|r| matches!( + r.event, + karura_runtime::Event::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { + message_hash: Some(_) + }) | karura_runtime::Event::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Success { + message_hash: Some(_), + .. + }) + ))); + }); +} + #[test] fn unspent_xcm_fee_is_returned_correctly() { let mut parachain_account: AccountId = AccountId::new([0u8; 32]); @@ -668,29 +851,32 @@ fn unspent_xcm_fee_is_returned_correctly() { Karura::execute_with(|| { parachain_account = ParachainAccount::get(); }); + let dollar_r = dollar(RELAY_CHAIN_CURRENCY); + let dollar_n = dollar(NATIVE_CURRENCY); + KusamaNet::execute_with(|| { assert_ok!(kusama_runtime::Balances::transfer( kusama_runtime::Origin::signed(ALICE.into()), MultiAddress::Id(homa_lite_sub_account.clone()), - 1_000 * dollar(RELAY_CHAIN_CURRENCY) + 1_000 * dollar_r )); assert_ok!(kusama_runtime::Balances::transfer( kusama_runtime::Origin::signed(ALICE.into()), MultiAddress::Id(parachain_account.clone()), - 1_000 * dollar(RELAY_CHAIN_CURRENCY) + 1_000 * dollar_r )); assert_eq!( kusama_runtime::Balances::free_balance(&AccountId::from(ALICE)), - 2 * dollar(RELAY_CHAIN_CURRENCY) + 2 * dollar_r ); assert_eq!( kusama_runtime::Balances::free_balance(&homa_lite_sub_account), - 1_000 * dollar(RELAY_CHAIN_CURRENCY) + 1_000 * dollar_r ); assert_eq!(kusama_runtime::Balances::free_balance(&AccountId::from(BOB)), 0); assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account.clone()), - 1_002 * dollar(RELAY_CHAIN_CURRENCY) + 1_002 * dollar_r ); }); @@ -698,14 +884,14 @@ fn unspent_xcm_fee_is_returned_correctly() { // Construct a transfer XCM call with returning the deposit let transfer_call = RelayChainCallBuilder::::balances_transfer_keep_alive( AccountId::from(BOB), - dollar(NATIVE_CURRENCY), + dollar_n, ); let batch_call = RelayChainCallBuilder::::utility_as_derivative_call(transfer_call, 0); let weight = 10_000_000_000; // Fee to transfer into the hold register let asset = MultiAsset { id: Concrete(MultiLocation::here()), - fun: Fungibility::Fungible(dollar(NATIVE_CURRENCY)), + fun: Fungibility::Fungible(dollar_n), }; let xcm_msg = Xcm(vec![ WithdrawAsset(asset.clone().into()), @@ -728,16 +914,13 @@ fn unspent_xcm_fee_is_returned_correctly() { // 1 dollar is transferred to BOB assert_eq!( kusama_runtime::Balances::free_balance(&homa_lite_sub_account), - 999 * dollar(RELAY_CHAIN_CURRENCY) - ); - assert_eq!( - kusama_runtime::Balances::free_balance(&AccountId::from(BOB)), - dollar(RELAY_CHAIN_CURRENCY) + 999 * dollar_r ); + assert_eq!(kusama_runtime::Balances::free_balance(&AccountId::from(BOB)), dollar_r); // 1 dollar is given to Hold Register for XCM call and never returned. assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account.clone()), - 1_001 * dollar(RELAY_CHAIN_CURRENCY) + 1_001 * dollar_r ); }); @@ -745,12 +928,12 @@ fn unspent_xcm_fee_is_returned_correctly() { // Construct a transfer using the RelaychainCallBuilder let transfer_call = RelayChainCallBuilder::::balances_transfer_keep_alive( AccountId::from(BOB), - dollar(NATIVE_CURRENCY), + dollar_n, ); let batch_call = RelayChainCallBuilder::::utility_as_derivative_call(transfer_call, 0); let finalized_call = RelayChainCallBuilder::::finalize_call_into_xcm_message( batch_call, - dollar(NATIVE_CURRENCY), + dollar_n, 10_000_000_000, ); @@ -762,16 +945,16 @@ fn unspent_xcm_fee_is_returned_correctly() { // 1 dollar is transferred to BOB assert_eq!( kusama_runtime::Balances::free_balance(&homa_lite_sub_account), - 998 * dollar(RELAY_CHAIN_CURRENCY) + 998 * dollar_r ); assert_eq!( kusama_runtime::Balances::free_balance(&AccountId::from(BOB)), - 2 * dollar(RELAY_CHAIN_CURRENCY) + 2 * dollar_r ); // Unspent fund from the 1 dollar XCM fee is returned to the sovereign account. assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account.clone()), - 1_000 * dollar(RELAY_CHAIN_CURRENCY) + 999_601_783_448 + 1_000 * dollar_r + 999_601_783_448 ); }); } @@ -782,7 +965,7 @@ fn trap_assets_larger_than_ed_works() { let mut kar_treasury_amount = 0; let (ksm_asset_amount, kar_asset_amount) = (dollar(KSM), dollar(KAR)); - let trader_weight_to_treasury: u128 = 139_860_000; + let trader_weight_to_treasury: u128 = relay_per_second_as_fee(3); let parent_account: AccountId = ParentIsPreset::::convert(Parent.into()).unwrap(); @@ -801,7 +984,7 @@ fn trap_assets_larger_than_ed_works() { fees: assets, weight_limit: Limited(dollar(KSM) as u64), }, - WithdrawAsset(((0, GeneralKey(KAR.encode())), kar_asset_amount).into()), + WithdrawAsset(((0, GeneralKey(KAR.encode().try_into().unwrap())), kar_asset_amount).into()), ]; assert_ok!(pallet_xcm::Pallet::::send_xcm( Here, @@ -809,6 +992,7 @@ fn trap_assets_larger_than_ed_works() { Xcm(xcm), )); }); + Karura::execute_with(|| { assert!(System::events() .iter() @@ -829,10 +1013,6 @@ fn trap_assets_larger_than_ed_works() { fn trap_assets_lower_than_ed_works() { TestNet::reset(); - // 233_100_000_000 * weight(600000000) / WEIGHT_PER_SECOND(10^12) = 0.2331 * 600000000 = 139_860_000 - let ksm_per_second = karura_runtime::ksm_per_second(); - assert_eq!(233_100_000_000, ksm_per_second); - let mut kar_treasury_amount = 0; let (ksm_asset_amount, kar_asset_amount) = (150_000_000, cent(KAR)); @@ -852,7 +1032,7 @@ fn trap_assets_lower_than_ed_works() { fees: assets, weight_limit: Limited(dollar(KSM) as u64), }, - WithdrawAsset(((0, X1(GeneralKey(KAR.encode()))), kar_asset_amount).into()), + WithdrawAsset(((0, X1(GeneralKey(KAR.encode().try_into().unwrap()))), kar_asset_amount).into()), // two asset left in holding register, they both lower than ED, so goes to treasury. ]; assert_ok!(pallet_xcm::Pallet::::send_xcm( @@ -895,7 +1075,7 @@ fn sibling_trap_assets_works() { }); Sibling::execute_with(|| { - let assets: MultiAsset = ((0, X1(GeneralKey(KAR.encode()))), kar_asset_amount).into(); + let assets: MultiAsset = ((0, X1(GeneralKey(KAR.encode().try_into().unwrap()))), kar_asset_amount).into(); let xcm = vec![ WithdrawAsset(assets.clone().into()), BuyExecution { @@ -904,7 +1084,10 @@ fn sibling_trap_assets_works() { }, WithdrawAsset( ( - (Parent, X2(Parachain(BIFROST_ID), GeneralKey(BNC_KEY.to_vec()))), + ( + Parent, + X2(Parachain(BIFROST_ID), GeneralKey(BNC_KEY.to_vec().try_into().unwrap())), + ), bnc_asset_amount, ) .into(), @@ -934,90 +1117,3 @@ fn sibling_trap_assets_works() { ); }); } - -#[test] -fn transfer_native_chain_asset() { - TestNet::reset(); - - MockBifrost::execute_with(|| { - // Register native BNC's incoming address as a foreign asset so it can receive BNC - assert_ok!(AssetRegistry::register_foreign_asset( - Origin::root(), - Box::new(MultiLocation::new(0, X1(GeneralKey(BNC_KEY.to_vec()))).into()), - Box::new(AssetMetadata { - name: b"Native BNC".to_vec(), - symbol: b"BNC".to_vec(), - decimals: 12, - minimal_balance: Balances::minimum_balance() / 10, // 10% - }) - )); - assert_ok!(Tokens::deposit( - CurrencyId::ForeignAsset(0), - &karura_reserve_account(), - 100_000_000_000_000 - )); - - assert_ok!(Tokens::deposit(BNC, &AccountId::from(ALICE), 100_000_000_000_000)); - - assert_ok!(XTokens::transfer( - Origin::signed(ALICE.into()), - BNC, - 10_000_000_000_000, - Box::new( - MultiLocation::new( - 1, - X2( - Parachain(KARURA_ID), - Junction::AccountId32 { - network: NetworkId::Any, - id: BOB.into(), - } - ) - ) - .into() - ), - 1_000_000_000, - )); - - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90_000_000_000_000); - assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 10_000_000_000_000); - }); - - Karura::execute_with(|| { - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 9_985_081_600_000); - - assert_ok!(XTokens::transfer( - Origin::signed(BOB.into()), - BNC, - 5_000_000_000_000, - Box::new( - MultiLocation::new( - 1, - X2( - Parachain(MOCK_BIFROST_ID), - Junction::AccountId32 { - network: NetworkId::Any, - id: ALICE.into(), - } - ) - ) - .into() - ), - 1_000_000_000, - )); - - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 4_985_081_600_000); - }); - - MockBifrost::execute_with(|| { - // Due to the re-anchoring, BNC came back as registered ForeignAsset(0) - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90_000_000_000_000); - assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 10_000_000_000_000); - - assert_eq!( - Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)), - 4_999_067_600_000 - ); - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90_000_000_000_000); - }); -} diff --git a/runtime/integration-tests/src/relaychain/mod.rs b/runtime/integration-tests/src/relaychain/mod.rs index 0b461d365..7d5832a83 100644 --- a/runtime/integration-tests/src/relaychain/mod.rs +++ b/runtime/integration-tests/src/relaychain/mod.rs @@ -33,6 +33,156 @@ mod statemint; #[cfg(feature = "with-karura-runtime")] mod erc20; +pub use fee_test::{relay_per_second_as_fee, token_per_second_as_fee}; +use frame_support::weights::{constants::WEIGHT_PER_SECOND, Weight}; +use sp_runtime::{FixedPointNumber, FixedU128}; + +// N * unit_weight * (weight/10^12) * token_per_second +fn weight_calculation(instruction_count: u32, unit_weight: Weight, per_second: u128) -> u128 { + let weight = unit_weight.saturating_mul(instruction_count as u64); + let weight_ratio = FixedU128::saturating_from_rational(weight as u128, WEIGHT_PER_SECOND as u128); + weight_ratio.saturating_mul_int(per_second) +} + +// N * unit_weight * (weight/10^12) * token_per_second * +// (minimal_balance/native_asset_minimal_balance) +fn foreign_asset_fee(weight: u128, minimal_balance: u128) -> u128 { + use crate::setup::Balances; + use frame_support::traits::fungible::Inspect; + + let minimum_ratio = FixedU128::saturating_from_rational(minimal_balance, Balances::minimum_balance()); + minimum_ratio.saturating_mul_int(weight) +} + +// N * unit_weight * (weight/10^12) * token_per_second * token_rate +fn token_asset_fee(weight: u128, token_rate: FixedU128) -> u128 { + token_rate.saturating_mul_int(weight as u128) +} + +mod fee_test { + use super::{foreign_asset_fee, token_asset_fee, weight_calculation}; + use crate::setup::*; + + fn native_unit_cost(instruction_count: u32, per_second: u128) -> u128 { + #[cfg(feature = "with-karura-runtime")] + let unit_weight: Weight = karura_runtime::xcm_config::UnitWeightCost::get(); + #[cfg(feature = "with-karura-runtime")] + assert_eq!(unit_weight, 200_000_000); + #[cfg(feature = "with-acala-runtime")] + let unit_weight: Weight = acala_runtime::xcm_config::UnitWeightCost::get(); + #[cfg(feature = "with-acala-runtime")] + assert_eq!(unit_weight, 200_000_000); + #[cfg(feature = "with-mandala-runtime")] + let unit_weight: Weight = mandala_runtime::xcm_config::UnitWeightCost::get(); + #[cfg(feature = "with-mandala-runtime")] + assert_eq!(unit_weight, 1_000_000); + + weight_calculation(instruction_count, unit_weight, per_second) + } + + pub fn relay_per_second_as_fee(instruction_count: u32) -> u128 { + #[cfg(feature = "with-karura-runtime")] + let relay_per_second = karura_runtime::ksm_per_second(); + #[cfg(feature = "with-karura-runtime")] + assert_eq!(231_740_000_000, relay_per_second); + + #[cfg(feature = "with-acala-runtime")] + let relay_per_second = acala_runtime::dot_per_second(); + #[cfg(feature = "with-acala-runtime")] + assert_eq!(231_740_000_0, relay_per_second); + + #[cfg(feature = "with-mandala-runtime")] + let relay_per_second = mandala_runtime::dot_per_second(); + #[cfg(feature = "with-mandala-runtime")] + assert_eq!(115_870_000_000, relay_per_second); + + native_unit_cost(instruction_count, relay_per_second) + } + + pub fn native_per_second_as_fee(instruction_count: u32) -> u128 { + #[cfg(feature = "with-karura-runtime")] + let native_per_second = karura_runtime::kar_per_second(); + #[cfg(feature = "with-karura-runtime")] + assert_eq!(11_587_000_000_000, native_per_second); + #[cfg(feature = "with-acala-runtime")] + let native_per_second = acala_runtime::aca_per_second(); + #[cfg(feature = "with-karura-runtime")] + assert_eq!(11_587_000_000_000, native_per_second); + #[cfg(feature = "with-mandala-runtime")] + let native_per_second = mandala_runtime::aca_per_second(); + #[cfg(feature = "with-karura-runtime")] + assert_eq!(11_587_000_000_000, native_per_second); + + native_unit_cost(instruction_count, native_per_second) + } + + #[cfg(feature = "with-karura-runtime")] + pub fn bnc_per_second_as_fee(instruction_count: u32) -> u128 { + relay_per_second_as_fee(instruction_count) * 80 + } + + pub fn foreign_per_second_as_fee(instruction_count: u32, minimal_balance: u128) -> u128 { + #[cfg(feature = "with-karura-runtime")] + let native_per_second = karura_runtime::kar_per_second(); + #[cfg(feature = "with-acala-runtime")] + let native_per_second = acala_runtime::aca_per_second(); + #[cfg(feature = "with-mandala-runtime")] + let native_per_second = mandala_runtime::aca_per_second(); + + let weight = native_unit_cost(instruction_count, native_per_second); + + foreign_asset_fee(weight, minimal_balance) + } + + pub fn token_per_second_as_fee(instruction_count: u32, rate: FixedU128) -> u128 { + let native_fee = native_per_second_as_fee(instruction_count); + token_asset_fee(native_fee, rate) + } + + #[cfg(feature = "with-karura-runtime")] + #[test] + fn karura_per_second_works() { + assert_eq!(185_392_000, relay_per_second_as_fee(4)); + assert_eq!(139_044_000, relay_per_second_as_fee(3)); + assert_eq!(9_269_600_000, native_per_second_as_fee(4)); + assert_eq!(14_831_360_000, bnc_per_second_as_fee(4)); + + assert_eq!(9_269_600_000, foreign_per_second_as_fee(4, Balances::minimum_balance())); + assert_eq!( + 926_960_000, + foreign_per_second_as_fee(4, Balances::minimum_balance() / 10) + ); + } + + #[cfg(feature = "with-acala-runtime")] + #[test] + fn acala_per_second_works() { + assert_eq!(1_853_920, relay_per_second_as_fee(4)); + assert_eq!(1_390_440, relay_per_second_as_fee(3)); + assert_eq!(9_269_600_000, native_per_second_as_fee(4)); + + assert_eq!(9_269_600_000, foreign_per_second_as_fee(4, Balances::minimum_balance())); + assert_eq!( + 926_960_000, + foreign_per_second_as_fee(4, Balances::minimum_balance() / 10) + ); + } + + #[cfg(feature = "with-mandala-runtime")] + #[test] + fn mandala_per_second_works() { + assert_eq!(463_480, relay_per_second_as_fee(4)); + assert_eq!(347_610, relay_per_second_as_fee(3)); + assert_eq!(46_348_000, native_per_second_as_fee(4)); + + assert_eq!(46_348_000, foreign_per_second_as_fee(4, Balances::minimum_balance())); + assert_eq!( + 4_634_800, + foreign_per_second_as_fee(4, Balances::minimum_balance() / 10) + ); + } +} + #[test] fn weight_to_fee_works() { use frame_support::weights::{Weight, WeightToFee as WeightToFeeT}; @@ -83,7 +233,7 @@ fn weight_to_fee_works() { let weight: Weight = base_weight.saturating_mul(4); let fee = WeightToFee::weight_to_fee(&weight); - assert_eq!(15_540_916, fee); + assert_eq!(15_450_332, fee); } // Statemint @@ -96,7 +246,7 @@ fn weight_to_fee_works() { let weight: Weight = base_weight.saturating_mul(4); let fee = WeightToFee::weight_to_fee(&weight); - assert_eq!(46_622_760, fee); + assert_eq!(46_351_012, fee); } // Karura @@ -112,11 +262,11 @@ fn weight_to_fee_works() { let weight: Weight = base_weight.saturating_mul(4); let fee = WeightToFee::weight_to_fee(&weight); - assert_eq!(4_662_276_356, fee); + assert_eq!(4_635_101_624, fee); let weight: Weight = unit_weight.saturating_mul(4); let fee = WeightToFee::weight_to_fee(&weight); - assert_eq!(9_324_552_713, fee); + assert_eq!(9_270_203_249, fee); } // Acala @@ -132,10 +282,10 @@ fn weight_to_fee_works() { let weight: Weight = base_weight.saturating_mul(4); let fee = WeightToFee::weight_to_fee(&weight); - assert_eq!(4_662_276_356, fee); + assert_eq!(4_635_101_624, fee); let weight: Weight = unit_weight.saturating_mul(4); let fee = WeightToFee::weight_to_fee(&weight); - assert_eq!(9_324_552_713, fee); + assert_eq!(9_270_203_249, fee); } } diff --git a/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs b/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs index 2843b8057..31b7800a4 100644 --- a/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs +++ b/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs @@ -25,6 +25,15 @@ use frame_support::assert_ok; use orml_traits::MultiCurrency; use xcm_emulator::TestExt; +#[test] +fn token_per_second_works() { + let aca_per_second = acala_runtime::aca_per_second(); + assert_eq!(11_587_000_000_000, aca_per_second); + + let dot_per_second = acala_runtime::dot_per_second(); + assert_eq!(2_317_400_000, dot_per_second); +} + #[test] fn transfer_from_relay_chain() { PolkadotNet::execute_with(|| { @@ -45,7 +54,7 @@ fn transfer_from_relay_chain() { }); Acala::execute_with(|| { - assert_eq!(9_998_135_200, Tokens::free_balance(DOT, &AccountId::from(BOB))); + assert_eq!(9_998_146_080, Tokens::free_balance(DOT, &AccountId::from(BOB))); }); } diff --git a/runtime/integration-tests/src/relaychain/statemine.rs b/runtime/integration-tests/src/relaychain/statemine.rs index 97c15476a..19877b131 100644 --- a/runtime/integration-tests/src/relaychain/statemine.rs +++ b/runtime/integration-tests/src/relaychain/statemine.rs @@ -33,7 +33,7 @@ pub const UNIT: Balance = 1_000_000_000_000; pub const TEN: Balance = 10_000_000_000_000; pub const FEE_WEIGHT: Balance = 4_000_000_000; pub const FEE: Balance = 20_000_000; -pub const FEE_STATEMINE: Balance = 15_540_916; +pub const FEE_STATEMINE: Balance = 15_450_332; fn init_statemine_xcm_interface() { let xcm_operation = @@ -74,7 +74,7 @@ fn statemine_min_xcm_fee_matched() { } #[test] -fn transfer_from_relay_chain() { +fn teleport_from_relay_chain() { KusamaNet::execute_with(|| { assert_ok!(kusama_runtime::XcmPallet::teleport_assets( kusama_runtime::Origin::signed(ALICE.into()), @@ -135,7 +135,7 @@ fn karura_statemine_transfer_works() { UNIT + FEE - FEE_STATEMINE, Balances::free_balance(&AccountId::from(BOB)) ); - assert_eq!(1_003_977_797_902, Balances::free_balance(¶_2000)); + assert_eq!(1_003_977_888_486, Balances::free_balance(¶_2000)); }); } @@ -145,7 +145,7 @@ fn karura_side(fee_amount: u128) { init_statemine_xcm_interface(); assert_eq!( - 9_999_906_760_000, + 9_999_907_304_000, Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); // ensure sender has enough KSM balance to be charged as fee @@ -172,7 +172,7 @@ fn karura_side(fee_amount: u128) { )); assert_eq!( - 8_999_906_760_000, + 8_999_907_304_000, Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); assert_eq!(TEN - fee_amount, Tokens::free_balance(KSM, &AccountId::from(BOB))); @@ -192,14 +192,14 @@ fn statemine_side(para_2000_init_amount: u128) { Balances::make_free_balance_be(&ALICE.into(), TEN); Balances::make_free_balance_be(&BOB.into(), UNIT); - // create custom asset cost 1 KSM + // create custom asset cost 0.1 KSM assert_ok!(Assets::create( origin.clone(), 0, MultiAddress::Id(ALICE.into()), UNIT / 100 )); - assert_eq!(9 * UNIT, Balances::free_balance(&AccountId::from(ALICE))); + assert_eq!(9_900_000_000_000, Balances::free_balance(&AccountId::from(ALICE))); assert_ok!(Assets::mint( origin.clone(), diff --git a/runtime/integration-tests/src/relaychain/statemint.rs b/runtime/integration-tests/src/relaychain/statemint.rs index 371dfbc4e..079eb29a8 100644 --- a/runtime/integration-tests/src/relaychain/statemint.rs +++ b/runtime/integration-tests/src/relaychain/statemint.rs @@ -33,6 +33,7 @@ pub const UNIT: Balance = 1_000_000_000_000; pub const TEN: Balance = 10_000_000_000_000; pub const FEE_WEIGHT: Balance = 4_000_000_000; pub const FEE: Balance = 50_000_000; +pub const FEE_STATEMINT: Balance = 46_351_012; fn init_statemine_xcm_interface() { let xcm_operation = @@ -70,7 +71,6 @@ fn statemint_min_xcm_fee_matched() { #[test] fn teleport_from_relay_chain() { - env_logger::init(); PolkadotNet::execute_with(|| { assert_ok!(polkadot_runtime::XcmPallet::teleport_assets( polkadot_runtime::Origin::signed(ALICE.into()), @@ -89,7 +89,10 @@ fn teleport_from_relay_chain() { }); Statemint::execute_with(|| { - assert_eq!(9_953_377_240, Balances::free_balance(&AccountId::from(BOB))); + assert_eq!( + dollar(DOT) - FEE_STATEMINT, + Balances::free_balance(&AccountId::from(BOB)) + ); }); } @@ -127,8 +130,8 @@ fn acala_statemint_transfer_works() { // and withdraw sibling parachain sovereign account assert_eq!(9 * UNIT, Assets::balance(0, ¶_2000)); - assert_eq!(1000003377240, Balances::free_balance(&AccountId::from(BOB))); - assert_eq!(1003446936032, Balances::free_balance(¶_2000)); + assert_eq!(1000003648988, Balances::free_balance(&AccountId::from(BOB))); + assert_eq!(1003447207780, Balances::free_balance(¶_2000)); }); } @@ -138,7 +141,7 @@ fn acala_side(fee_amount: u128) { init_statemine_xcm_interface(); assert_eq!( - 9_999_906_760_000, + TEN - 92696000, Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); // ensure sender has enough DOT balance to be charged as fee @@ -165,7 +168,7 @@ fn acala_side(fee_amount: u128) { )); assert_eq!( - 8_999_906_760_000, + TEN - UNIT - 92696000, Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); assert_eq!(TEN - fee_amount, Tokens::free_balance(DOT, &AccountId::from(BOB))); @@ -192,7 +195,7 @@ fn statemint_side(para_2000_init_amount: u128) { MultiAddress::Id(ALICE.into()), UNIT / 100 )); - assert_eq!(9 * UNIT, Balances::free_balance(&AccountId::from(ALICE))); + assert_eq!(9_900_000_000_000, Balances::free_balance(&AccountId::from(ALICE))); assert_ok!(Assets::mint( origin.clone(), diff --git a/runtime/integration-tests/src/runtime.rs b/runtime/integration-tests/src/runtime.rs index 71c5009e7..f7fc0fb6c 100644 --- a/runtime/integration-tests/src/runtime.rs +++ b/runtime/integration-tests/src/runtime.rs @@ -43,18 +43,21 @@ fn currency_id_convert() { CurrencyIdConvert::convert(NATIVE_CURRENCY), Some(MultiLocation::sibling_parachain_general_key( id, - NATIVE_CURRENCY.encode() + NATIVE_CURRENCY.encode().try_into().unwrap() )) ); assert_eq!( CurrencyIdConvert::convert(USD_CURRENCY), - Some(MultiLocation::sibling_parachain_general_key(id, USD_CURRENCY.encode())) + Some(MultiLocation::sibling_parachain_general_key( + id, + USD_CURRENCY.encode().try_into().unwrap() + )) ); assert_eq!( CurrencyIdConvert::convert(LIQUID_CURRENCY), Some(MultiLocation::sibling_parachain_general_key( id, - LIQUID_CURRENCY.encode() + LIQUID_CURRENCY.encode().try_into().unwrap() )) ); assert_eq!( @@ -64,18 +67,21 @@ fn currency_id_convert() { assert_eq!( CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( id, - NATIVE_CURRENCY.encode() + NATIVE_CURRENCY.encode().try_into().unwrap() )), Some(NATIVE_CURRENCY) ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, USD_CURRENCY.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + USD_CURRENCY.encode().try_into().unwrap() + )), Some(USD_CURRENCY) ); assert_eq!( CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( id, - LIQUID_CURRENCY.encode() + LIQUID_CURRENCY.encode().try_into().unwrap() )), Some(LIQUID_CURRENCY) ); @@ -89,37 +95,58 @@ fn currency_id_convert() { assert_eq!(CurrencyIdConvert::convert(TAP), None); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, RENBTC.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + RENBTC.encode().try_into().unwrap() + )), Some(RENBTC) ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, KAR.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + KAR.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, KUSD.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + KUSD.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, KSM.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + KSM.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, LKSM.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + LKSM.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, TAP.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + TAP.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id + 1, RENBTC.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id + 1, + RENBTC.encode().try_into().unwrap() + )), None ); let native_currency: MultiAsset = ( - MultiLocation::sibling_parachain_general_key(id, NATIVE_CURRENCY.encode()), + MultiLocation::sibling_parachain_general_key(id, NATIVE_CURRENCY.encode().try_into().unwrap()), 1, ) .into(); @@ -135,40 +162,58 @@ fn currency_id_convert() { assert_eq!(CurrencyIdConvert::convert(TAP), None); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, ACA.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + ACA.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, AUSD.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + AUSD.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, DOT.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + DOT.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, LDOT.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + LDOT.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, TAP.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + TAP.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, TAI.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + TAI.encode().try_into().unwrap() + )), Some(TAI) ); assert_eq!( CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( parachains::bifrost::ID, - parachains::bifrost::BNC_KEY.to_vec() + parachains::bifrost::BNC_KEY.to_vec().try_into().unwrap() )), Some(BNC) ); assert_eq!( CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( parachains::bifrost::ID, - parachains::bifrost::VSKSM_KEY.to_vec() + parachains::bifrost::VSKSM_KEY.to_vec().try_into().unwrap() )), Some(VSKSM) ); @@ -177,19 +222,19 @@ fn currency_id_convert() { CurrencyIdConvert::convert(BNC), Some(MultiLocation::sibling_parachain_general_key( parachains::bifrost::ID, - parachains::bifrost::BNC_KEY.to_vec() + parachains::bifrost::BNC_KEY.to_vec().try_into().unwrap() )) ); assert_eq!( CurrencyIdConvert::convert(VSKSM), Some(MultiLocation::sibling_parachain_general_key( parachains::bifrost::ID, - parachains::bifrost::VSKSM_KEY.to_vec() + parachains::bifrost::VSKSM_KEY.to_vec().try_into().unwrap() )) ); let native_currency: MultiAsset = ( - MultiLocation::sibling_parachain_general_key(id, NATIVE_CURRENCY.encode()), + MultiLocation::sibling_parachain_general_key(id, NATIVE_CURRENCY.encode().try_into().unwrap()), 1, ) .into(); @@ -205,36 +250,57 @@ fn currency_id_convert() { assert_eq!(CurrencyIdConvert::convert(TAI), None); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, RENBTC.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + RENBTC.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, KAR.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + KAR.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, KUSD.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + KUSD.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, KSM.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + KSM.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, LKSM.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + LKSM.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, TAI.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + TAI.encode().try_into().unwrap() + )), None ); assert_eq!( - CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key(id, TAP.encode())), + CurrencyIdConvert::convert(MultiLocation::sibling_parachain_general_key( + id, + TAP.encode().try_into().unwrap() + )), Some(TAP) ); let native_currency: MultiAsset = ( - MultiLocation::sibling_parachain_general_key(id, NATIVE_CURRENCY.encode()), + MultiLocation::sibling_parachain_general_key(id, NATIVE_CURRENCY.encode().try_into().unwrap()), 1, ) .into(); @@ -307,10 +373,10 @@ mod mandala_only_tests { assert_eq!(base_fee, 1_000_000_000); assert_eq!(len_fee, 500_000_000); - assert_eq!(adjusted_weight_fee, 0); + assert_eq!(adjusted_weight_fee, 11587754); let total_fee = base_fee.saturating_add(len_fee).saturating_add(adjusted_weight_fee); - assert_eq!(total_fee, 1_500_000_000); + assert_eq!(total_fee, 1511587754); }); } @@ -352,7 +418,7 @@ mod mandala_only_tests { bytes.len() ), Ok(ValidTransaction { - priority: 734_003, + priority: 500000, requires: vec![], provides: vec![], longevity: 18_446_744_073_709_551_615, @@ -369,7 +435,7 @@ mod mandala_only_tests { bytes.len() ), Ok(ValidTransaction { - priority: 734_003, + priority: 500000, requires: vec![], provides: vec![], longevity: 18_446_744_073_709_551_615, @@ -386,7 +452,7 @@ mod mandala_only_tests { bytes.len() ), Ok(ValidTransaction { - priority: 734_003_000_000, + priority: 500000000000, requires: vec![], provides: vec![], longevity: 18_446_744_073_709_551_615, @@ -432,7 +498,7 @@ mod mandala_only_tests { bytes.len() ), Ok(ValidTransaction { - priority: 81_156_562_730_100_000, + priority: 80816889610600000, requires: vec![], provides: vec![], longevity: 18_446_744_073_709_551_615, diff --git a/runtime/integration-tests/src/setup.rs b/runtime/integration-tests/src/setup.rs index 9c814a83d..5badcfdbd 100644 --- a/runtime/integration-tests/src/setup.rs +++ b/runtime/integration-tests/src/setup.rs @@ -35,7 +35,7 @@ pub use sp_core::H160; use sp_io::hashing::keccak_256; pub use sp_runtime::{ traits::{AccountIdConversion, BadOrigin, BlakeTwo256, Convert, Hash, Zero}, - DispatchError, DispatchResult, FixedPointNumber, MultiAddress, Perbill, Permill, + DispatchError, DispatchResult, FixedPointNumber, FixedU128, MultiAddress, Perbill, Permill, }; pub use xcm::latest::prelude::*; @@ -333,7 +333,9 @@ impl ExtBuilder { AccountId::from(ORACLE3), AccountId::from(ORACLE4), AccountId::from(ORACLE5), - ], + ] + .try_into() + .expect("convert error!"), phantom: Default::default(), } .assimilate_storage(&mut t) diff --git a/runtime/integration-tests/src/treasury.rs b/runtime/integration-tests/src/treasury.rs index b531bfd37..4990587fa 100644 --- a/runtime/integration-tests/src/treasury.rs +++ b/runtime/integration-tests/src/treasury.rs @@ -23,11 +23,11 @@ fn treasury_should_take_xcm_execution_revenue() { ExtBuilder::default().build().execute_with(|| { let dot_amount = 1000 * dollar(RELAY_CHAIN_CURRENCY); #[cfg(feature = "with-mandala-runtime")] // Mandala uses DOT, which has 10 d.p. accuracy. - let actual_amount = 9_999_999_650_350; + let actual_amount = 9999999652390; #[cfg(feature = "with-karura-runtime")] // Karura uses KSM, which has 12 d.p. accuracy. - let actual_amount = 999_999_860_140_000; + let actual_amount = 999_999_860_956_000; #[cfg(feature = "with-acala-runtime")] // Acala uses DOT, which has 10 d.p. accuracy. - let actual_amount = 9_999_998_601_400; + let actual_amount = 9999998609560; #[cfg(feature = "with-mandala-runtime")] let shallow_weight = 3_000_000; diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml index 2cf629fd2..25e9d0671 100644 --- a/runtime/karura/Cargo.toml +++ b/runtime/karura/Cargo.toml @@ -15,64 +15,64 @@ hex = { version = "0.4", default-features = false } hex-literal = { version = "0.3.1" } # substrate -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, features = ["historical"] } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, features = ["historical"] } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -129,13 +129,13 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = # benchmarking deps libsecp256k1 = { version = "0.7", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [features] default = ["std"] diff --git a/runtime/karura/src/constants.rs b/runtime/karura/src/constants.rs index 01e35992d..adba65b5a 100644 --- a/runtime/karura/src/constants.rs +++ b/runtime/karura/src/constants.rs @@ -124,6 +124,6 @@ mod tests { let q = Balance::from(ExtrinsicBaseWeight::get()); assert_eq!(p, 1_000_000_000); - assert_eq!(q, 85_795_000); + assert_eq!(q, 86_298_000); } } diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs index 0360138a0..317964676 100644 --- a/runtime/karura/src/lib.rs +++ b/runtime/karura/src/lib.rs @@ -580,6 +580,7 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = EnsureRootOrHalfGeneralCouncil; type RejectOrigin = EnsureRootOrHalfGeneralCouncil; + type SpendOrigin = frame_support::traits::NeverEnsureOrigin; type Event = Event; type OnSlash = Treasury; type ProposalBond = ProposalBond; @@ -1458,6 +1459,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type OutboundXcmpMessageSource = XcmpQueue; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; + type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; } impl parachain_info::Config for Runtime {} @@ -1672,7 +1674,7 @@ construct_runtime!( CollatorSelection: module_collator_selection = 41, Session: pallet_session = 42, Aura: pallet_aura = 43, - AuraExt: cumulus_pallet_aura_ext exclude_parts { Call } = 44, + AuraExt: cumulus_pallet_aura_ext = 44, SessionManager: module_session_manager = 45, // XCM diff --git a/runtime/karura/src/xcm_config.rs b/runtime/karura/src/xcm_config.rs index 75933cafc..7a2559718 100644 --- a/runtime/karura/src/xcm_config.rs +++ b/runtime/karura/src/xcm_config.rs @@ -37,7 +37,9 @@ use orml_xcm_support::{DepositToAlternative, IsNativeConcrete, MultiCurrencyAdap use pallet_xcm::XcmPassthrough; use polkadot_parachain::primitives::Sibling; use primitives::evm::is_system_contract; -use runtime_common::{native_currency_location, AcalaDropAssets, EnsureRootOrHalfGeneralCouncil}; +use runtime_common::{ + local_currency_location, native_currency_location, AcalaDropAssets, EnsureRootOrHalfGeneralCouncil, +}; use xcm::latest::prelude::*; pub use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, @@ -121,33 +123,21 @@ parameter_types! { pub const MaxInstructions: u32 = 100; pub KsmPerSecond: (AssetId, u128) = (MultiLocation::parent().into(), ksm_per_second()); pub KusdPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 0, - X1(GeneralKey(KUSD.encode())), - ).into(), + local_currency_location(KUSD).into(), // kUSD:KSM = 400:1 ksm_per_second() * 400 ); pub KarPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 0, - X1(GeneralKey(KAR.encode())), - ).into(), + local_currency_location(KAR).into(), kar_per_second() ); pub LksmPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 0, - X1(GeneralKey(LKSM.encode())), - ).into(), + local_currency_location(LKSM).into(), // LKSM:KSM = 10:1 ksm_per_second() * 10 ); pub TaiPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 0, - X1(GeneralKey(TAI.encode())), - ).into(), + local_currency_location(TAI).into(), // TAI:taiKSM = 4340:1 ksm_per_second() * 4340 ); @@ -160,34 +150,22 @@ parameter_types! { ksm_per_second() * 400 ); pub BncPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 1, - X2(Parachain(parachains::bifrost::ID), GeneralKey(parachains::bifrost::BNC_KEY.to_vec())), - ).into(), + native_currency_location(parachains::bifrost::ID, parachains::bifrost::BNC_KEY.to_vec()).into(), // BNC:KSM = 80:1 ksm_per_second() * 80 ); pub VsksmPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 1, - X2(Parachain(parachains::bifrost::ID), GeneralKey(parachains::bifrost::VSKSM_KEY.to_vec())), - ).into(), + native_currency_location(parachains::bifrost::ID, parachains::bifrost::VSKSM_KEY.to_vec()).into(), // VSKSM:KSM = 1:1 ksm_per_second() ); pub KbtcPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 1, - X2(Parachain(parachains::kintsugi::ID), GeneralKey(parachains::kintsugi::KBTC_KEY.to_vec())), - ).into(), + native_currency_location(parachains::kintsugi::ID, parachains::kintsugi::KBTC_KEY.to_vec()).into(), // KBTC:KSM = 1:150 & Satoshi:Planck = 1:10_000 ksm_per_second() / 1_500_000 ); pub KintPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 1, - X2(Parachain(parachains::kintsugi::ID), GeneralKey(parachains::kintsugi::KINT_KEY.to_vec())), - ).into(), + native_currency_location(parachains::kintsugi::ID, parachains::kintsugi::KINT_KEY.to_vec()).into(), // KINT:KSM = 4:3 (ksm_per_second() * 4) / 3 ); @@ -356,45 +334,33 @@ impl Convert> for CurrencyIdConvert { match id { Token(KSM) => Some(MultiLocation::parent()), Token(KAR) | Token(KUSD) | Token(LKSM) | Token(TAI) => { - Some(native_currency_location(ParachainInfo::get().into(), id)) + Some(native_currency_location(ParachainInfo::get().into(), id.encode())) } Erc20(address) if !is_system_contract(address) => { - Some(native_currency_location(ParachainInfo::get().into(), id)) + Some(native_currency_location(ParachainInfo::get().into(), id.encode())) } - StableAssetPoolToken(_pool_id) => Some(native_currency_location(ParachainInfo::get().into(), id)), + StableAssetPoolToken(_pool_id) => Some(native_currency_location(ParachainInfo::get().into(), id.encode())), // Bifrost native token - Token(BNC) => Some(MultiLocation::new( - 1, - X2( - Parachain(parachains::bifrost::ID), - GeneralKey(parachains::bifrost::BNC_KEY.to_vec()), - ), + Token(BNC) => Some(native_currency_location( + parachains::bifrost::ID, + parachains::bifrost::BNC_KEY.to_vec(), )), // Bifrost Voucher Slot KSM - Token(VSKSM) => Some(MultiLocation::new( - 1, - X2( - Parachain(parachains::bifrost::ID), - GeneralKey(parachains::bifrost::VSKSM_KEY.to_vec()), - ), + Token(VSKSM) => Some(native_currency_location( + parachains::bifrost::ID, + parachains::bifrost::VSKSM_KEY.to_vec(), )), // Phala Native token Token(PHA) => Some(MultiLocation::new(1, X1(Parachain(parachains::phala::ID)))), // Kintsugi Native token - Token(KINT) => Some(MultiLocation::new( - 1, - X2( - Parachain(parachains::kintsugi::ID), - GeneralKey(parachains::kintsugi::KINT_KEY.to_vec()), - ), + Token(KINT) => Some(native_currency_location( + parachains::kintsugi::ID, + parachains::kintsugi::KINT_KEY.to_vec(), )), // Kintsugi wrapped BTC - Token(KBTC) => Some(MultiLocation::new( - 1, - X2( - Parachain(parachains::kintsugi::ID), - GeneralKey(parachains::kintsugi::KBTC_KEY.to_vec()), - ), + Token(KBTC) => Some(native_currency_location( + parachains::kintsugi::ID, + parachains::kintsugi::KBTC_KEY.to_vec(), )), ForeignAsset(foreign_asset_id) => AssetIdMaps::::get_multi_location(foreign_asset_id), _ => None, @@ -420,7 +386,7 @@ impl Convert> for CurrencyIdConvert { parents: 1, interior: X2(Parachain(para_id), GeneralKey(key)), } => { - match (para_id, &key[..]) { + match (para_id, &key.into_inner()[..]) { (parachains::bifrost::ID, parachains::bifrost::BNC_KEY) => Some(Token(BNC)), (parachains::bifrost::ID, parachains::bifrost::VSKSM_KEY) => Some(Token(VSKSM)), (parachains::kintsugi::ID, parachains::kintsugi::KINT_KEY) => Some(Token(KINT)), @@ -453,7 +419,7 @@ impl Convert> for CurrencyIdConvert { parents: 0, interior: X1(GeneralKey(key)), } => { - let currency_id = CurrencyId::decode(&mut &*key).ok()?; + let currency_id = CurrencyId::decode(&mut &*key.into_inner()).ok()?; match currency_id { Token(KAR) | Token(KUSD) | Token(LKSM) | Token(TAI) => Some(currency_id), Erc20(address) if !is_system_contract(address) => Some(currency_id), diff --git a/runtime/mandala/Cargo.toml b/runtime/mandala/Cargo.toml index 96f94e8e6..f27e1ef72 100644 --- a/runtime/mandala/Cargo.toml +++ b/runtime/mandala/Cargo.toml @@ -16,67 +16,67 @@ scale-info = { version = "2.1", default-features = false, features = ["derive"] libsecp256k1 = { version = "0.7", default-features = false, optional = true } # substrate -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features =false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features =false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false, features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.26", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -138,15 +138,15 @@ ecosystem-compound-cash = { path = "../../ecosystem-modules/compound-cash", defa nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.26" } acala-service = { path = "../../node/service", features = ["with-mandala-runtime"] } diff --git a/runtime/mandala/src/constants.rs b/runtime/mandala/src/constants.rs index e6edfb5e5..6d90028b3 100644 --- a/runtime/mandala/src/constants.rs +++ b/runtime/mandala/src/constants.rs @@ -102,6 +102,6 @@ mod tests { let q = Balance::from(ExtrinsicBaseWeight::get()); assert_eq!(p, 1_000_000_000); - assert_eq!(q, 85_795_000); + assert_eq!(q, 86_298_000); } } diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs index 7d862f670..b3d555982 100644 --- a/runtime/mandala/src/lib.rs +++ b/runtime/mandala/src/lib.rs @@ -555,6 +555,7 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = EnsureRootOrHalfGeneralCouncil; type RejectOrigin = EnsureRootOrHalfGeneralCouncil; + type SpendOrigin = frame_support::traits::NeverEnsureOrigin; type Event = Event; type OnSlash = (); type ProposalBond = ProposalBond; @@ -1672,6 +1673,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type OutboundXcmpMessageSource = XcmpQueue; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; + type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; } impl parachain_info::Config for Runtime {} @@ -2013,7 +2015,7 @@ construct_runtime!( CollatorSelection: module_collator_selection = 191, Session: pallet_session = 192, Aura: pallet_aura = 193, - AuraExt: cumulus_pallet_aura_ext exclude_parts { Call } = 194, + AuraExt: cumulus_pallet_aura_ext = 194, SessionManager: module_session_manager = 195, // Stable asset diff --git a/runtime/mandala/src/xcm_config.rs b/runtime/mandala/src/xcm_config.rs index ab03810e3..13d28e616 100644 --- a/runtime/mandala/src/xcm_config.rs +++ b/runtime/mandala/src/xcm_config.rs @@ -35,7 +35,10 @@ use orml_xcm_support::{DepositToAlternative, IsNativeConcrete, MultiCurrencyAdap use pallet_xcm::XcmPassthrough; use polkadot_parachain::primitives::Sibling; use primitives::evm::is_system_contract; -use runtime_common::{native_currency_location, AcalaDropAssets, EnsureRootOrHalfGeneralCouncil, FixedRateOfAsset}; +use runtime_common::{ + local_currency_location, native_currency_location, AcalaDropAssets, EnsureRootOrHalfGeneralCouncil, + FixedRateOfAsset, +}; use xcm::latest::prelude::*; pub use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, @@ -119,10 +122,7 @@ parameter_types! { pub const MaxInstructions: u32 = 100; pub DotPerSecond: (AssetId, u128) = (MultiLocation::parent().into(), dot_per_second()); pub AcaPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 0, - X1(GeneralKey(ACA.encode())), - ).into(), + local_currency_location(ACA).into(), aca_per_second() ); pub BaseRate: u128 = aca_per_second(); @@ -235,12 +235,12 @@ impl Convert> for CurrencyIdConvert { match id { Token(DOT) => Some(MultiLocation::parent()), Token(ACA) | Token(AUSD) | Token(LDOT) | Token(RENBTC) | Token(TAI) => { - Some(native_currency_location(ParachainInfo::get().into(), id)) + Some(native_currency_location(ParachainInfo::get().into(), id.encode())) } Erc20(address) if !is_system_contract(address) => { - Some(native_currency_location(ParachainInfo::get().into(), id)) + Some(native_currency_location(ParachainInfo::get().into(), id.encode())) } - StableAssetPoolToken(_pool_id) => Some(native_currency_location(ParachainInfo::get().into(), id)), + StableAssetPoolToken(_pool_id) => Some(native_currency_location(ParachainInfo::get().into(), id.encode())), ForeignAsset(foreign_asset_id) => AssetIdMaps::::get_multi_location(foreign_asset_id), _ => None, } @@ -265,7 +265,8 @@ impl Convert> for CurrencyIdConvert { interior: X2(Parachain(para_id), GeneralKey(key)), } if parents == 1 && ParaId::from(para_id) == ParachainInfo::get() => { // decode the general key - if let Ok(currency_id) = CurrencyId::decode(&mut &key[..]) { + let key = &key.into_inner()[..]; + if let Ok(currency_id) = CurrencyId::decode(&mut &*key) { // check if `currency_id` is cross-chain asset match currency_id { Token(ACA) | Token(AUSD) | Token(LDOT) | Token(RENBTC) | Token(TAI) => Some(currency_id), @@ -282,7 +283,7 @@ impl Convert> for CurrencyIdConvert { parents: 0, interior: X1(GeneralKey(key)), } => { - let key = &key[..]; + let key = &key.into_inner()[..]; if let Ok(currency_id) = CurrencyId::decode(&mut &*key) { match currency_id { Token(ACA) | Token(AUSD) | Token(LDOT) | Token(RENBTC) | Token(TAI) => Some(currency_id), diff --git a/ts-tests/tests/test-balance.ts b/ts-tests/tests/test-balance.ts index a58970c84..0b8b60bc0 100644 --- a/ts-tests/tests/test-balance.ts +++ b/ts-tests/tests/test-balance.ts @@ -11,8 +11,8 @@ describeWithAcala("Acala RPC (Balance)", (context) => { }); step("genesis balance is setup correctly", async function () { - expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999985535771315000000"); - expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999985535771315000000"); + expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999985551883010000000"); + expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999985551883010000000"); expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()) .to.equal((await context.provider.api.query.system.account(await alice.getSubstrateAddress())).data.free.toString() + "000000"); @@ -21,13 +21,13 @@ describeWithAcala("Acala RPC (Balance)", (context) => { step("balance to be updated after transfer", async function () { this.timeout(15000); - expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999985535771315000000"); - expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000985535778201000000"); + expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999985551883010000000"); + expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000985551889855000000"); await transfer(context, await alice.getSubstrateAddress(), await alice_stash.getSubstrateAddress(), 1000); - expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999968467638103000000"); - expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000985535779201000000"); - expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999968467638103000000"); + expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999968418368631000000"); + expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000985551890855000000"); + expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999968418368631000000"); expect((await context.provider.getBalance(alice_stash.getAddress(), "earliest")).toString()).to.equal("0"); }); -}); +}); \ No newline at end of file diff --git a/ts-tests/tests/test-bodhi.ts b/ts-tests/tests/test-bodhi.ts index 456a9784b..61f4d97e8 100644 --- a/ts-tests/tests/test-bodhi.ts +++ b/ts-tests/tests/test-bodhi.ts @@ -92,6 +92,6 @@ describeWithAcala("Acala RPC (bodhi.js)", (context) => { expect(data.gas.toNumber()).to.be.eq(22409); expect(data.storage.toNumber()).to.be.eq(0); - expect(data.weightFee.toNumber()).to.be.eq(5827773367233); + expect(data.weightFee.toNumber()).to.be.eq(5793805372768); }); -}); +}); \ No newline at end of file diff --git a/ts-tests/tests/test-gas-limit.ts b/ts-tests/tests/test-gas-limit.ts index f0f22f441..5ac114f81 100644 --- a/ts-tests/tests/test-gas-limit.ts +++ b/ts-tests/tests/test-gas-limit.ts @@ -18,10 +18,10 @@ describeWithAcala("Acala RPC (GasLimit)", (context) => { const contract = await deployContract(alice as any, Factory); // limited by used_storage const result = await contract.createContractLoop(360); - expect(result.gasLimit.toNumber()).to.be.eq(30725309); + expect(result.gasLimit.toNumber()).to.be.eq(30725263); const result2 = await contract.incrementLoop(9_500); - expect(result2.gasLimit.toNumber()).to.be.eq(32803507); + expect(result2.gasLimit.toNumber()).to.be.eq(32803452); const storages = await context.provider.api.query.evm.accountStorages.entries(contract.address); // 360 array items diff --git a/ts-tests/tests/test-gas.ts b/ts-tests/tests/test-gas.ts index 88ad3ac78..c400ed61d 100644 --- a/ts-tests/tests/test-gas.ts +++ b/ts-tests/tests/test-gas.ts @@ -29,7 +29,7 @@ describeWithAcala("Acala RPC (Gas)", (context) => { expect(data.gas.toNumber()).to.be.eq(273373); expect(data.storage.toNumber()).to.be.eq(10921); - expect(data.weightFee.toNumber()).to.be.eq(5827787382433); + expect(data.weightFee.toNumber()).to.be.eq(5793819306195); }); it("eth_estimateGas for contract call", async function () { @@ -47,6 +47,6 @@ describeWithAcala("Acala RPC (Gas)", (context) => { expect(data.gas.toNumber()).to.be.eq(22409); expect(data.storage.toNumber()).to.be.eq(0); - expect(data.weightFee.toNumber()).to.be.eq(5827759352067); + expect(data.weightFee.toNumber()).to.be.eq(5793791439374); }); -}); +}); \ No newline at end of file diff --git a/ts-tests/tests/util.ts b/ts-tests/tests/util.ts index 99d4a6439..76b37d3b1 100644 --- a/ts-tests/tests/util.ts +++ b/ts-tests/tests/util.ts @@ -68,7 +68,7 @@ export async function startAcalaNode(): Promise<{ provider: TestProvider; binary console.log(chunk.toString()); } binaryLogs.push(chunk); - if (chunk.toString().match(/Running JSON-RPC HTTP server/)) { + if (chunk.toString().match(/best: #0/)) { try { provider = new TestProvider({ provider: new WsProvider(`ws://localhost:${WS_PORT}`),