From 661a0e36ecdb29453097c83862df8c8c41581111 Mon Sep 17 00:00:00 2001 From: wangjj9219 <183318287@qq.com> Date: Sat, 21 Oct 2023 14:02:44 +0800 Subject: [PATCH] Upgrade polkadot-v1.1.0 (#2631) * Upgrade polkadot-v1.1.0 * update dependencies * fix ts-test --- Cargo.lock | 2381 +++++++++++------ Cargo.toml | 466 ++-- ecosystem-modules/stable-asset | 2 +- evm-tests | 2 +- inspect/Cargo.toml | 12 +- inspect/src/lib.rs | 6 +- modules/aggregated-dex/Cargo.toml | 16 +- modules/asset-registry/Cargo.toml | 18 +- modules/asset-registry/src/migrations.rs | 4 +- modules/auction-manager/Cargo.toml | 15 +- modules/auction-manager/src/lib.rs | 2 +- modules/cdp-engine/Cargo.toml | 19 +- modules/cdp-engine/src/lib.rs | 2 +- modules/cdp-treasury/Cargo.toml | 15 +- modules/cdp-treasury/src/lib.rs | 2 +- modules/collator-selection/Cargo.toml | 32 +- modules/currencies/Cargo.toml | 18 +- modules/dex-oracle/Cargo.toml | 18 +- modules/dex/Cargo.toml | 17 +- modules/dex/src/lib.rs | 2 +- modules/earning/Cargo.toml | 14 +- modules/emergency-shutdown/Cargo.toml | 14 +- modules/evm-accounts/Cargo.toml | 14 +- modules/evm-bridge/Cargo.toml | 16 +- modules/evm-bridge/src/lib.rs | 7 +- modules/evm-utility/Cargo.toml | 2 +- modules/evm/Cargo.toml | 25 +- modules/evm/rpc/runtime_api/Cargo.toml | 8 +- modules/evm/src/lib.rs | 12 +- modules/evm/src/runner/mod.rs | 2 +- modules/evm/src/runner/stack.rs | 8 +- modules/evm/src/runner/state.rs | 1 - modules/evm/src/runner/storage_meter.rs | 2 - modules/evm/src/tests.rs | 4 +- modules/homa-validator-list/Cargo.toml | 14 +- modules/homa/Cargo.toml | 21 +- modules/homa/src/lib.rs | 2 +- modules/homa/src/migrations/v1.rs | 1 - modules/honzon-bridge/Cargo.toml | 16 +- modules/honzon/Cargo.toml | 18 +- modules/idle-scheduler/Cargo.toml | 13 +- modules/idle-scheduler/src/lib.rs | 2 +- modules/incentives/Cargo.toml | 15 +- modules/incentives/src/lib.rs | 2 +- modules/liquid-crowdloan/Cargo.toml | 14 +- modules/loans/Cargo.toml | 15 +- modules/loans/src/lib.rs | 2 +- modules/nft/Cargo.toml | 20 +- modules/nft/src/benchmarking.rs | 4 +- modules/nft/src/mock.rs | 3 +- modules/nominees-election/Cargo.toml | 15 +- modules/nominees-election/src/lib.rs | 1 - modules/prices/Cargo.toml | 12 +- modules/relaychain/Cargo.toml | 16 +- modules/relaychain/src/lib.rs | 4 +- modules/session-manager/Cargo.toml | 14 +- modules/support/Cargo.toml | 14 +- modules/support/src/relaychain.rs | 6 +- modules/transaction-pause/Cargo.toml | 15 +- modules/transaction-pause/src/lib.rs | 3 +- modules/transaction-pause/src/migrations.rs | 2 +- modules/transaction-payment/Cargo.toml | 20 +- modules/transaction-payment/src/lib.rs | 7 +- modules/xcm-interface/Cargo.toml | 27 +- modules/xcm-interface/src/lib.rs | 2 +- node/cli/Cargo.toml | 38 +- node/e2e-tests/test-service/Cargo.toml | 112 +- node/e2e-tests/test-service/src/builder.rs | 2 +- node/e2e-tests/test-service/src/lib.rs | 17 +- node/e2e-tests/test-service/src/node.rs | 3 +- node/e2e-tests/test-service/src/service.rs | 13 +- .../e2e-tests/test-service/tests/parachain.rs | 4 +- .../test-service/tests/standalone.rs | 10 +- node/service/Cargo.toml | 114 +- node/service/src/client.rs | 15 +- node/service/src/instant_finalize.rs | 3 +- node/service/src/lib.rs | 34 +- orml | 2 +- primitives/Cargo.toml | 13 +- primitives/src/bonding/controller.rs | 8 +- primitives/src/bonding/error.rs | 2 +- primitives/src/bonding/ledger.rs | 3 +- primitives/src/nft.rs | 2 +- primitives/src/unchecked_extrinsic.rs | 1 - rpc/Cargo.toml | 22 +- runtime/acala/Cargo.toml | 118 +- runtime/acala/src/lib.rs | 9 +- runtime/common/Cargo.toml | 46 +- runtime/common/src/lib.rs | 10 +- runtime/common/src/mock.rs | 8 +- runtime/common/src/precompile/dex.rs | 2 +- runtime/common/src/precompile/evm.rs | 2 +- runtime/common/src/precompile/homa.rs | 2 +- runtime/common/src/precompile/honzon.rs | 2 +- .../common/src/precompile/liquid_crowdloan.rs | 1 - runtime/common/src/precompile/mock.rs | 4 +- runtime/common/src/precompile/mod.rs | 1 - .../common/src/precompile/multicurrency.rs | 5 +- runtime/common/src/precompile/nft.rs | 5 +- runtime/common/src/precompile/oracle.rs | 1 - runtime/common/src/precompile/schedule.rs | 5 +- runtime/common/src/precompile/xtokens.rs | 5 +- runtime/common/src/xcm_impl.rs | 21 +- runtime/integration-tests/Cargo.toml | 114 +- runtime/integration-tests/src/payment.rs | 5 +- runtime/karura/Cargo.toml | 118 +- runtime/karura/src/lib.rs | 9 +- runtime/mandala/Cargo.toml | 131 +- runtime/mandala/src/benchmarking/evm.rs | 2 +- runtime/mandala/src/lib.rs | 27 +- ts-tests/tests/test-balance.ts | 4 +- 111 files changed, 2721 insertions(+), 1852 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6cc6aa00ad..e99203bc92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,7 +27,7 @@ version = "2.22.0" dependencies = [ "acala-inspect", "acala-service", - "clap 4.4.1", + "clap 4.4.6", "cumulus-client-cli", "cumulus-client-service", "cumulus-primitives-core", @@ -36,7 +36,7 @@ dependencies = [ "orml-build-script-utils", "parity-scale-codec", "polkadot-cli", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-service", "sc-cli", @@ -55,7 +55,7 @@ dependencies = [ name = "acala-inspect" version = "2.22.0" dependencies = [ - "clap 4.4.1", + "clap 4.4.6", "derive_more", "log", "parity-scale-codec", @@ -74,7 +74,8 @@ dependencies = [ "bstringify", "enumflags2", "frame-support", - "hex-literal 0.4.1", + "hex-literal", + "log", "module-evm-utility", "module-evm-utility-macro", "num_enum", @@ -134,8 +135,9 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex", - "hex-literal 0.4.1", + "hex-literal", "libsecp256k1", + "log", "module-aggregated-dex", "module-asset-registry", "module-auction-manager", @@ -207,7 +209,7 @@ dependencies = [ "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime", "runtime-common", "scale-info", @@ -227,10 +229,10 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -261,7 +263,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.28", "hex", - "hex-literal 0.4.1", + "hex-literal", "jsonrpsee", "k256 0.11.6", "karura-runtime", @@ -482,6 +484,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "always-assert" version = "0.1.3" @@ -514,9 +522,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -552,9 +560,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -575,12 +583,211 @@ dependencies = [ "num-traits", ] +[[package]] +name = "aquamarine" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "arc-swap" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +[[package]] +name = "ark-bls12-381" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools 0.10.5", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ed-on-bls12-381-bandersnatch" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint", + "num-traits", + "paste", + "rustc_version", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-scale" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "parity-scale-codec", +] + +[[package]] +name = "ark-scale" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bd73bb6ddb72630987d37fa963e99196896c0d0ea81b7c894567e74a2f83af" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "parity-scale-codec", + "scale-info", +] + +[[package]] +name = "ark-secret-scalar" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "ark-transcript", + "digest 0.10.7", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "ark-transcript" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "digest 0.10.7", + "rand_core 0.6.4", + "sha3", +] + [[package]] name = "array-bytes" version = "6.1.0" @@ -593,6 +800,15 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +[[package]] +name = "arrayvec" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" +dependencies = [ + "nodrop", +] + [[package]] name = "arrayvec" version = "0.5.2" @@ -685,10 +901,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] +[[package]] +name = "async-executor" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.0", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + [[package]] name = "async-io" version = "1.13.0" @@ -715,7 +957,35 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-net" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" +dependencies = [ + "async-io", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io", + "async-lock", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.18", + "windows-sys 0.48.0", ] [[package]] @@ -726,9 +996,33 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.18", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" + [[package]] name = "async-trait" version = "0.1.73" @@ -737,7 +1031,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -753,6 +1047,12 @@ dependencies = [ "pin-project-lite 0.2.13", ] +[[package]] +name = "atomic-take" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3" + [[package]] name = "atomic-waker" version = "1.1.1" @@ -803,6 +1103,28 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "bandersnatch_vrfs" +version = "0.0.1" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-scale 0.0.11", + "ark-serialize", + "ark-std", + "dleq_vrf", + "fflonk", + "merlin 3.0.0", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "ring 0.1.0", + "sha2 0.10.7", + "zeroize", +] + [[package]] name = "base-x" version = "0.2.11" @@ -879,7 +1201,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "hash-db 0.16.0", "log", @@ -912,9 +1234,24 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.29", + "syn 2.0.32", +] + +[[package]] +name = "bip39" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" +dependencies = [ + "bitcoin_hashes", ] +[[package]] +name = "bitcoin_hashes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" + [[package]] name = "bitflags" version = "1.3.2" @@ -958,6 +1295,16 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "blake2-rfc" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" +dependencies = [ + "arrayvec 0.4.12", + "constant_time_eq 0.1.5", +] + [[package]] name = "blake2b_simd" version = "1.0.1" @@ -1049,6 +1396,22 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +[[package]] +name = "blocking" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "fastrand 2.0.0", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + [[package]] name = "bounded-collections" version = "0.1.8" @@ -1076,6 +1439,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +[[package]] +name = "bs58" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "tinyvec", +] + [[package]] name = "bstr" version = "1.6.2" @@ -1263,6 +1635,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + [[package]] name = "chacha20poly1305" version = "0.9.1" @@ -1270,9 +1653,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead 0.4.3", - "chacha20", + "chacha20 0.8.2", "cipher 0.3.0", - "poly1305", + "poly1305 0.7.2", "zeroize", ] @@ -1365,20 +1748,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.1" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.1" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -1388,14 +1770,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -1433,7 +1815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "634c509653de24b439672164bbf56f5f582a2ab0e313d3b0f6af0b7345cf2560" dependencies = [ "bincode", - "bs58", + "bs58 0.4.0", "coins-core", "digest 0.10.7", "getrandom 0.2.10", @@ -1500,6 +1882,20 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "common" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "fflonk", + "merlin 3.0.0", +] + [[package]] name = "common-path" version = "1.0.0" @@ -1556,6 +1952,12 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + [[package]] name = "constant_time_eq" version = "0.2.6" @@ -1943,9 +2345,9 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ - "clap 4.4.1", + "clap 4.4.6", "parity-scale-codec", "sc-chain-spec", "sc-cli", @@ -1959,7 +2361,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1982,7 +2384,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "cumulus-client-collator", @@ -1993,9 +2395,9 @@ dependencies = [ "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-interface", "futures 0.3.28", - "lru 0.10.1", "parity-scale-codec", "polkadot-node-primitives", + "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", "sc-client-api", @@ -2004,6 +2406,7 @@ dependencies = [ "sc-consensus-babe", "sc-consensus-slots", "sc-telemetry", + "schnellru", "sp-api", "sp-application-crypto", "sp-block-builder", @@ -2023,7 +2426,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -2052,7 +2455,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-proposer" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "anyhow", "async-trait", @@ -2067,7 +2470,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -2090,7 +2493,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -2099,7 +2502,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "sc-client-api", "sp-blockchain", @@ -2113,7 +2516,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2137,7 +2540,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -2172,11 +2575,13 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ + "cumulus-pallet-parachain-system", "frame-support", "frame-system", "pallet-aura", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-application-crypto", @@ -2188,7 +2593,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2199,13 +2604,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -2217,7 +2622,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "scale-info", "sp-core", "sp-externalities", @@ -2228,24 +2633,25 @@ dependencies = [ "sp-std", "sp-trie", "sp-version", - "xcm", + "staging-xcm", + "trie-db", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2255,13 +2661,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -2275,14 +2681,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] name = "cumulus-primitives-aura" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -2296,24 +2702,24 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "scale-info", "sp-api", "sp-runtime", "sp-std", "sp-trie", - "xcm", + "staging-xcm", ] [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2336,7 +2742,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cumulus-primitives-core", "futures 0.3.28", @@ -2349,7 +2755,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2359,15 +2765,15 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2391,7 +2797,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2409,7 +2815,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "async-trait", @@ -2417,7 +2823,6 @@ dependencies = [ "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures 0.3.28", - "lru 0.9.0", "polkadot-availability-recovery", "polkadot-collator-protocol", "polkadot-core-primitives", @@ -2429,47 +2834,53 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-authority-discovery", - "sc-client-api", "sc-network", "sc-network-common", "sc-service", "sc-tracing", "sc-utils", + "schnellru", "sp-api", - "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-runtime", - "tokio", "tracing", ] [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", + "either", "futures 0.3.28", "futures-timer", "jsonrpsee", - "lru 0.9.0", "parity-scale-codec", + "pin-project", "polkadot-overseer", + "rand 0.8.5", "sc-client-api", "sc-rpc-api", "sc-service", + "schnellru", "serde", "serde_json", + "smoldot", + "smoldot-light", "sp-api", "sp-authority-discovery", "sp-consensus-babe", "sp-core", + "sp-runtime", "sp-state-machine", "sp-storage", + "thiserror", "tokio", + "tokio-util", "tracing", "url", ] @@ -2477,7 +2888,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2485,12 +2896,13 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-std", + "sp-trie", ] [[package]] name = "cumulus-test-relay-validation-worker-provider" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "polkadot-node-core-pvf", "toml 0.7.6", @@ -2547,7 +2959,20 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", +] + +[[package]] +name = "curve25519-dalek-ng" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.4", + "subtle-ng", + "zeroize", ] [[package]] @@ -2574,7 +2999,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -2591,7 +3016,7 @@ checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -2861,32 +3286,50 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", +] + +[[package]] +name = "dleq_vrf" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-scale 0.0.10", + "ark-secret-scalar", + "ark-serialize", + "ark-std", + "ark-transcript", + "arrayvec 0.7.4", + "rand_core 0.6.4", + "zeroize", ] [[package]] name = "docify" -version = "0.1.16" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1b04e6ef3d21119d3eb7b032bca17f99fe041e9c072f30f32cc0e1a2b1f3c4" +checksum = "76ee528c501ddd15d5181997e9518e59024844eac44fd1e40cb20ddb2a8562fa" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.1.16" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5610df7f2acf89a1bb5d1a66ae56b1c7fcdcfe3948856fb3ace3f644d70eb7" +checksum = "0ca01728ab2679c464242eca99f94e2ce0514b52ac9ad950e2ed03fca991231c" dependencies = [ "common-path", "derive-syn-parse", - "lazy_static", + "once_cell", "proc-macro2", "quote", "regex", - "syn 2.0.29", + "syn 2.0.32", "termcolor", + "toml 0.7.6", "walkdir", ] @@ -2896,6 +3339,12 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + [[package]] name = "dtoa" version = "1.0.9" @@ -2962,15 +3411,6 @@ dependencies = [ "spki 0.7.2", ] -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature 1.6.4", -] - [[package]] name = "ed25519" version = "2.2.2" @@ -2981,18 +3421,6 @@ dependencies = [ "signature 2.1.0", ] -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "sha2 0.9.9", - "zeroize", -] - [[package]] name = "ed25519-dalek" version = "2.0.0" @@ -3000,7 +3428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ "curve25519-dalek 4.0.0", - "ed25519 2.2.2", + "ed25519", "rand_core 0.6.4", "serde", "sha2 0.10.7", @@ -3021,6 +3449,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ed25519-zebra" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" +dependencies = [ + "curve25519-dalek 4.0.0", + "ed25519", + "hashbrown 0.14.0", + "hex", + "rand_core 0.6.4", + "sha2 0.10.7", + "zeroize", +] + [[package]] name = "either" version = "1.9.0" @@ -3104,18 +3547,18 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "enumn" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b893c4eb2dc092c811165f84dc7447fae16fb66521717968c34c509b39b1a5c5" +checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3257,6 +3700,17 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite 0.2.13", +] + [[package]] name = "evm" version = "0.36.0" @@ -3390,7 +3844,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3474,6 +3928,19 @@ dependencies = [ "subtle", ] +[[package]] +name = "fflonk" +version = "0.1.0" +source = "git+https://github.com/w3f/fflonk#26a5045b24e169cffc1f9328ca83d71061145c40" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "merlin 3.0.0", +] + [[package]] name = "fiat-crypto" version = "0.1.20" @@ -3565,7 +4032,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", ] @@ -3588,7 +4055,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "frame-support-procedural", @@ -3613,12 +4080,12 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "Inflector", "array-bytes", "chrono", - "clap 4.4.1", + "clap 4.4.6", "comfy-table", "frame-benchmarking", "frame-support", @@ -3661,18 +4128,18 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3689,11 +4156,12 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "frame-system", "frame-try-runtime", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -3718,7 +4186,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-recursion", "futures 0.3.28", @@ -3730,6 +4198,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-state-machine", "spinners", "substrate-rpc-client", "tokio", @@ -3739,9 +4208,11 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ + "aquamarine", "bitflags 1.3.2", + "docify", "environmental", "frame-metadata", "frame-support-procedural", @@ -3753,27 +4224,31 @@ dependencies = [ "paste", "scale-info", "serde", + "serde_json", "smallvec", "sp-api", "sp-arithmetic", "sp-core", "sp-core-hashing-proc-macro", "sp-debug-derive", + "sp-genesis-builder", "sp-inherents", "sp-io", + "sp-metadata-ir", "sp-runtime", "sp-staking", "sp-state-machine", "sp-std", "sp-tracing", "sp-weights", + "static_assertions", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "Inflector", "cfg-expr", @@ -3785,35 +4260,35 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cfg-if", "frame-support", @@ -3832,7 +4307,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -3847,7 +4322,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "sp-api", @@ -3856,7 +4331,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "parity-scale-codec", @@ -3887,7 +4362,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.10", + "rustix 0.38.18", "windows-sys 0.48.0", ] @@ -3975,7 +4450,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -4250,6 +4725,11 @@ name = "hashbrown" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", + "serde", +] [[package]] name = "heck" @@ -4278,12 +4758,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hex-literal" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" - [[package]] name = "hex-literal" version = "0.4.1" @@ -4554,6 +5028,25 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -4575,6 +5068,12 @@ dependencies = [ "hashbrown 0.14.0", ] +[[package]] +name = "indexmap-nostd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" + [[package]] name = "indicatif" version = "0.17.6" @@ -4695,10 +5194,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.10", + "rustix 0.38.18", "windows-sys 0.48.0", ] +[[package]] +name = "is_executable" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" +dependencies = [ + "winapi", +] + [[package]] name = "itertools" version = "0.10.5" @@ -4931,8 +5439,9 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex", - "hex-literal 0.4.1", + "hex-literal", "libsecp256k1", + "log", "module-aggregated-dex", "module-asset-registry", "module-auction-manager", @@ -5004,7 +5513,7 @@ dependencies = [ "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime", "runtime-common", "scale-info", @@ -5024,10 +5533,10 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -5039,110 +5548,10 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "kusama-runtime" -version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" -dependencies = [ - "bitvec 1.0.1", - "frame-benchmarking", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal 0.4.1", - "kusama-runtime-constants", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-bounties", - "pallet-child-bounties", - "pallet-collective", - "pallet-conviction-voting", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking", - "pallet-elections-phragmen", - "pallet-fast-unstake", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-message-queue", - "pallet-multisig", - "pallet-nis", - "pallet-nomination-pools", - "pallet-nomination-pools-benchmarking", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "pallet-offences-benchmarking", - "pallet-preimage", - "pallet-proxy", - "pallet-ranked-collective", - "pallet-recovery", - "pallet-referenda", - "pallet-scheduler", - "pallet-session", - "pallet-session-benchmarking", - "pallet-society", - "pallet-staking", - "pallet-staking-runtime-api", - "pallet-state-trie-migration", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-whitelist", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-arithmetic", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", - "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-version", - "static_assertions", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", -] - [[package]] name = "kusama-runtime-constants" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "polkadot-primitives", @@ -5203,7 +5612,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin", + "spin 0.5.2", ] [[package]] @@ -5214,9 +5623,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -5228,6 +5637,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "libp2p" version = "0.51.3" @@ -5356,8 +5771,8 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ - "bs58", - "ed25519-dalek 2.0.0", + "bs58 0.4.0", + "ed25519-dalek", "log", "multiaddr", "multihash", @@ -5568,7 +5983,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "rcgen 0.10.0", - "ring", + "ring 0.16.20", "rustls 0.20.9", "thiserror", "webpki 0.22.1", @@ -5774,9 +6189,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -5792,16 +6207,7 @@ dependencies = [ name = "log" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "lru" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" -dependencies = [ - "hashbrown 0.13.2", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" @@ -5812,6 +6218,12 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" + [[package]] name = "lru-cache" version = "0.1.2" @@ -5859,7 +6271,7 @@ dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -5873,7 +6285,7 @@ dependencies = [ "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -5884,7 +6296,7 @@ checksum = "c12469fc165526520dff2807c2975310ab47cf7190a45b99b49a7dc8befab17b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -5895,7 +6307,7 @@ checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -5921,8 +6333,9 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex", - "hex-literal 0.4.1", + "hex-literal", "libsecp256k1", + "log", "module-aggregated-dex", "module-asset-registry", "module-auction-manager", @@ -5975,6 +6388,7 @@ dependencies = [ "orml-xtokens", "pallet-aura", "pallet-authorship", + "pallet-bags-list", "pallet-balances", "pallet-bounties", "pallet-collective", @@ -5999,7 +6413,7 @@ dependencies = [ "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "runtime-common", "scale-info", "serde_json", @@ -6020,10 +6434,10 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -6144,6 +6558,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.6.4", + "zeroize", +] + [[package]] name = "mick-jaeger" version = "0.1.8" @@ -6184,7 +6610,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "log", @@ -6203,7 +6629,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "anyhow", "jsonrpsee", @@ -6285,7 +6711,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] @@ -6295,6 +6721,7 @@ dependencies = [ "acala-primitives", "frame-support", "frame-system", + "log", "module-cdp-treasury", "module-dex", "module-support", @@ -6318,6 +6745,7 @@ dependencies = [ "acala-primitives", "frame-support", "frame-system", + "log", "module-cdp-treasury", "module-dex", "module-evm-accounts", @@ -6347,6 +6775,7 @@ dependencies = [ "acala-primitives", "frame-support", "frame-system", + "log", "module-dex", "module-support", "nutsfinance-stable-asset", @@ -6396,7 +6825,7 @@ dependencies = [ "frame-support", "frame-system", "hex", - "hex-literal 0.4.1", + "hex-literal", "module-evm", "module-evm-bridge", "module-support", @@ -6420,6 +6849,7 @@ dependencies = [ "acala-primitives", "frame-support", "frame-system", + "log", "module-support", "orml-tokens", "orml-traits", @@ -6502,7 +6932,8 @@ dependencies = [ "frame-support", "frame-system", "hex", - "hex-literal 0.4.1", + "hex-literal", + "log", "module-dex", "module-evm-utility", "module-idle-scheduler", @@ -6526,10 +6957,10 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "staging-xcm-builder", "substrate-bn", "tiny-keccak", "wasm-bencher", - "xcm-builder", ] [[package]] @@ -6620,6 +7051,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "module-currencies", "module-support", "orml-tokens", @@ -6632,7 +7064,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] @@ -6714,6 +7146,7 @@ dependencies = [ "acala-primitives", "frame-support", "frame-system", + "log", "module-support", "parity-scale-codec", "scale-info", @@ -6730,6 +7163,7 @@ dependencies = [ "acala-primitives", "frame-support", "frame-system", + "log", "module-support", "orml-rewards", "orml-tokens", @@ -6770,6 +7204,7 @@ dependencies = [ "acala-primitives", "frame-support", "frame-system", + "log", "module-cdp-treasury", "module-support", "orml-currencies", @@ -6816,6 +7251,7 @@ dependencies = [ "acala-primitives", "frame-support", "frame-system", + "log", "module-support", "orml-currencies", "orml-tokens", @@ -6861,7 +7297,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] @@ -6898,7 +7334,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] @@ -6908,7 +7344,8 @@ dependencies = [ "acala-primitives", "frame-support", "frame-system", - "hex-literal 0.4.1", + "hex-literal", + "log", "module-support", "orml-tokens", "orml-traits", @@ -6945,7 +7382,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] @@ -6958,6 +7395,7 @@ dependencies = [ "frame-support", "frame-system", "insta", + "log", "module-currencies", "module-relaychain", "module-support", @@ -6971,9 +7409,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -7177,6 +7615,18 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "no-std-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + [[package]] name = "nohash-hasher" version = "0.2.0" @@ -7458,6 +7908,7 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", + "log", "orml-tokens", "orml-traits", "orml-xcm", @@ -7468,7 +7919,7 @@ dependencies = [ "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "scale-info", "serde", @@ -7476,9 +7927,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-simulator", ] @@ -7523,7 +7974,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "hex-literal 0.4.1", + "hex-literal", "log", "parity-scale-codec", "paste", @@ -7676,6 +8127,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "frame-system", + "log", "orml-traits", "pallet-elections-phragmen", "pallet-treasury", @@ -7716,7 +8168,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] @@ -7725,7 +8177,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "frame-system", - "hex-literal 0.4.1", + "hex-literal", "orml-xcm-support", "parity-scale-codec", "scale-info", @@ -7734,7 +8186,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] @@ -7779,8 +8231,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] @@ -7792,8 +8244,8 @@ dependencies = [ "parity-scale-codec", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] @@ -7806,6 +8258,7 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", + "log", "orml-tokens", "orml-traits", "orml-xcm", @@ -7815,7 +8268,7 @@ dependencies = [ "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "scale-info", "serde", @@ -7823,9 +8276,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-simulator", ] @@ -7854,10 +8307,11 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "frame-system", + "log", "pallet-timestamp", "parity-scale-codec", "scale-info", @@ -7870,7 +8324,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "frame-system", @@ -7886,7 +8340,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "frame-system", @@ -7900,7 +8354,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -7924,8 +8378,10 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ + "aquamarine", + "docify", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7944,7 +8400,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -7959,10 +8415,11 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "parity-scale-codec", @@ -7978,7 +8435,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -7996,13 +8453,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-state-machine", "sp-std", ] [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8020,7 +8478,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8039,7 +8497,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8056,7 +8514,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "assert_matches", "frame-benchmarking", @@ -8073,7 +8531,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8091,7 +8549,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8114,7 +8572,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8122,12 +8580,13 @@ dependencies = [ "parity-scale-codec", "sp-npos-elections", "sp-runtime", + "sp-std", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8146,7 +8605,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "docify", "frame-benchmarking", @@ -8165,7 +8624,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8188,7 +8647,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "enumflags2", "frame-benchmarking", @@ -8204,7 +8663,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8224,7 +8683,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8241,7 +8700,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8258,7 +8717,7 @@ dependencies = [ [[package]] name = "pallet-message-queue" version = "7.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8277,11 +8736,12 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -8294,7 +8754,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8310,7 +8770,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8326,11 +8786,12 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", @@ -8338,12 +8799,13 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-std", + "sp-tracing", ] [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8363,7 +8825,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -8374,7 +8836,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "frame-system", @@ -8391,7 +8853,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8415,7 +8877,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8432,7 +8894,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8447,7 +8909,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8465,7 +8927,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8480,7 +8942,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "assert_matches", "frame-benchmarking", @@ -8499,7 +8961,7 @@ dependencies = [ [[package]] name = "pallet-root-testing" version = "1.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "frame-system", @@ -8514,8 +8976,9 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -8531,7 +8994,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "frame-system", @@ -8545,6 +9008,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", + "sp-state-machine", "sp-std", "sp-trie", ] @@ -8552,13 +9016,14 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "pallet-session", "pallet-staking", + "parity-scale-codec", "rand 0.8.5", "sp-runtime", "sp-session", @@ -8568,12 +9033,11 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "hex-literal 0.3.4", "log", "parity-scale-codec", "rand_chacha 0.2.2", @@ -8587,7 +9051,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8610,18 +9074,18 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "log", "sp-arithmetic", @@ -8630,7 +9094,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "sp-api", @@ -8639,7 +9103,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8656,7 +9120,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8671,7 +9135,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8683,13 +9147,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-storage", "sp-timestamp", ] [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8708,7 +9173,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "frame-system", @@ -8724,7 +9189,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -8740,7 +9205,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -8752,7 +9217,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8769,7 +9234,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8785,7 +9250,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8800,7 +9265,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8815,7 +9280,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bounded-collections", "frame-benchmarking", @@ -8829,14 +9294,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] name = "pallet-xcm-benchmarks" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -8847,15 +9312,15 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0d17cf6bef320f156f2859d6d2b0abd4154ae1d5#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -9038,6 +9503,15 @@ dependencies = [ "sha2 0.10.7", ] +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "peeking_take_while" version = "0.1.2" @@ -9099,7 +9573,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -9140,7 +9614,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -9161,6 +9635,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.0", + "futures-io", +] + [[package]] name = "pkcs8" version = "0.9.0" @@ -9224,7 +9709,7 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "futures-timer", @@ -9242,8 +9727,9 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ + "always-assert", "futures 0.3.28", "futures-timer", "polkadot-node-network-protocol", @@ -9257,12 +9743,11 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "derive_more", "fatality", "futures 0.3.28", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -9271,6 +9756,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", + "schnellru", "sp-core", "sp-keystore", "thiserror", @@ -9280,11 +9766,10 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "fatality", "futures 0.3.28", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -9294,21 +9779,20 @@ dependencies = [ "polkadot-primitives", "rand 0.8.5", "sc-network", + "schnellru", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-cli" -version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +version = "1.1.0" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ - "clap 4.4.1", + "clap 4.4.6", "frame-benchmarking-cli", "futures 0.3.28", "log", - "polkadot-node-core-pvf-execute-worker", - "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-performance-test", "polkadot-service", @@ -9330,9 +9814,8 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ - "always-assert", "bitvec 1.0.1", "fatality", "futures 0.3.28", @@ -9346,13 +9829,14 @@ dependencies = [ "sp-keystore", "sp-runtime", "thiserror", + "tokio-util", "tracing-gum", ] [[package]] name = "polkadot-core-primitives" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "scale-info", @@ -9364,14 +9848,13 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "derive_more", "fatality", "futures 0.3.28", "futures-timer", "indexmap 1.9.3", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -9380,6 +9863,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-network", + "schnellru", "sp-application-crypto", "sp-keystore", "thiserror", @@ -9389,7 +9873,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -9403,7 +9887,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "futures-timer", @@ -9414,6 +9898,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", + "sc-network-common", "sp-application-crypto", "sp-core", "sp-keystore", @@ -9423,7 +9908,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "always-assert", "async-trait", @@ -9446,7 +9931,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "parity-scale-codec", @@ -9464,15 +9949,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bitvec 1.0.1", "derive_more", "futures 0.3.28", "futures-timer", "kvdb", - "lru 0.9.0", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", @@ -9481,7 +9965,8 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-keystore", - "schnorrkel", + "schnellru", + "schnorrkel 0.9.1", "sp-application-crypto", "sp-consensus", "sp-consensus-slots", @@ -9493,7 +9978,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bitvec 1.0.1", "futures 0.3.28", @@ -9515,7 +10000,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bitvec 1.0.1", "fatality", @@ -9534,7 +10019,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "polkadot-node-subsystem", @@ -9549,7 +10034,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "futures 0.3.28", @@ -9560,7 +10045,8 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-parachain", + "polkadot-overseer", + "polkadot-parachain-primitives", "polkadot-primitives", "sp-maybe-compressed-blob", "tracing-gum", @@ -9569,7 +10055,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "polkadot-node-metrics", @@ -9584,7 +10070,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "futures-timer", @@ -9601,18 +10087,18 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "fatality", "futures 0.3.28", "kvdb", - "lru 0.9.0", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sc-keystore", + "schnellru", "thiserror", "tracing-gum", ] @@ -9620,7 +10106,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "futures 0.3.28", @@ -9634,10 +10120,27 @@ dependencies = [ "tracing-gum", ] +[[package]] +name = "polkadot-node-core-prospective-parachains" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +dependencies = [ + "bitvec 1.0.1", + "fatality", + "futures 0.3.28", + "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", + "thiserror", + "tracing-gum", +] + [[package]] name = "polkadot-node-core-provisioner" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bitvec 1.0.1", "fatality", @@ -9647,7 +10150,6 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", "thiserror", "tracing-gum", ] @@ -9655,7 +10157,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "always-assert", "futures 0.3.28", @@ -9669,7 +10171,7 @@ dependencies = [ "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rand 0.8.5", "slotmap", @@ -9686,7 +10188,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "polkadot-node-primitives", @@ -9702,14 +10204,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-common" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cpu-time", "futures 0.3.28", "landlock", "libc", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "sc-executor", "sc-executor-common", @@ -9718,7 +10220,6 @@ dependencies = [ "sp-externalities", "sp-io", "sp-tracing", - "substrate-build-script-utils", "tokio", "tracing-gum", ] @@ -9726,19 +10227,18 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-execute-worker" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "cpu-time", "futures 0.3.28", "parity-scale-codec", "polkadot-node-core-pvf-common", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rayon", "sp-core", "sp-maybe-compressed-blob", "sp-tracing", - "tikv-jemalloc-ctl", "tokio", "tracing-gum", ] @@ -9746,13 +10246,13 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-prepare-worker" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "libc", "parity-scale-codec", "polkadot-node-core-pvf-common", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rayon", "sc-executor", @@ -9769,14 +10269,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", - "lru 0.9.0", "polkadot-node-metrics", "polkadot-node-subsystem", "polkadot-node-subsystem-types", "polkadot-primitives", + "schnellru", "sp-consensus-babe", "tracing-gum", ] @@ -9784,7 +10284,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "lazy_static", "log", @@ -9802,9 +10302,9 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ - "bs58", + "bs58 0.5.0", "futures 0.3.28", "futures-timer", "log", @@ -9821,10 +10321,11 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-channel", "async-trait", + "bitvec 1.0.1", "derive_more", "fatality", "futures 0.3.28", @@ -9844,14 +10345,14 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bounded-vec", "futures 0.3.28", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", - "schnorrkel", + "schnorrkel 0.9.1", "serde", "sp-application-crypto", "sp-consensus-babe", @@ -9860,13 +10361,13 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-runtime", "thiserror", - "zstd 0.11.2+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] name = "polkadot-node-subsystem" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -9876,7 +10377,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "derive_more", @@ -9900,7 +10401,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "derive_more", @@ -9909,7 +10410,6 @@ dependencies = [ "futures-channel", "itertools 0.10.5", "kvdb", - "lru 0.9.0", "parity-db", "parity-scale-codec", "parking_lot 0.11.2", @@ -9923,6 +10423,7 @@ dependencies = [ "polkadot-primitives", "prioritized-metered-channel", "rand 0.8.5", + "schnellru", "sp-application-crypto", "sp-core", "sp-keystore", @@ -9933,12 +10434,11 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "futures 0.3.28", "futures-timer", - "lru 0.9.0", "orchestra", "parking_lot 0.12.1", "polkadot-node-metrics", @@ -9947,6 +10447,7 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-primitives", "sc-client-api", + "schnellru", "sp-api", "sp-core", "tikv-jemalloc-ctl", @@ -9954,9 +10455,9 @@ dependencies = [ ] [[package]] -name = "polkadot-parachain" +name = "polkadot-parachain-primitives" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bounded-collections", "derive_more", @@ -9973,10 +10474,9 @@ dependencies = [ [[package]] name = "polkadot-performance-test" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "env_logger 0.9.3", - "kusama-runtime", "log", "polkadot-erasure-coding", "polkadot-node-core-pvf-prepare-worker", @@ -9985,19 +10485,20 @@ dependencies = [ "quote", "sc-executor-common", "sp-maybe-compressed-blob", + "staging-kusama-runtime", "thiserror", ] [[package]] name = "polkadot-primitives" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bitvec 1.0.1", - "hex-literal 0.4.1", + "hex-literal", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "scale-info", "serde", "sp-api", @@ -10017,7 +10518,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -10049,7 +10550,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bitvec 1.0.1", "frame-benchmarking", @@ -10060,7 +10561,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-authority-discovery", "pallet-authorship", @@ -10106,6 +10607,7 @@ dependencies = [ "pallet-vesting", "pallet-whitelist", "pallet-xcm", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", @@ -10132,19 +10634,20 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "polkadot-runtime-common" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bitvec 1.0.1", "frame-benchmarking", @@ -10183,14 +10686,14 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "staging-xcm", "static_assertions", - "xcm", ] [[package]] name = "polkadot-runtime-constants" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "polkadot-primitives", @@ -10204,9 +10707,10 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ - "bs58", + "bs58 0.5.0", + "frame-benchmarking", "parity-scale-codec", "polkadot-primitives", "sp-std", @@ -10216,7 +10720,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bitflags 1.3.2", "bitvec 1.0.1", @@ -10224,6 +10728,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "impl-trait-for-tuples", "log", "pallet-authority-discovery", "pallet-authorship", @@ -10235,7 +10740,7 @@ dependencies = [ "pallet-timestamp", "pallet-vesting", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", @@ -10253,15 +10758,15 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "staging-xcm", + "staging-xcm-executor", "static_assertions", - "xcm", - "xcm-executor", ] [[package]] name = "polkadot-service" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "frame-benchmarking", @@ -10270,12 +10775,11 @@ dependencies = [ "frame-system", "frame-system-rpc-runtime-api", "futures 0.3.28", - "hex-literal 0.4.1", - "kusama-runtime", + "hex-literal", + "is_executable", "kvdb", "kvdb-rocksdb", "log", - "lru 0.9.0", "mmr-gadget", "pallet-babe", "pallet-im-online", @@ -10303,7 +10807,9 @@ dependencies = [ "polkadot-node-core-chain-selection", "polkadot-node-core-dispute-coordinator", "polkadot-node-core-parachains-inherent", + "polkadot-node-core-prospective-parachains", "polkadot-node-core-provisioner", + "polkadot-node-core-pvf", "polkadot-node-core-pvf-checker", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", @@ -10312,7 +10818,7 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", @@ -10344,6 +10850,7 @@ dependencies = [ "sc-telemetry", "sc-transaction-pool", "sc-transaction-pool-api", + "schnellru", "serde", "serde_json", "sp-api", @@ -10367,9 +10874,9 @@ dependencies = [ "sp-storage", "sp-timestamp", "sp-transaction-pool", - "sp-trie", "sp-version", "sp-weights", + "staging-kusama-runtime", "substrate-prometheus-endpoint", "thiserror", "tracing-gum", @@ -10379,9 +10886,10 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.7.4", + "bitvec 1.0.1", "fatality", "futures 0.3.28", "futures-timer", @@ -10390,6 +10898,7 @@ dependencies = [ "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", "sp-keystore", @@ -10401,7 +10910,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -10411,7 +10920,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bitvec 1.0.1", "frame-election-provider-support", @@ -10437,7 +10946,7 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -10462,17 +10971,17 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", "test-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "polkadot-test-service" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-system", "futures 0.3.28", @@ -10483,7 +10992,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime-common", @@ -10547,6 +11056,17 @@ dependencies = [ "universal-hash 0.4.1", ] +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug 0.3.0", + "universal-hash 0.5.1", +] + [[package]] name = "polyval" version = "0.5.3" @@ -10639,7 +11159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -10720,7 +11240,7 @@ checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -10766,7 +11286,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -10879,7 +11399,7 @@ checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls 0.20.9", "slab", @@ -11025,7 +11545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", - "ring", + "ring 0.16.20", "time 0.3.28", "x509-parser 0.13.2", "yasna", @@ -11038,7 +11558,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", + "ring 0.16.20", "time 0.3.28", "yasna", ] @@ -11102,7 +11622,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -11192,6 +11712,21 @@ dependencies = [ "subtle", ] +[[package]] +name = "ring" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "common", + "fflonk", + "merlin 3.0.0", +] + [[package]] name = "ring" version = "0.16.20" @@ -11201,7 +11736,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi", @@ -11251,7 +11786,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "binary-merkle-tree", "frame-benchmarking", @@ -11261,7 +11796,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-authority-discovery", "pallet-authorship", @@ -11303,7 +11838,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -11326,19 +11861,20 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "rococo-runtime-constants" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "polkadot-primitives", @@ -11420,7 +11956,7 @@ dependencies = [ "ethabi", "frame-support", "frame-system", - "hex-literal 0.4.1", + "hex-literal", "log", "module-asset-registry", "module-cdp-engine", @@ -11461,7 +11997,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime", "scale-info", @@ -11470,11 +12006,11 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "wasm-bencher", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -11498,7 +12034,7 @@ dependencies = [ "frame-support", "frame-system", "hex", - "hex-literal 0.4.1", + "hex-literal", "karura-runtime", "libsecp256k1", "log", @@ -11587,9 +12123,9 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -11658,14 +12194,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.10" +version = "0.38.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.10", "windows-sys 0.48.0", ] @@ -11677,7 +12213,7 @@ checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ "base64 0.13.1", "log", - "ring", + "ring 0.16.20", "sct 0.6.1", "webpki 0.21.4", ] @@ -11689,7 +12225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct 0.7.0", "webpki 0.22.1", ] @@ -11701,7 +12237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki 0.101.4", "sct 0.7.0", ] @@ -11733,7 +12269,7 @@ version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -11743,7 +12279,7 @@ version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -11753,6 +12289,17 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +[[package]] +name = "ruzstd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +dependencies = [ + "byteorder", + "thiserror-core", + "twox-hash", +] + [[package]] name = "rw-stream-sink" version = "0.3.0" @@ -11791,7 +12338,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "log", "sp-core", @@ -11802,7 +12349,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "futures 0.3.28", @@ -11830,7 +12377,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "futures-timer", @@ -11853,7 +12400,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -11868,7 +12415,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -11887,22 +12434,22 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "chrono", - "clap 4.4.1", + "clap 4.4.6", "fdlimit", "futures 0.3.28", "libp2p-identity", @@ -11937,7 +12484,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "fnv", "futures 0.3.28", @@ -11963,7 +12510,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "hash-db 0.16.0", "kvdb", @@ -11989,7 +12536,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "futures 0.3.28", @@ -12014,7 +12561,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "futures 0.3.28", @@ -12043,7 +12590,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "fork-tree", @@ -12079,7 +12626,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12101,7 +12648,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "async-channel", @@ -12135,7 +12682,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12154,7 +12701,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "fork-tree", "parity-scale-codec", @@ -12167,7 +12714,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "ahash 0.8.3", "array-bytes", @@ -12208,7 +12755,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "finality-grandpa", "futures 0.3.28", @@ -12228,7 +12775,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "assert_matches", "async-trait", @@ -12263,7 +12810,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "futures 0.3.28", @@ -12286,7 +12833,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -12308,7 +12855,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -12320,7 +12867,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "anyhow", "cfg-if", @@ -12337,7 +12884,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "ansi_term", "futures 0.3.28", @@ -12353,7 +12900,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "parking_lot 0.12.1", @@ -12367,7 +12914,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "async-channel", @@ -12408,7 +12955,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-channel", "cid", @@ -12428,7 +12975,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -12445,7 +12992,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "ahash 0.8.3", "futures 0.3.28", @@ -12463,7 +13010,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "async-channel", @@ -12484,7 +13031,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "async-channel", @@ -12518,7 +13065,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "futures 0.3.28", @@ -12536,7 +13083,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "bytes", @@ -12570,7 +13117,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -12579,7 +13126,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12610,7 +13157,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12629,7 +13176,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "http", "jsonrpsee", @@ -12644,7 +13191,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "futures 0.3.28", @@ -12657,6 +13204,7 @@ dependencies = [ "sc-chain-spec", "sc-client-api", "sc-transaction-pool-api", + "sc-utils", "serde", "sp-api", "sp-blockchain", @@ -12664,13 +13212,14 @@ dependencies = [ "sp-runtime", "sp-version", "thiserror", + "tokio", "tokio-stream", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "directories", @@ -12734,7 +13283,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "log", "parity-scale-codec", @@ -12745,9 +13294,9 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ - "clap 4.4.1", + "clap 4.4.6", "fs4", "log", "sc-client-db", @@ -12759,7 +13308,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12778,7 +13327,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "libc", @@ -12797,7 +13346,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "chrono", "futures 0.3.28", @@ -12816,7 +13365,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "ansi_term", "atty", @@ -12845,18 +13394,18 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "futures 0.3.28", @@ -12882,7 +13431,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "futures 0.3.28", @@ -12898,7 +13447,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-channel", "futures 0.3.28", @@ -12966,7 +13515,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.3", "getrandom 0.1.16", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -12974,6 +13523,22 @@ dependencies = [ "zeroize", ] +[[package]] +name = "schnorrkel" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "curve25519-dalek-ng", + "merlin 3.0.0", + "rand_core 0.6.4", + "sha2 0.9.9", + "subtle-ng", + "zeroize", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -12992,7 +13557,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -13002,7 +13567,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -13147,7 +13712,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -13327,7 +13892,7 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "slot-range-helper" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "enumn", "parity-scale-codec", @@ -13351,6 +13916,113 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +[[package]] +name = "smol" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" +dependencies = [ + "async-channel", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-net", + "async-process", + "blocking", + "futures-lite", +] + +[[package]] +name = "smoldot" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0bb30cf57b7b5f6109ce17c3164445e2d6f270af2cb48f6e4d31c2967c9a9f5" +dependencies = [ + "arrayvec 0.7.4", + "async-lock", + "atomic-take", + "base64 0.21.3", + "bip39", + "blake2-rfc", + "bs58 0.5.0", + "chacha20 0.9.1", + "crossbeam-queue", + "derive_more", + "ed25519-zebra 4.0.3", + "either", + "event-listener 2.5.3", + "fnv", + "futures-lite", + "futures-util", + "hashbrown 0.14.0", + "hex", + "hmac 0.12.1", + "itertools 0.11.0", + "libsecp256k1", + "merlin 3.0.0", + "no-std-net", + "nom", + "num-bigint", + "num-rational", + "num-traits", + "pbkdf2 0.12.2", + "pin-project", + "poly1305 0.8.0", + "rand 0.8.5", + "rand_chacha 0.3.1", + "ruzstd", + "schnorrkel 0.10.2", + "serde", + "serde_json", + "sha2 0.10.7", + "sha3", + "siphasher", + "slab", + "smallvec", + "soketto", + "twox-hash", + "wasmi", + "x25519-dalek 2.0.0", + "zeroize", +] + +[[package]] +name = "smoldot-light" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "256b5bad1d6b49045e95fe87492ce73d5af81545d8b4d8318a872d2007024c33" +dependencies = [ + "async-channel", + "async-lock", + "base64 0.21.3", + "blake2-rfc", + "derive_more", + "either", + "event-listener 2.5.3", + "fnv", + "futures-channel", + "futures-lite", + "futures-util", + "hashbrown 0.14.0", + "hex", + "itertools 0.11.0", + "log", + "lru 0.11.1", + "no-std-net", + "parking_lot 0.12.1", + "pin-project", + "rand 0.8.5", + "rand_chacha 0.3.1", + "serde", + "serde_json", + "siphasher", + "slab", + "smol", + "smoldot", + "zeroize", +] + [[package]] name = "snap" version = "1.1.0" @@ -13368,7 +14040,7 @@ dependencies = [ "chacha20poly1305", "curve25519-dalek 4.0.0", "rand_core 0.6.4", - "ring", + "ring 0.16.20", "rustc_version", "sha2 0.10.7", "subtle", @@ -13414,7 +14086,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "hash-db 0.16.0", "log", @@ -13435,7 +14107,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "Inflector", "blake2", @@ -13443,13 +14115,13 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "sp-application-crypto" version = "23.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "scale-info", @@ -13462,7 +14134,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "16.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "integer-sqrt", "num-traits", @@ -13476,7 +14148,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "scale-info", @@ -13489,7 +14161,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "sp-api", "sp-inherents", @@ -13500,7 +14172,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", "log", @@ -13518,7 +14190,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "futures 0.3.28", @@ -13533,7 +14205,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "parity-scale-codec", @@ -13550,7 +14222,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "parity-scale-codec", @@ -13569,7 +14241,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "lazy_static", "parity-scale-codec", @@ -13588,7 +14260,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "finality-grandpa", "log", @@ -13606,7 +14278,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "scale-info", @@ -13618,15 +14290,17 @@ dependencies = [ [[package]] name = "sp-core" version = "21.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", + "arrayvec 0.7.4", + "bandersnatch_vrfs", "bitflags 1.3.2", "blake2", "bounded-collections", - "bs58", + "bs58 0.5.0", "dyn-clonable", - "ed25519-zebra", + "ed25519-zebra 3.1.0", "futures 0.3.28", "hash-db 0.16.0", "hash256-std-hasher", @@ -13634,7 +14308,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", "paste", @@ -13642,7 +14316,7 @@ dependencies = [ "rand 0.8.5", "regex", "scale-info", - "schnorrkel", + "schnorrkel 0.9.1", "secp256k1", "secrecy", "serde", @@ -13663,7 +14337,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "9.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "blake2b_simd", "byteorder", @@ -13676,17 +14350,17 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "9.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "quote", "sp-core-hashing", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -13695,17 +14369,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "8.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "sp-externalities" version = "0.19.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "environmental", "parity-scale-codec", @@ -13713,10 +14387,21 @@ dependencies = [ "sp-storage", ] +[[package]] +name = "sp-genesis-builder" +version = "0.1.0" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +dependencies = [ + "serde_json", + "sp-api", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -13730,11 +14415,10 @@ dependencies = [ [[package]] name = "sp-io" version = "23.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bytes", - "ed25519 1.5.3", - "ed25519-dalek 1.0.1", + "ed25519-dalek", "libsecp256k1", "log", "parity-scale-codec", @@ -13755,7 +14439,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "24.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "lazy_static", "sp-core", @@ -13766,7 +14450,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.27.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -13778,7 +14462,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "thiserror", "zstd 0.12.4", @@ -13787,7 +14471,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -13798,7 +14482,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -13816,7 +14500,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "scale-info", @@ -13830,7 +14514,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "sp-api", "sp-core", @@ -13840,7 +14524,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "8.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "backtrace", "lazy_static", @@ -13850,7 +14534,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "rustc-hash", "serde", @@ -13860,7 +14544,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "24.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "either", "hash256-std-hasher", @@ -13882,7 +14566,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "17.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -13900,19 +14584,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "scale-info", @@ -13927,7 +14611,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -13941,7 +14625,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.28.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "hash-db 0.16.0", "log", @@ -13962,10 +14646,16 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ + "aes-gcm 0.10.2", + "curve25519-dalek 4.0.0", + "ed25519-dalek", + "hkdf", "parity-scale-codec", + "rand 0.8.5", "scale-info", + "sha2 0.10.7", "sp-api", "sp-application-crypto", "sp-core", @@ -13974,17 +14664,18 @@ dependencies = [ "sp-runtime-interface", "sp-std", "thiserror", + "x25519-dalek 2.0.0", ] [[package]] name = "sp-std" version = "8.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" [[package]] name = "sp-storage" version = "13.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13997,7 +14688,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "parity-scale-codec", @@ -14010,7 +14701,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "10.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "sp-std", @@ -14022,7 +14713,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "sp-api", "sp-runtime", @@ -14031,7 +14722,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "parity-scale-codec", @@ -14046,7 +14737,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "22.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "ahash 0.8.3", "hash-db 0.16.0", @@ -14069,7 +14760,7 @@ dependencies = [ [[package]] name = "sp-version" version = "22.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "impl-serde", "parity-scale-codec", @@ -14086,18 +14777,18 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "8.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "sp-wasm-interface" version = "14.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -14110,7 +14801,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "20.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "parity-scale-codec", "scale-info", @@ -14124,9 +14815,15 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spinners" @@ -14180,6 +14877,171 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "staging-kusama-runtime" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +dependencies = [ + "binary-merkle-tree", + "bitvec 1.0.1", + "frame-benchmarking", + "frame-election-provider-support", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal", + "kusama-runtime-constants", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", + "pallet-bounties", + "pallet-child-bounties", + "pallet-collective", + "pallet-conviction-voting", + "pallet-democracy", + "pallet-election-provider-multi-phase", + "pallet-election-provider-support-benchmarking", + "pallet-elections-phragmen", + "pallet-fast-unstake", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-membership", + "pallet-message-queue", + "pallet-mmr", + "pallet-multisig", + "pallet-nis", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", + "pallet-offences", + "pallet-offences-benchmarking", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-recovery", + "pallet-referenda", + "pallet-scheduler", + "pallet-session", + "pallet-session-benchmarking", + "pallet-society", + "pallet-staking", + "pallet-staking-runtime-api", + "pallet-state-trie-migration", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", + "pallet-utility", + "pallet-vesting", + "pallet-whitelist", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parity-scale-codec", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "smallvec", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-core", + "sp-inherents", + "sp-io", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "static_assertions", + "substrate-wasm-builder", +] + +[[package]] +name = "staging-xcm" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +dependencies = [ + "bounded-collections", + "derivative", + "environmental", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-weights", + "xcm-procedural", +] + +[[package]] +name = "staging-xcm-builder" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +dependencies = [ + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-transaction-payment", + "parity-scale-codec", + "polkadot-parachain-primitives", + "scale-info", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", + "staging-xcm", + "staging-xcm-executor", +] + +[[package]] +name = "staging-xcm-executor" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" +dependencies = [ + "environmental", + "frame-benchmarking", + "frame-support", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", + "staging-xcm", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -14261,7 +15123,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -14275,7 +15137,7 @@ dependencies = [ "lazy_static", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "subtle", "thiserror", "tokio", @@ -14291,7 +15153,7 @@ checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c" dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", - "schnorrkel", + "schnorrkel 0.9.1", "sha2 0.9.9", "zeroize", ] @@ -14312,12 +15174,12 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.28", @@ -14336,7 +15198,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "hyper", "log", @@ -14348,7 +15210,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", "jsonrpsee", @@ -14361,7 +15223,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -14378,7 +15240,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "array-bytes", "async-trait", @@ -14404,28 +15266,16 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "futures 0.3.28", - "substrate-test-utils-derive", "tokio", ] -[[package]] -name = "substrate-test-utils-derive" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.29", -] - [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "ansi_term", "build-helper", @@ -14455,6 +15305,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +[[package]] +name = "subtle-ng" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" + [[package]] name = "syn" version = "1.0.109" @@ -14468,9 +15324,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -14531,7 +15387,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.10", + "rustix 0.38.18", "windows-sys 0.48.0", ] @@ -14553,7 +15409,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-runtime-constants" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "polkadot-primitives", @@ -14591,7 +15447,7 @@ dependencies = [ "frame-system", "frame-system-rpc-runtime-api", "futures 0.3.28", - "hex-literal 0.4.1", + "hex-literal", "jsonrpsee", "log", "mandala-runtime", @@ -14664,22 +15520,42 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] +[[package]] +name = "thiserror-core" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497" +dependencies = [ + "thiserror-core-impl", +] + +[[package]] +name = "thiserror-core-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -14860,7 +15736,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -15016,7 +15892,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -15042,8 +15918,9 @@ dependencies = [ [[package]] name = "tracing-gum" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ + "coarsetime", "polkadot-node-jaeger", "polkadot-primitives", "tracing", @@ -15053,13 +15930,13 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -15193,10 +16070,10 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "async-trait", - "clap 4.4.1", + "clap 4.4.6", "frame-remote-externalities", "frame-try-runtime", "hex", @@ -15244,7 +16121,7 @@ dependencies = [ "log", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "stun", "thiserror", "tokio", @@ -15259,7 +16136,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] @@ -15463,7 +16340,7 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bencher" version = "0.5.0" -source = "git+https://github.com/open-web3-stack/wasm-bencher#ef5baa248461bc9680bad2e06eaa2f9cc5148e73" +source = "git+https://github.com/open-web3-stack/wasm-bencher?branch=polkadot-v1.1.0#b51b89e13b6e18dcbdb24f16c655f5c443c7518e" dependencies = [ "ansi_term", "build-helper", @@ -15502,11 +16379,11 @@ dependencies = [ [[package]] name = "wasm-bencher-procedural" version = "0.5.0" -source = "git+https://github.com/open-web3-stack/wasm-bencher#ef5baa248461bc9680bad2e06eaa2f9cc5148e73" +source = "git+https://github.com/open-web3-stack/wasm-bencher?branch=polkadot-v1.1.0#b51b89e13b6e18dcbdb24f16c655f5c443c7518e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -15530,7 +16407,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", "wasm-bindgen-shared", ] @@ -15564,7 +16441,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -15597,9 +16474,9 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.112.0" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c" +checksum = "4d005a95f934878a1fb446a816d51c3601a0120ff929005ba3bab3c749cfd1c7" dependencies = [ "anyhow", "libc", @@ -15613,9 +16490,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.112.0" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445" +checksum = "6d04e240598162810fad3b2e96fa0dec6dba1eb65a03f3bd99a9248ab8b56caa" dependencies = [ "anyhow", "cxx", @@ -15625,9 +16502,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.112.0" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14" +checksum = "2efd2aaca519d64098c4faefc8b7433a97ed511caf4c9e516384eb6aef1ff4f9" dependencies = [ "anyhow", "cc", @@ -15650,6 +16527,37 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasmi" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" +dependencies = [ + "smallvec", + "spin 0.9.8", + "wasmi_arena", + "wasmi_core", + "wasmparser-nostd", +] + +[[package]] +name = "wasmi_arena" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" + +[[package]] +name = "wasmi_core" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + [[package]] name = "wasmparser" version = "0.102.0" @@ -15660,6 +16568,15 @@ dependencies = [ "url", ] +[[package]] +name = "wasmparser-nostd" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +dependencies = [ + "indexmap-nostd", +] + [[package]] name = "wasmtime" version = "8.0.1" @@ -15871,7 +16788,7 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -15881,7 +16798,7 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -15925,7 +16842,7 @@ dependencies = [ "rand 0.8.5", "rcgen 0.9.3", "regex", - "ring", + "ring 0.16.20", "rtcp", "rtp", "rustls 0.19.1", @@ -15989,7 +16906,7 @@ dependencies = [ "rand 0.8.5", "rand_core 0.6.4", "rcgen 0.10.0", - "ring", + "ring 0.16.20", "rustls 0.19.1", "sec1 0.3.0", "serde", @@ -16120,8 +17037,9 @@ dependencies = [ [[package]] name = "westend-runtime" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ + "binary-merkle-tree", "bitvec 1.0.1", "frame-benchmarking", "frame-election-provider-support", @@ -16131,13 +17049,15 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", "pallet-bags-list", "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -16150,6 +17070,7 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-message-queue", + "pallet-mmr", "pallet-multisig", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -16177,7 +17098,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -16187,6 +17108,7 @@ dependencies = [ "serde_derive", "smallvec", "sp-api", + "sp-application-crypto", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", @@ -16201,19 +17123,20 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", "westend-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "westend-runtime-constants" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "polkadot-primitives", @@ -16530,7 +17453,7 @@ dependencies = [ "lazy_static", "nom", "oid-registry 0.4.0", - "ring", + "ring 0.16.20", "rusticata-macros", "thiserror", "time 0.3.28", @@ -16554,91 +17477,33 @@ dependencies = [ "time 0.3.28", ] -[[package]] -name = "xcm" -version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" -dependencies = [ - "bounded-collections", - "derivative", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-weights", - "xcm-procedural", -] - -[[package]] -name = "xcm-builder" -version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" -dependencies = [ - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "log", - "pallet-transaction-payment", - "parity-scale-codec", - "polkadot-parachain", - "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", - "xcm", - "xcm-executor", -] - -[[package]] -name = "xcm-executor" -version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" -dependencies = [ - "environmental", - "frame-benchmarking", - "frame-support", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", - "xcm", -] - [[package]] name = "xcm-procedural" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "xcm-simulator" version = "1.0.0" -source = "git+https://github.com/paritytech//polkadot?rev=c9ec8c5a15959ce711bb60aa79add58f560d61e9#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +source = "git+https://github.com/paritytech//polkadot-sdk?rev=f60318f68687e601c47de5ad5ca88e2c3f8139a7#f60318f68687e601c47de5ad5ca88e2c3f8139a7" dependencies = [ "frame-support", "parity-scale-codec", "paste", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "sp-io", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -16690,7 +17555,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 68d25fe993..f18e735b41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -117,239 +117,239 @@ insta.opt-level = 3 similar.opt-level = 3 [workspace.dependencies] -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -[patch."https://github.com/paritytech/substrate"] -binary-merkle-tree = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-executive = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -mmr-gadget = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-bags-list = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-beefy = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-child-bounties = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-conviction-voting = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-election-provider-support-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-fast-unstake = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-message-queue = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-nis = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-nomination-pools = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-nomination-pools-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-preimage = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-ranked-collective = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-referenda = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-root-testing = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-society = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-staking-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-state-trie-migration = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -pallet-whitelist = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-cli = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus-beefy = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus-beefy-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus-grandpa = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-informant = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-network = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-network-common = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-network-light = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-network-sync = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-network-transactions = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-service = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-storage-monitor = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-sysinfo = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-consensus-beefy = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-consensus-grandpa = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -sp-weights = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -substrate-test-client = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } -try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" } +[patch."https://github.com/paritytech/polkadot-sdk"] +# substrate +binary-merkle-tree = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-benchmarking = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-benchmarking-cli = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-election-provider-support = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-executive = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-remote-externalities = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-support = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-support-procedural = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-support-procedural-tools = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-system = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-system-benchmarking = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +frame-try-runtime = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +mmr-gadget = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +mmr-rpc = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-aura = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-authority-discovery = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-authorship = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-babe = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-bags-list = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-balances = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-beefy = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-beefy-mmr = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-bounties = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-child-bounties = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-collective = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-conviction-voting = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-democracy = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-election-provider-support-benchmarking = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-fast-unstake = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-grandpa = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-identity = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-im-online = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-indices = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-membership = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-message-queue = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-mmr = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-multisig = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-nis = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-nomination-pools = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-nomination-pools-benchmarking = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-offences = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-offences-benchmarking = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-preimage = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-proxy = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-ranked-collective = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-recovery = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-referenda = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-root-testing = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-scheduler = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-session = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-session-benchmarking = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-society = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-staking = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-staking-reward-fn = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-staking-runtime-api = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-state-trie-migration = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-sudo = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-timestamp = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-tips = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-transaction-payment = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-treasury = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-utility = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-vesting = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-whitelist = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-authority-discovery = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-basic-authorship = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-block-builder = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-chain-spec = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-cli = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-client-api = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-client-db = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-consensus = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-consensus-aura = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-consensus-babe = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-consensus-beefy = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-consensus-beefy-rpc = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-consensus-epochs = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-consensus-grandpa = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-consensus-slots = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-executor = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-executor-common = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-executor-wasmtime = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-informant = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-keystore = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-network = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-network-common = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-network-gossip = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-network-light = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-network-sync = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-network-transactions = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-offchain = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-rpc = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-rpc-api = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-rpc-server = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-service = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-storage-monitor = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-sync-state-rpc = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-sysinfo = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-telemetry = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-tracing = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-transaction-pool = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-transaction-pool-api = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sc-utils = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-api = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-application-crypto = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-arithmetic = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-authority-discovery = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-block-builder = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-blockchain = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-consensus = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-consensus-aura = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-consensus-babe = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-consensus-beefy = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-consensus-grandpa = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-consensus-slots = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-core = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-debug-derive = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-externalities = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-inherents = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-io = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-keyring = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-keystore = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-mmr-primitives = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-npos-elections = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-offchain = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-rpc = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-runtime = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-runtime-interface = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-session = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-staking = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-state-machine = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-std = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-storage = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-timestamp = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-tracing = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-transaction-pool = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-trie = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-version = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-wasm-interface = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +sp-weights = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +substrate-build-script-utils = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +substrate-test-client = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +substrate-test-utils = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +substrate-wasm-builder = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +try-runtime-cli = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } -[patch."https://github.com/paritytech/polkadot"] -kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -kusama-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -pallet-xcm-benchmarks = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-network-bridge = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-node-core-av-store = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-node-metrics = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-node-subsystem-util= { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -test-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -tracing-gum = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -xcm = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-node-core-runtime-api = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-node-collation-generation = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-collator-protocol = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } -polkadot-availability-recovery = { git = "https://github.com/paritytech//polkadot", rev = "c9ec8c5a15959ce711bb60aa79add58f560d61e9" } +# polkadot +kusama-runtime = { package = "staging-kusama-runtime", git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +kusama-runtime-constants = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +pallet-xcm-benchmarks = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-cli = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-network-bridge = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-node-core-av-store = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-node-metrics = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-node-subsystem-util= { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-overseer = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-rpc = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-runtime = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-runtime-constants = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-service = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-statement-table = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-test-service = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +rococo-runtime = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +test-runtime-constants = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +tracing-gum = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +westend-runtime = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-node-core-runtime-api = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-node-collation-generation = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-collator-protocol = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +polkadot-availability-recovery = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } -[patch."https://github.com/paritytech/cumulus"] -cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-client-pov-recovery = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" } +# cumulus +cumulus-client-cli = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-client-network = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-client-pov-recovery = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-client-service = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-primitives-core = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-primitives-utility = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } +parachain-info = { git = "https://github.com/paritytech//polkadot-sdk", rev = "f60318f68687e601c47de5ad5ca88e2c3f8139a7" } diff --git a/ecosystem-modules/stable-asset b/ecosystem-modules/stable-asset index 4a4af726ca..5b6bdb1155 160000 --- a/ecosystem-modules/stable-asset +++ b/ecosystem-modules/stable-asset @@ -1 +1 @@ -Subproject commit 4a4af726ca659cb30da2aedd22fb391da30ea142 +Subproject commit 5b6bdb115537cc8ff9ee246a0778023c4b0e4edf diff --git a/evm-tests b/evm-tests index 79b4895c42..07db7353c5 160000 --- a/evm-tests +++ b/evm-tests @@ -1 +1 @@ -Subproject commit 79b4895c428e227ce72b5171094431fb5ea822c4 +Subproject commit 07db7353c5b90ee53c72b4e06fa34cfb00f9d19f diff --git a/inspect/Cargo.toml b/inspect/Cargo.toml index 4cd2b0cd7e..c9ce80bc69 100644 --- a/inspect/Cargo.toml +++ b/inspect/Cargo.toml @@ -9,9 +9,9 @@ codec = { package = "parity-scale-codec", version = "3.4.0" } clap = { version = "4.0.9", features = ["derive"] } derive_more = "0.99" log = "0.4.17" -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } diff --git a/inspect/src/lib.rs b/inspect/src/lib.rs index 4654eb3d18..8c3f0c1ae1 100644 --- a/inspect/src/lib.rs +++ b/inspect/src/lib.rs @@ -27,12 +27,12 @@ use sp_blockchain::HeaderBackend; use sp_core::hexdisplay::HexDisplay; use sp_runtime::{ generic::BlockId, - traits::{Block, Hash, HashFor, NumberFor}, + traits::{Block, Hash, HashingFor, NumberFor}, }; use std::{fmt, fmt::Debug, marker::PhantomData, str::FromStr}; /// A helper type for a generic block input. -pub type BlockAddressFor = BlockAddress< as Hash>::Output, NumberFor>; +pub type BlockAddressFor = BlockAddress< as Hash>::Output, NumberFor>; /// A Pretty formatter implementation. pub trait PrettyPrinter { @@ -169,7 +169,7 @@ impl> Inspector /// Get a pretty-printed extrinsic. pub fn extrinsic( &self, - input: ExtrinsicAddress< as Hash>::Output, NumberFor>, + input: ExtrinsicAddress< as Hash>::Output, NumberFor>, ) -> Result { struct ExtrinsicPrinter<'a, A: Block, B>(A::Extrinsic, &'a B); impl<'a, A: Block, B: PrettyPrinter> fmt::Display for ExtrinsicPrinter<'a, A, B> { diff --git a/modules/aggregated-dex/Cargo.toml b/modules/aggregated-dex/Cargo.toml index 6e4e64e8ed..827c468dfb 100644 --- a/modules/aggregated-dex/Cargo.toml +++ b/modules/aggregated-dex/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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 } @@ -21,9 +21,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-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] diff --git a/modules/asset-registry/Cargo.toml b/modules/asset-registry/Cargo.toml index cab7d553b8..05fa95c879 100644 --- a/modules/asset-registry/Cargo.toml +++ b/modules/asset-registry/Cargo.toml @@ -8,23 +8,23 @@ edition = "2021" log = { version = "0.4.17", default-features = false } scale-info = { version = "2.9.0", 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-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] serde_json = "1.0.81" hex = "0.4" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } module-evm = { path = "../evm" } module-evm-bridge = { path = "../evm-bridge" } diff --git a/modules/asset-registry/src/migrations.rs b/modules/asset-registry/src/migrations.rs index bd919f081d..c11f26acf5 100644 --- a/modules/asset-registry/src/migrations.rs +++ b/modules/asset-registry/src/migrations.rs @@ -17,9 +17,7 @@ // along with this program. If not, see . use crate::{Config, CurrencyId, ForeignAssetLocations, LocationToCurrencyIds, Weight}; -use frame_support::{ - log, migration::storage_key_iter, pallet_prelude::*, traits::OnRuntimeUpgrade, StoragePrefixedMap, -}; +use frame_support::{migration::storage_key_iter, pallet_prelude::*, traits::OnRuntimeUpgrade, StoragePrefixedMap}; use sp_std::marker::PhantomData; use xcm::v3::prelude::*; diff --git a/modules/auction-manager/Cargo.toml b/modules/auction-manager/Cargo.toml index 7444d8cc63..c96cdbc74c 100644 --- a/modules/auction-manager/Cargo.toml +++ b/modules/auction-manager/Cargo.toml @@ -5,21 +5,22 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-auction = { path = "../../orml/auction" } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } module-dex = { path = "../dex" } diff --git a/modules/auction-manager/src/lib.rs b/modules/auction-manager/src/lib.rs index 3598713e91..07e2bd33b8 100644 --- a/modules/auction-manager/src/lib.rs +++ b/modules/auction-manager/src/lib.rs @@ -31,7 +31,7 @@ #![allow(clippy::unnecessary_unwrap)] use codec::MaxEncodedLen; -use frame_support::{log, pallet_prelude::*, transactional}; +use frame_support::{pallet_prelude::*, transactional}; use frame_system::{ offchain::{SendTransactionTypes, SubmitTransaction}, pallet_prelude::*, diff --git a/modules/cdp-engine/Cargo.toml b/modules/cdp-engine/Cargo.toml index c9ebba7c1c..1529930131 100644 --- a/modules/cdp-engine/Cargo.toml +++ b/modules/cdp-engine/Cargo.toml @@ -5,16 +5,17 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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 } @@ -22,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-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } 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-engine/src/lib.rs b/modules/cdp-engine/src/lib.rs index 6e364e910c..32a42fad5d 100644 --- a/modules/cdp-engine/src/lib.rs +++ b/modules/cdp-engine/src/lib.rs @@ -29,7 +29,7 @@ #![allow(clippy::upper_case_acronyms)] use codec::MaxEncodedLen; -use frame_support::{log, pallet_prelude::*, traits::UnixTime, transactional, BoundedVec, PalletId}; +use frame_support::{pallet_prelude::*, traits::UnixTime, transactional, BoundedVec, PalletId}; use frame_system::{ offchain::{SendTransactionTypes, SubmitTransaction}, pallet_prelude::*, diff --git a/modules/cdp-treasury/Cargo.toml b/modules/cdp-treasury/Cargo.toml index 0a142023e4..3d90875674 100644 --- a/modules/cdp-treasury/Cargo.toml +++ b/modules/cdp-treasury/Cargo.toml @@ -5,21 +5,22 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-currencies = { path = "../../orml/currencies" } orml-auction = { path = "../../orml/auction" } module-dex = { path = "../dex" } diff --git a/modules/cdp-treasury/src/lib.rs b/modules/cdp-treasury/src/lib.rs index 800862090a..a8a585f297 100644 --- a/modules/cdp-treasury/src/lib.rs +++ b/modules/cdp-treasury/src/lib.rs @@ -29,7 +29,7 @@ #![allow(clippy::unused_unit)] #![allow(clippy::needless_range_loop)] -use frame_support::{log, pallet_prelude::*, transactional, PalletId}; +use frame_support::{pallet_prelude::*, transactional, PalletId}; use frame_system::pallet_prelude::*; use nutsfinance_stable_asset::traits::StableAsset; use nutsfinance_stable_asset::RedeemProportionResult; diff --git a/modules/collator-selection/Cargo.toml b/modules/collator-selection/Cargo.toml index a77106a523..7731b11c33 100644 --- a/modules/collator-selection/Cargo.toml +++ b/modules/collator-selection/Cargo.toml @@ -12,26 +12,26 @@ log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ['std'] diff --git a/modules/currencies/Cargo.toml b/modules/currencies/Cargo.toml index 8951224b4c..f3733ed1e0 100644 --- a/modules/currencies/Cargo.toml +++ b/modules/currencies/Cargo.toml @@ -7,13 +7,13 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } @@ -24,9 +24,9 @@ support = { package = "module-support", path = "../support", default-features = serde_json = "1.0.81" hex = "0.4" hex-literal = "0.4.1" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } 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 9cb27e8e2e..c22c5a4470 100644 --- a/modules/dex-oracle/Cargo.toml +++ b/modules/dex-oracle/Cargo.toml @@ -7,20 +7,20 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] diff --git a/modules/dex/Cargo.toml b/modules/dex/Cargo.toml index 4dec6609d9..b804155904 100644 --- a/modules/dex/Cargo.toml +++ b/modules/dex/Cargo.toml @@ -5,22 +5,23 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] diff --git a/modules/dex/src/lib.rs b/modules/dex/src/lib.rs index dc8888a106..837a8e69ff 100644 --- a/modules/dex/src/lib.rs +++ b/modules/dex/src/lib.rs @@ -34,7 +34,7 @@ #![allow(clippy::collapsible_if)] use codec::MaxEncodedLen; -use frame_support::{log, pallet_prelude::*, transactional, PalletId}; +use frame_support::{pallet_prelude::*, transactional, PalletId}; use frame_system::pallet_prelude::*; use orml_traits::{Happened, MultiCurrency, MultiCurrencyExtended}; use primitives::{Balance, CurrencyId, TradingPair}; diff --git a/modules/earning/Cargo.toml b/modules/earning/Cargo.toml index b90b427a78..6e6e5d7e3a 100644 --- a/modules/earning/Cargo.toml +++ b/modules/earning/Cargo.toml @@ -8,11 +8,11 @@ edition = "2021" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } @@ -22,8 +22,8 @@ primitives = { package = "acala-primitives", path = "../../primitives", default- paste = "1.0" [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] diff --git a/modules/emergency-shutdown/Cargo.toml b/modules/emergency-shutdown/Cargo.toml index 3faaa1d407..48757c6370 100644 --- a/modules/emergency-shutdown/Cargo.toml +++ b/modules/emergency-shutdown/Cargo.toml @@ -7,18 +7,18 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances= { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } 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 f8a67eb86b..116cf4fe62 100644 --- a/modules/evm-accounts/Cargo.toml +++ b/modules/evm-accounts/Cargo.toml @@ -9,12 +9,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.9.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } @@ -23,7 +23,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-v1.0.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } 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 5ffa935d37..0a20bc51f0 100644 --- a/modules/evm-bridge/Cargo.toml +++ b/modules/evm-bridge/Cargo.toml @@ -10,12 +10,12 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } impl-trait-for-tuples = "0.2.2" ethereum-types = { version = "0.14.0", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } @@ -27,8 +27,8 @@ num_enum = { version = "0.5.1", default-features = false } [dev-dependencies] serde_json = "1.0.81" hex = "0.4" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] diff --git a/modules/evm-bridge/src/lib.rs b/modules/evm-bridge/src/lib.rs index 93a33982c8..a2bee76805 100644 --- a/modules/evm-bridge/src/lib.rs +++ b/modules/evm-bridge/src/lib.rs @@ -20,16 +20,13 @@ #![allow(clippy::unused_unit)] use ethereum_types::BigEndianHash; -use frame_support::{ - dispatch::{DispatchError, DispatchResult}, - pallet_prelude::*, -}; +use frame_support::{dispatch::DispatchResult, pallet_prelude::*}; use frame_system::pallet_prelude::*; use module_evm::{ExitReason, ExitSucceed}; use num_enum::{IntoPrimitive, TryFromPrimitive}; use primitives::{evm::EvmAddress, Balance}; use sp_core::{H160, H256, U256}; -use sp_runtime::{ArithmeticError, SaturatedConversion}; +use sp_runtime::{ArithmeticError, DispatchError, SaturatedConversion}; use sp_std::vec::Vec; use support::{ evm::limits::{erc20, liquidation}, diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml index ed9db086d2..977785bd2d 100644 --- a/modules/evm-utility/Cargo.toml +++ b/modules/evm-utility/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] sha3 = { version = "0.10.6", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } evm = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false, features = ["with-codec"] } evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false } diff --git a/modules/evm/Cargo.toml b/modules/evm/Cargo.toml index 0320a91f09..779c450390 100644 --- a/modules/evm/Cargo.toml +++ b/modules/evm/Cargo.toml @@ -10,6 +10,7 @@ harness = false required-features = ["wasm-bench"] [dependencies] +log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } hex-literal = { version = "0.4.1" } ripemd = { version = "0.1.3", default-features = false } @@ -23,17 +24,17 @@ 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-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } -wasm-bencher = { git = "https://github.com/open-web3-stack/wasm-bencher", version = "0.5.0", default-features = false, optional = true } +wasm-bencher = { git = "https://github.com/open-web3-stack/wasm-bencher", branch = "polkadot-v1.1.0", default-features = false, optional = true } orml-currencies = { path = "../../orml/currencies", default-features = false, optional = true } orml-tokens = { path = "../../orml/tokens", default-features = false, optional = true } @@ -44,16 +45,16 @@ 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-v1.0.0", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # we don't directly depends on this but need frame-benchmarking/std to fix build -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" , default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" , default-features = false, optional = true } [dev-dependencies] hex = "0.4" env_logger = "0.10.0" serde_json = "1.0.81" -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] diff --git a/modules/evm/rpc/runtime_api/Cargo.toml b/modules/evm/rpc/runtime_api/Cargo.toml index 41489efb4b..4dff66d81a 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-v1.0.0", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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 ea660352be..7b98aa1c7b 100644 --- a/modules/evm/src/lib.rs +++ b/modules/evm/src/lib.rs @@ -30,20 +30,18 @@ pub use crate::runner::{ }; use codec::{Decode, Encode, FullCodec, MaxEncodedLen}; use frame_support::{ - dispatch::{ - DispatchError, DispatchErrorWithPostInfo, DispatchResult, DispatchResultWithPostInfo, Pays, PostDispatchInfo, - Weight, - }, + dispatch::{DispatchErrorWithPostInfo, DispatchResult, DispatchResultWithPostInfo, Pays, PostDispatchInfo}, ensure, error::BadOrigin, - log, pallet_prelude::*, parameter_types, traits::{ BalanceStatus, Currency, EitherOfDiverse, EnsureOrigin, ExistenceRequirement, FindAuthor, Get, NamedReservableCurrency, OnKilledAccount, }, - transactional, BoundedVec, RuntimeDebug, + transactional, + weights::Weight, + BoundedVec, }; use frame_system::{ensure_root, ensure_signed, pallet_prelude::*, EnsureRoot, EnsureSigned}; use hex_literal::hex; @@ -72,7 +70,7 @@ use sp_core::{H160, H256, U256}; use sp_runtime::{ traits::{Convert, DispatchInfoOf, One, PostDispatchInfoOf, SignedExtension, UniqueSaturatedInto, Zero}, transaction_validity::TransactionValidityError, - Either, SaturatedConversion, Saturating, TransactionOutcome, + DispatchError, Either, RuntimeDebug, SaturatedConversion, Saturating, TransactionOutcome, }; use sp_std::{cmp, collections::btree_map::BTreeMap, fmt::Debug, marker::PhantomData, prelude::*}; diff --git a/modules/evm/src/runner/mod.rs b/modules/evm/src/runner/mod.rs index 942a0cc120..20a22082e6 100644 --- a/modules/evm/src/runner/mod.rs +++ b/modules/evm/src/runner/mod.rs @@ -21,10 +21,10 @@ pub mod state; pub mod storage_meter; use crate::{BalanceOf, CallInfo, Config, CreateInfo}; -use frame_support::dispatch::DispatchError; use module_evm_utility::evm; pub use primitives::evm::{EvmAddress, Vicinity}; use sp_core::{H160, H256}; +use sp_runtime::DispatchError; use sp_std::vec::Vec; pub trait Runner { diff --git a/modules/evm/src/runner/stack.rs b/modules/evm/src/runner/stack.rs index d8a359147d..e0970d5b8e 100644 --- a/modules/evm/src/runner/stack.rs +++ b/modules/evm/src/runner/stack.rs @@ -27,8 +27,7 @@ use crate::{ AccountStorages, BalanceOf, CallInfo, Config, CreateInfo, Error, ExecutionInfo, Pallet, STORAGE_SIZE, }; use frame_support::{ - dispatch::DispatchError, - ensure, log, + ensure, traits::{Currency, ExistenceRequirement, Get}, transactional, }; @@ -43,7 +42,10 @@ pub use primitives::{ ReserveIdentifier, }; use sp_core::{defer, H160, H256, U256}; -use sp_runtime::traits::{UniqueSaturatedInto, Zero}; +use sp_runtime::{ + traits::{UniqueSaturatedInto, Zero}, + DispatchError, +}; use sp_std::{ boxed::Box, collections::{btree_map::BTreeMap, btree_set::BTreeSet}, diff --git a/modules/evm/src/runner/state.rs b/modules/evm/src/runner/state.rs index f92e86f717..ec5f2d726d 100644 --- a/modules/evm/src/runner/state.rs +++ b/modules/evm/src/runner/state.rs @@ -20,7 +20,6 @@ use crate::{encode_revert_message, StorageMeter}; use core::{cmp::min, convert::Infallible}; -use frame_support::log; use module_evm_utility::{ ethereum::Log, evm::{ diff --git a/modules/evm/src/runner/storage_meter.rs b/modules/evm/src/runner/storage_meter.rs index 1ffcc9e2ae..b7056cdc9d 100644 --- a/modules/evm/src/runner/storage_meter.rs +++ b/modules/evm/src/runner/storage_meter.rs @@ -16,8 +16,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -use frame_support::log; - #[derive(Default, Clone, Debug)] pub struct StorageMeter { limit: u32, diff --git a/modules/evm/src/tests.rs b/modules/evm/src/tests.rs index 624763ff1d..a80447e753 100644 --- a/modules/evm/src/tests.rs +++ b/modules/evm/src/tests.rs @@ -2567,7 +2567,7 @@ fn strict_call_works() { ), Err(DispatchErrorWithPostInfo { post_info: PostDispatchInfo { - actual_weight: Some(Weight::from_parts(1465812680, 7186)), + actual_weight: Some(Weight::from_parts(1464914680, 7186)), pays_fee: Pays::Yes }, error: Error::::NoPermission.into(), @@ -2600,7 +2600,7 @@ fn strict_call_works() { ), Err(DispatchErrorWithPostInfo { post_info: PostDispatchInfo { - actual_weight: Some(Weight::from_parts(1464856382, 7186)), + actual_weight: Some(Weight::from_parts(1463958382, 7186)), pays_fee: Pays::Yes }, error: Error::::StrictCallFailed.into(), diff --git a/modules/homa-validator-list/Cargo.toml b/modules/homa-validator-list/Cargo.toml index f54ad5069f..ede0f4a466 100644 --- a/modules/homa-validator-list/Cargo.toml +++ b/modules/homa-validator-list/Cargo.toml @@ -8,18 +8,18 @@ edition = "2021" serde = { version = "1.0.145", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-tokens = { path = "../../orml/tokens" } orml-currencies = { path = "../../orml/currencies" } diff --git a/modules/homa/Cargo.toml b/modules/homa/Cargo.toml index 86f08bfa1c..502b0000de 100644 --- a/modules/homa/Cargo.toml +++ b/modules/homa/Cargo.toml @@ -5,25 +5,26 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] diff --git a/modules/homa/src/lib.rs b/modules/homa/src/lib.rs index 7696d57e1f..5ac5bcf033 100644 --- a/modules/homa/src/lib.rs +++ b/modules/homa/src/lib.rs @@ -21,7 +21,7 @@ #![cfg_attr(not(feature = "std"), no_std)] #![allow(clippy::unused_unit)] -use frame_support::{log, pallet_prelude::*, transactional, PalletId}; +use frame_support::{pallet_prelude::*, transactional, PalletId}; use frame_system::{ensure_signed, pallet_prelude::*}; use module_support::{ExchangeRate, ExchangeRateProvider, FractionalRate, HomaManager, HomaSubAccountXcm, Rate, Ratio}; use orml_traits::MultiCurrency; diff --git a/modules/homa/src/migrations/v1.rs b/modules/homa/src/migrations/v1.rs index f143a50928..23662ffac7 100644 --- a/modules/homa/src/migrations/v1.rs +++ b/modules/homa/src/migrations/v1.rs @@ -18,7 +18,6 @@ use crate as homa; use frame_support::{ - log, traits::{Get, GetStorageVersion, PalletInfoAccess, StorageVersion}, weights::Weight, }; diff --git a/modules/honzon-bridge/Cargo.toml b/modules/honzon-bridge/Cargo.toml index e731ca7657..e78b7f933a 100644 --- a/modules/honzon-bridge/Cargo.toml +++ b/modules/honzon-bridge/Cargo.toml @@ -7,20 +7,20 @@ edition = "2021" [dependencies] scale-info = { version = "2.9.0", 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-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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.81" hex = "0.4" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } module-currencies = { path = "../../modules/currencies" } module-evm = { path = "../evm" } diff --git a/modules/honzon/Cargo.toml b/modules/honzon/Cargo.toml index c7cec5ed37..57b2faf210 100644 --- a/modules/honzon/Cargo.toml +++ b/modules/honzon/Cargo.toml @@ -7,21 +7,21 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-currencies = { path = "../../orml/currencies" } orml-traits = { path = "../../orml/traits" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/idle-scheduler/Cargo.toml b/modules/idle-scheduler/Cargo.toml index d97bf56a1f..a4a18207c5 100644 --- a/modules/idle-scheduler/Cargo.toml +++ b/modules/idle-scheduler/Cargo.toml @@ -5,18 +5,19 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } scale-info = { version = "2.9.0", 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-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] diff --git a/modules/idle-scheduler/src/lib.rs b/modules/idle-scheduler/src/lib.rs index 13d1c2d33f..304a6e6e38 100644 --- a/modules/idle-scheduler/src/lib.rs +++ b/modules/idle-scheduler/src/lib.rs @@ -26,7 +26,7 @@ use acala_primitives::{task::TaskResult, BlockNumber, Nonce}; use codec::FullCodec; -use frame_support::{log, pallet_prelude::*}; +use frame_support::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 65c7d79754..32567bc417 100644 --- a/modules/incentives/Cargo.toml +++ b/modules/incentives/Cargo.toml @@ -5,21 +5,22 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-tokens = { path = "../../orml/tokens" } orml-rewards = { path = "../../orml/rewards" } diff --git a/modules/incentives/src/lib.rs b/modules/incentives/src/lib.rs index f8b289fb9e..1a7ce5b31a 100644 --- a/modules/incentives/src/lib.rs +++ b/modules/incentives/src/lib.rs @@ -39,7 +39,7 @@ #![allow(clippy::unused_unit)] #![allow(clippy::upper_case_acronyms)] -use frame_support::{log, pallet_prelude::*, transactional, PalletId}; +use frame_support::{pallet_prelude::*, transactional, PalletId}; use frame_system::pallet_prelude::*; use orml_traits::{Happened, MultiCurrency, RewardHandler}; use primitives::{Amount, Balance, CurrencyId}; diff --git a/modules/liquid-crowdloan/Cargo.toml b/modules/liquid-crowdloan/Cargo.toml index f39188692a..bc72679d22 100644 --- a/modules/liquid-crowdloan/Cargo.toml +++ b/modules/liquid-crowdloan/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" scale-info = { version = "2.9.0", 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.38", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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.38" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } module-currencies = { path = "../currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/loans/Cargo.toml b/modules/loans/Cargo.toml index 74de67c860..14f2f2fae3 100644 --- a/modules/loans/Cargo.toml +++ b/modules/loans/Cargo.toml @@ -5,20 +5,21 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } diff --git a/modules/loans/src/lib.rs b/modules/loans/src/lib.rs index 853198645a..2d89ca054a 100644 --- a/modules/loans/src/lib.rs +++ b/modules/loans/src/lib.rs @@ -27,7 +27,7 @@ #![allow(clippy::unused_unit)] #![allow(clippy::collapsible_if)] -use frame_support::{log, pallet_prelude::*, transactional, PalletId}; +use frame_support::{pallet_prelude::*, transactional, PalletId}; use orml_traits::{Happened, MultiCurrency, MultiCurrencyExtended}; use primitives::{Amount, Balance, CurrencyId, Position}; use sp_runtime::{ diff --git a/modules/nft/Cargo.toml b/modules/nft/Cargo.toml index 70b5d111e9..e425b46e25 100644 --- a/modules/nft/Cargo.toml +++ b/modules/nft/Cargo.toml @@ -9,22 +9,22 @@ serde = { version = "1.0.145", default-features = false, features = ["alloc", "d 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-v1.0.0", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-tokens = { path = "../../orml/tokens" } module-currencies = { path = "../../modules/currencies" } diff --git a/modules/nft/src/benchmarking.rs b/modules/nft/src/benchmarking.rs index aa2f577015..01081609cc 100644 --- a/modules/nft/src/benchmarking.rs +++ b/modules/nft/src/benchmarking.rs @@ -159,12 +159,12 @@ mod mock { use frame_support::{ parameter_types, traits::{ConstU128, ConstU32, ConstU64, Contains, InstanceFilter}, - PalletId, RuntimeDebug, + PalletId, }; use sp_core::{crypto::AccountId32, H256}; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - BuildStorage, + BuildStorage, RuntimeDebug, }; pub type AccountId = AccountId32; diff --git a/modules/nft/src/mock.rs b/modules/nft/src/mock.rs index 20811099f7..b2568750c0 100644 --- a/modules/nft/src/mock.rs +++ b/modules/nft/src/mock.rs @@ -25,7 +25,6 @@ use codec::{Decode, Encode}; use frame_support::{ construct_runtime, ord_parameter_types, parameter_types, traits::{ConstU128, ConstU32, ConstU64, Contains, InstanceFilter, Nothing}, - RuntimeDebug, }; use frame_system::EnsureSignedBy; use orml_traits::parameter_type_with_key; @@ -33,7 +32,7 @@ use primitives::{Amount, Balance, CurrencyId, ReserveIdentifier, TokenSymbol}; use sp_core::{crypto::AccountId32, H160, H256}; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - BuildStorage, + BuildStorage, RuntimeDebug, }; use support::mocks::MockAddressMapping; diff --git a/modules/nominees-election/Cargo.toml b/modules/nominees-election/Cargo.toml index 8d4ea8717d..e0a0869743 100644 --- a/modules/nominees-election/Cargo.toml +++ b/modules/nominees-election/Cargo.toml @@ -5,20 +5,21 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/nominees-election/src/lib.rs b/modules/nominees-election/src/lib.rs index 344dff6957..9f91bdb1c2 100644 --- a/modules/nominees-election/src/lib.rs +++ b/modules/nominees-election/src/lib.rs @@ -20,7 +20,6 @@ #![allow(clippy::unused_unit)] use frame_support::{ - log, pallet_prelude::*, traits::{Contains, Get, LockIdentifier}, BoundedVec, diff --git a/modules/prices/Cargo.toml b/modules/prices/Cargo.toml index e72efebd41..4795aa2c9f 100644 --- a/modules/prices/Cargo.toml +++ b/modules/prices/Cargo.toml @@ -7,17 +7,17 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-tokens = { path = "../../orml/tokens" } [features] diff --git a/modules/relaychain/Cargo.toml b/modules/relaychain/Cargo.toml index 0bb24adcdb..80a3f6dbe3 100644 --- a/modules/relaychain/Cargo.toml +++ b/modules/relaychain/Cargo.toml @@ -6,18 +6,18 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] diff --git a/modules/relaychain/src/lib.rs b/modules/relaychain/src/lib.rs index 3b3d160936..72f1cc14b5 100644 --- a/modules/relaychain/src/lib.rs +++ b/modules/relaychain/src/lib.rs @@ -25,9 +25,9 @@ #![allow(clippy::large_enum_variant)] use codec::{Decode, Encode, FullCodec}; -use sp_runtime::traits::StaticLookup; +use sp_runtime::{traits::StaticLookup, RuntimeDebug}; -use frame_support::{traits::Get, RuntimeDebug}; +use frame_support::traits::Get; use module_support::relaychain::*; use primitives::{AccountId, Balance}; use sp_std::{boxed::Box, marker::PhantomData, prelude::*}; diff --git a/modules/session-manager/Cargo.toml b/modules/session-manager/Cargo.toml index 07be20bc40..7b631e47e5 100644 --- a/modules/session-manager/Cargo.toml +++ b/modules/session-manager/Cargo.toml @@ -8,15 +8,15 @@ edition = "2021" log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std= { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] diff --git a/modules/support/Cargo.toml b/modules/support/Cargo.toml index 7c1e13729f..e7d6e490d2 100644 --- a/modules/support/Cargo.toml +++ b/modules/support/Cargo.toml @@ -10,13 +10,13 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } serde = { version = "1.0.145", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } orml-tokens = { path = "../../orml/tokens", 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" } diff --git a/modules/support/src/relaychain.rs b/modules/support/src/relaychain.rs index 052aaf0b51..52a77915d7 100644 --- a/modules/support/src/relaychain.rs +++ b/modules/support/src/relaychain.rs @@ -20,9 +20,11 @@ // * https://github.com/paritytech/polkadot/blob/master/runtime/polkadot/src/xcm_config.rs use codec::{Decode, Encode, FullCodec}; -use frame_support::RuntimeDebug; use primitives::{AccountId, Balance}; -use sp_runtime::traits::{AccountIdLookup, StaticLookup}; +use sp_runtime::{ + traits::{AccountIdLookup, StaticLookup}, + RuntimeDebug, +}; use sp_std::prelude::*; use xcm::{prelude::*, v3::Weight as XcmWeight}; diff --git a/modules/transaction-pause/Cargo.toml b/modules/transaction-pause/Cargo.toml index 9470aee0f4..2a79869fef 100644 --- a/modules/transaction-pause/Cargo.toml +++ b/modules/transaction-pause/Cargo.toml @@ -5,19 +5,20 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } hex-literal = "0.4.1" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-tokens = { path = "../../orml/tokens" } orml-traits = { path = "../../orml/traits" } primitives = { package = "acala-primitives", path = "../../primitives" } diff --git a/modules/transaction-pause/src/lib.rs b/modules/transaction-pause/src/lib.rs index b8c267a2e6..a5ef623f61 100644 --- a/modules/transaction-pause/src/lib.rs +++ b/modules/transaction-pause/src/lib.rs @@ -20,9 +20,8 @@ #![allow(clippy::unused_unit)] use frame_support::{ - dispatch::{CallMetadata, GetCallMetadata}, pallet_prelude::*, - traits::{Contains, PalletInfoAccess}, + traits::{CallMetadata, Contains, GetCallMetadata, PalletInfoAccess}, }; use frame_system::pallet_prelude::*; use sp_core::H160; diff --git a/modules/transaction-pause/src/migrations.rs b/modules/transaction-pause/src/migrations.rs index d9f8043da8..80928a59e8 100644 --- a/modules/transaction-pause/src/migrations.rs +++ b/modules/transaction-pause/src/migrations.rs @@ -17,7 +17,7 @@ // along with this program. If not, see . use crate::{Config, PausedEvmPrecompiles, Weight, H160}; -use frame_support::{log, traits::OnRuntimeUpgrade}; +use frame_support::traits::OnRuntimeUpgrade; use hex_literal::hex; use sp_core::Get; use sp_std::{marker::PhantomData, vec}; diff --git a/modules/transaction-payment/Cargo.toml b/modules/transaction-payment/Cargo.toml index 99f6791120..fbf6497f2f 100644 --- a/modules/transaction-payment/Cargo.toml +++ b/modules/transaction-payment/Cargo.toml @@ -7,22 +7,22 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io= { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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-v1.0.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-tokens = { path = "../../orml/tokens" } module-currencies = { path = "../../modules/currencies" } module-dex = { path = "../dex" } diff --git a/modules/transaction-payment/src/lib.rs b/modules/transaction-payment/src/lib.rs index 94f77224ff..279fdbfbce 100644 --- a/modules/transaction-payment/src/lib.rs +++ b/modules/transaction-payment/src/lib.rs @@ -29,8 +29,7 @@ #![allow(clippy::type_complexity)] use frame_support::{ - dispatch::{DispatchInfo, GetDispatchInfo, Pays, PostDispatchInfo}, - dispatch::{DispatchResult, Dispatchable}, + dispatch::{DispatchInfo, DispatchResult, GetDispatchInfo, Pays, PostDispatchInfo}, pallet_prelude::*, traits::{ Currency, ExistenceRequirement, Imbalance, IsSubType, NamedReservableCurrency, OnUnbalanced, SameOrOther, @@ -48,8 +47,8 @@ use primitives::{Balance, CurrencyId, Multiplier, ReserveIdentifier}; use scale_info::TypeInfo; use sp_runtime::{ traits::{ - AccountIdConversion, Convert, DispatchInfoOf, One, PostDispatchInfoOf, SaturatedConversion, Saturating, - SignedExtension, Zero, + AccountIdConversion, Convert, DispatchInfoOf, Dispatchable, One, PostDispatchInfoOf, SaturatedConversion, + Saturating, SignedExtension, Zero, }, transaction_validity::{ InvalidTransaction, TransactionPriority, TransactionValidity, TransactionValidityError, ValidTransaction, diff --git a/modules/xcm-interface/Cargo.toml b/modules/xcm-interface/Cargo.toml index a45280f095..2b225d0a2a 100644 --- a/modules/xcm-interface/Cargo.toml +++ b/modules/xcm-interface/Cargo.toml @@ -5,16 +5,17 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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 } @@ -22,11 +23,11 @@ module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] insta = { version = "1.31.0" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/xcm-interface/src/lib.rs b/modules/xcm-interface/src/lib.rs index 73cedea50a..6e1139d186 100644 --- a/modules/xcm-interface/src/lib.rs +++ b/modules/xcm-interface/src/lib.rs @@ -27,7 +27,7 @@ #![cfg_attr(not(feature = "std"), no_std)] #![allow(clippy::unused_unit)] -use frame_support::{log, pallet_prelude::*, traits::Get}; +use frame_support::{pallet_prelude::*, traits::Get}; use frame_system::pallet_prelude::*; use module_support::{relaychain::CallBuilder, CrowdloanVaultXcm, HomaSubAccountXcm}; use orml_traits::XcmTransfer; diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 0c70fd7127..bf7d5aaafb 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -6,34 +6,34 @@ edition = "2021" [dependencies] log = "0.4.17" -clap = { version = "4.2.4", features = ["derive"] } +clap = { version = "4.4.2", features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.4.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", optional = true } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", optional = true } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", optional = true } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", optional = true } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", optional = true } +sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", optional = true } +try-runtime-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", optional = true } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } +cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } inspect = { package = "acala-inspect", path = "../../inspect" } service = { package = "acala-service", path = "../service", default-features = false, optional = true } [build-dependencies] orml-build-script-utils = { path = "../../orml/build-script-utils" } -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = [ "cli" ] diff --git a/node/e2e-tests/test-service/Cargo.toml b/node/e2e-tests/test-service/Cargo.toml index a96d09f457..81c775d480 100644 --- a/node/e2e-tests/test-service/Cargo.toml +++ b/node/e2e-tests/test-service/Cargo.toml @@ -21,64 +21,64 @@ rlp = "0.5.2" sha3 = "0.10" # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-rpc-server = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +substrate-test-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # Cumulus dependencies -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-pov-recovery = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-pov-recovery = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } runtime-common = { path = "../../../runtime/common" } node-runtime = { package = "mandala-runtime", path = "../../../runtime/mandala" } @@ -99,5 +99,5 @@ orml-traits = { path = "../../../orml/traits" } portpicker = "0.1.1" # Substrate dependencies -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +substrate-test-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } diff --git a/node/e2e-tests/test-service/src/builder.rs b/node/e2e-tests/test-service/src/builder.rs index 2efee31e98..7ac2c81e0e 100644 --- a/node/e2e-tests/test-service/src/builder.rs +++ b/node/e2e-tests/test-service/src/builder.rs @@ -197,7 +197,7 @@ impl TestNodeBuilder { ); let collator_options = CollatorOptions { - relay_chain_rpc_urls: self.relay_chain_full_node_url, + relay_chain_mode: cumulus_client_cli::RelayChainMode::ExternalRpc(self.relay_chain_full_node_url), }; relay_chain_config.network.node_name = format!("{} (relay chain)", relay_chain_config.network.node_name); diff --git a/node/e2e-tests/test-service/src/lib.rs b/node/e2e-tests/test-service/src/lib.rs index 90042b830f..7709b154ca 100644 --- a/node/e2e-tests/test-service/src/lib.rs +++ b/node/e2e-tests/test-service/src/lib.rs @@ -33,18 +33,20 @@ use std::{ }; use cumulus_client_cli::{generate_genesis_block, CollatorOptions}; -use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; +#[allow(deprecated)] +use cumulus_client_consensus_aura::BuildAuraConsensusParams; +use cumulus_client_consensus_aura::{AuraConsensus, SlotProportion}; use cumulus_client_consensus_common::{ ParachainBlockImport as TParachainBlockImport, ParachainCandidate, ParachainConsensus, }; use cumulus_client_network::RequireSecondedInBlockAnnounce; -use cumulus_client_service::{ - prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, -}; +use cumulus_client_service::{prepare_node_config, StartCollatorParams, StartFullNodeParams}; +#[allow(deprecated)] +use cumulus_client_service::{start_collator, start_full_node}; use cumulus_primitives_core::ParaId; use cumulus_relay_chain_inprocess_interface::RelayChainInProcessInterface; use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; -use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node; +use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node_with_rpc; use crate::runtime::Weight; use frame_system_rpc_runtime_api::AccountNonceApi; @@ -70,8 +72,8 @@ use sc_service::{ TFullBackend, TFullCallExecutor, TFullClient, TaskManager, }; use sc_transaction_pool_api::TransactionPool; +use sp_api::OverlayedChanges; use sp_api::ProvideRuntimeApi; -use sp_api::{OverlayedChanges, StorageTransactionCache}; use sp_arithmetic::traits::SaturatedConversion; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; use sp_core::{Pair, H256}; @@ -79,12 +81,11 @@ use sp_keyring::Sr25519Keyring; use sp_runtime::{ codec::Encode, generic::Era, - traits::{BlakeTwo256, Block as BlockT, Extrinsic, IdentifyAccount}, + traits::{Block as BlockT, Extrinsic, IdentifyAccount}, transaction_validity::TransactionSource, MultiAddress, }; use sp_state_machine::{BasicExternalities, Ext}; -use sp_trie::PrefixedMemoryDB; use substrate_test_client::{BlockchainEventsExt, RpcHandlersExt, RpcTransactionError, RpcTransactionOutput}; use url::Url; diff --git a/node/e2e-tests/test-service/src/node.rs b/node/e2e-tests/test-service/src/node.rs index 25248cbdff..aa4c6aedaa 100644 --- a/node/e2e-tests/test-service/src/node.rs +++ b/node/e2e-tests/test-service/src/node.rs @@ -128,14 +128,13 @@ impl TestNode { let hash = self.client.info().best_hash; let number = self.client.info().best_number.saturated_into(); let mut overlay = OverlayedChanges::default(); - let mut cache = StorageTransactionCache:: as Backend>::State>::default(); let mut extensions = self.client.execution_extensions().extensions(hash, number); let state_backend = self .backend .state_at(hash) .unwrap_or_else(|_| panic!("State at block {} not found", hash)); - let mut ext = Ext::new(&mut overlay, &mut cache, &state_backend, Some(&mut extensions)); + let mut ext = Ext::new(&mut overlay, &state_backend, Some(&mut extensions)); sp_externalities::set_and_run_with_externalities(&mut ext, closure) } diff --git a/node/e2e-tests/test-service/src/service.rs b/node/e2e-tests/test-service/src/service.rs index 3eba417fb1..10209f828d 100644 --- a/node/e2e-tests/test-service/src/service.rs +++ b/node/e2e-tests/test-service/src/service.rs @@ -36,7 +36,7 @@ pub fn new_partial( Client, ParachainBackend, MaybeFullSelectChain, - sc_consensus::import_queue::BasicQueue>, + sc_consensus::import_queue::BasicQueue, sc_transaction_pool::FullPool, ParachainBlockImport, >, @@ -417,8 +417,8 @@ async fn build_relay_chain_interface( collator_options: CollatorOptions, task_manager: &mut TaskManager, ) -> RelayChainResult> { - if !collator_options.relay_chain_rpc_urls.is_empty() { - return build_minimal_relay_chain_node(relay_chain_config, task_manager, collator_options.relay_chain_rpc_urls) + if let cumulus_client_cli::RelayChainMode::ExternalRpc(rpc_target_urls) = collator_options.relay_chain_mode { + return build_minimal_relay_chain_node_with_rpc(relay_chain_config, task_manager, rpc_target_urls) .await .map(|r| r.0); } @@ -426,9 +426,9 @@ async fn build_relay_chain_interface( let relay_chain_full_node = polkadot_test_service::new_full( relay_chain_config, if let Some(ref key) = collator_key { - polkadot_service::IsCollator::Yes(key.clone()) + polkadot_service::IsParachainNode::Collator(key.clone()) } else { - polkadot_service::IsCollator::Yes(CollatorPair::generate().0) + polkadot_service::IsParachainNode::Collator(CollatorPair::generate().0) }, None, ) @@ -626,6 +626,7 @@ where None, ); + #[allow(deprecated)] AuraConsensus::build::( BuildAuraConsensusParams { proposer_factory, @@ -690,6 +691,7 @@ where sync_service: sync_service.clone(), }; + #[allow(deprecated)] start_collator(params).await?; } else { let params = StartFullNodeParams { @@ -707,6 +709,7 @@ where sync_service: sync_service.clone(), }; + #[allow(deprecated)] start_full_node(params)?; } diff --git a/node/e2e-tests/test-service/tests/parachain.rs b/node/e2e-tests/test-service/tests/parachain.rs index 6b6af231c1..7abb67a0d5 100644 --- a/node/e2e-tests/test-service/tests/parachain.rs +++ b/node/e2e-tests/test-service/tests/parachain.rs @@ -24,7 +24,7 @@ use test_service::{initial_head_data, run_relay_chain_validator_node}; /// this testcase will take too long to running, test with command: /// cargo test --package test-service -- test_full_node_catching_up --nocapture --include-ignored -#[substrate_test_utils::test(flavor = "multi_thread")] +#[tokio::test(flavor = "multi_thread")] #[ignore] async fn test_full_node_catching_up() { let mut builder = sc_cli::LoggerBuilder::new(""); @@ -83,7 +83,7 @@ async fn test_full_node_catching_up() { /// this testcase will take too long to running, test with command: /// cargo test --package test-service -- simple_balances_test --nocapture --include-ignored -#[substrate_test_utils::test(flavor = "multi_thread")] +#[tokio::test(flavor = "multi_thread")] #[ignore] async fn simple_balances_test() { let mut builder = sc_cli::LoggerBuilder::new(""); diff --git a/node/e2e-tests/test-service/tests/standalone.rs b/node/e2e-tests/test-service/tests/standalone.rs index 1c6ba301cf..79412607a7 100644 --- a/node/e2e-tests/test-service/tests/standalone.rs +++ b/node/e2e-tests/test-service/tests/standalone.rs @@ -30,7 +30,7 @@ use sp_runtime::FixedPointNumber; use sp_runtime::{traits::IdentifyAccount, MultiAddress, MultiSigner}; use test_service::{ensure_event, SealMode}; -#[substrate_test_utils::test(flavor = "multi_thread")] +#[tokio::test(flavor = "multi_thread")] #[ignore] // TODO: Wasm binary must be built for testing, https://github.com/paritytech/polkadot/blob/3cf644abad63c4a177f0697683b72a64c4706852/node/test/service/src/chain_spec.rs#L119 async fn simple_balances_dev_test() { let mut builder = sc_cli::LoggerBuilder::new(""); @@ -64,7 +64,7 @@ async fn simple_balances_dev_test() { assert_eq!(old_balance + amount, new_balance); } -#[substrate_test_utils::test(flavor = "multi_thread")] +#[tokio::test(flavor = "multi_thread")] #[ignore] async fn transaction_pool_priority_order_test() { let mut builder = sc_cli::LoggerBuilder::new(""); @@ -203,7 +203,7 @@ async fn transaction_pool_priority_order_test() { /// this testcase will take too long to run, test with command: /// cargo test --release --package test-service -- evm_fill_block_test --nocapture --include-ignored -#[substrate_test_utils::test(flavor = "multi_thread")] +#[tokio::test(flavor = "multi_thread")] #[ignore] async fn evm_fill_block_test() { let mut builder = sc_cli::LoggerBuilder::new(""); @@ -269,7 +269,7 @@ async fn evm_fill_block_test() { /// this testcase will take too long to run, test with command: /// cargo test --release --package test-service -- evm_create_fill_block_test --nocapture /// --include-ignored -#[substrate_test_utils::test(flavor = "multi_thread")] +#[tokio::test(flavor = "multi_thread")] #[ignore] async fn evm_create_fill_block_test() { /* @@ -322,7 +322,7 @@ async fn evm_create_fill_block_test() { /// this testcase will take too long to run, test with command: /// cargo test --release --package test-service -- evm_gas_limit_test --nocapture --include-ignored -#[substrate_test_utils::test(flavor = "multi_thread")] +#[tokio::test(flavor = "multi_thread")] #[ignore] async fn evm_gas_limit_test() { /* diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 2a81a81c1e..fb4d373110 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -20,66 +20,66 @@ coins-bip39 = "0.7.0" k256 = { version = "0.11.5", default-features = false, features = ["keccak256", "ecdsa", "std"] } tiny-keccak = { version = "2.0", features = ["keccak"] } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } acala-primitives = { path = "../../primitives" } acala-rpc = { path = "../../rpc" } diff --git a/node/service/src/client.rs b/node/service/src/client.rs index 917676bedf..3e37b58b00 100644 --- a/node/service/src/client.rs +++ b/node/service/src/client.rs @@ -42,13 +42,10 @@ pub trait RuntimeApiCollection: + sp_offchain::OffchainWorkerApi + sp_session::SessionKeys + cumulus_primitives_core::CollectCollationInfo -where - >::StateBackend: sp_api::StateBackend, { } -impl RuntimeApiCollection for Api -where +impl RuntimeApiCollection for Api where Api: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::ApiExt + sp_block_builder::BlockBuilder @@ -57,8 +54,7 @@ where + sp_api::Metadata + sp_offchain::OffchainWorkerApi + sp_session::SessionKeys - + cumulus_primitives_core::CollectCollationInfo, - >::StateBackend: sp_api::StateBackend, + + cumulus_primitives_core::CollectCollationInfo { } @@ -77,7 +73,7 @@ where Block: BlockT, Backend: BackendT, Backend::State: sp_api::StateBackend, - Self::Api: RuntimeApiCollection, + Self::Api: RuntimeApiCollection, { } @@ -93,7 +89,7 @@ where + Send + Sync + CallApiAt, - Client::Api: RuntimeApiCollection, + Client::Api: RuntimeApiCollection, { } @@ -117,10 +113,9 @@ pub trait ExecuteWithClient { /// Execute whatever should be executed with the given client instance. fn execute_with_client(self, client: Arc) -> Self::Output where - >::StateBackend: sp_api::StateBackend, Backend: sc_client_api::Backend, Backend::State: sp_api::StateBackend, - Api: crate::RuntimeApiCollection, + Api: crate::RuntimeApiCollection, Client: AbstractClient + 'static; } diff --git a/node/service/src/instant_finalize.rs b/node/service/src/instant_finalize.rs index 1d604024bc..863abb0560 100644 --- a/node/service/src/instant_finalize.rs +++ b/node/service/src/instant_finalize.rs @@ -35,7 +35,6 @@ where I: BlockImport + Send, { type Error = I::Error; - type Transaction = I::Transaction; async fn check_block( &mut self, @@ -46,7 +45,7 @@ where async fn import_block( &mut self, - mut block_import_params: sc_consensus::BlockImportParams, + mut block_import_params: sc_consensus::BlockImportParams, ) -> Result { block_import_params.finalized = true; self.0.import_block(block_import_params).await diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 8f1ddc69a5..a3528e8c96 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -23,17 +23,19 @@ pub use acala_primitives::{Block, Hash}; use cumulus_client_cli::CollatorOptions; -use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; +#[allow(deprecated)] +use cumulus_client_consensus_aura::BuildAuraConsensusParams; +use cumulus_client_consensus_aura::{AuraConsensus, SlotProportion}; use cumulus_client_consensus_common::{ParachainBlockImport as TParachainBlockImport, ParachainConsensus}; use cumulus_client_network::RequireSecondedInBlockAnnounce; -use cumulus_client_service::{ - prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, -}; +use cumulus_client_service::{prepare_node_config, StartCollatorParams, StartFullNodeParams}; +#[allow(deprecated)] +use cumulus_client_service::{start_collator, start_full_node}; use cumulus_primitives_core::ParaId; use cumulus_primitives_parachain_inherent::{MockValidationDataInherentDataProvider, MockXcmConfig}; use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; use cumulus_relay_chain_interface::{RelayChainInterface, RelayChainResult}; -use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node; +use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node_with_rpc; use futures::{channel::oneshot, FutureExt, StreamExt}; use jsonrpsee::RpcModule; use polkadot_primitives::{CollatorPair, OccupiedCoreAssumption}; @@ -57,8 +59,7 @@ use sp_blockchain::HeaderBackend; use sp_consensus_aura::sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair}; use sp_core::Decode; use sp_keystore::KeystorePtr; -use sp_runtime::traits::{BlakeTwo256, Block as BlockT}; -use sp_trie::PrefixedMemoryDB; +use sp_runtime::traits::Block as BlockT; use std::{sync::Arc, time::Duration}; use substrate_prometheus_endpoint::Registry; @@ -194,7 +195,7 @@ pub fn new_partial( FullClient, FullBackend, MaybeFullSelectChain, - sc_consensus::import_queue::BasicQueue>, + sc_consensus::import_queue::BasicQueue, sc_transaction_pool::FullPool>, ( ParachainBlockImport, @@ -206,7 +207,7 @@ pub fn new_partial( > where RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - RuntimeApi::RuntimeApi: RuntimeApiCollection>, + RuntimeApi::RuntimeApi: RuntimeApiCollection, RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, { let telemetry = config @@ -370,8 +371,8 @@ async fn build_relay_chain_interface( task_manager: &mut TaskManager, collator_options: CollatorOptions, ) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option)> { - if !collator_options.relay_chain_rpc_urls.is_empty() { - build_minimal_relay_chain_node(polkadot_config, task_manager, collator_options.relay_chain_rpc_urls).await + if let cumulus_client_cli::RelayChainMode::ExternalRpc(rpc_target_urls) = collator_options.relay_chain_mode { + build_minimal_relay_chain_node_with_rpc(polkadot_config, task_manager, rpc_target_urls).await } else { build_inprocess_relay_chain( polkadot_config, @@ -400,7 +401,7 @@ async fn start_node_impl( where RB: Fn(Arc>) -> Result, sc_service::Error> + Send + 'static, RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - RuntimeApi::RuntimeApi: RuntimeApiCollection>, + RuntimeApi::RuntimeApi: RuntimeApiCollection, RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, BIC: FnOnce( Arc>, @@ -559,6 +560,7 @@ where sync_service: sync_service.clone(), }; + #[allow(deprecated)] start_collator(params).await?; } else { let params = StartFullNodeParams { @@ -573,6 +575,7 @@ where sync_service: sync_service.clone(), }; + #[allow(deprecated)] start_full_node(params)?; } @@ -590,7 +593,7 @@ pub async fn start_node( ) -> sc_service::error::Result<(TaskManager, Arc>)> where RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - RuntimeApi::RuntimeApi: RuntimeApiCollection>, + RuntimeApi::RuntimeApi: RuntimeApiCollection, RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, { start_node_impl( @@ -619,6 +622,7 @@ where telemetry.clone(), ); + #[allow(deprecated)] Ok(AuraConsensus::build::< sp_consensus_aura::sr25519::AuthorityPair, _, @@ -686,7 +690,7 @@ pub fn new_chain_ops( ( Arc, Arc, - sc_consensus::import_queue::BasicQueue>, + sc_consensus::import_queue::BasicQueue, TaskManager, ), ServiceError, @@ -740,7 +744,7 @@ pub fn new_chain_ops( pub fn start_dev_node(config: Configuration, instant_sealing: bool) -> Result where RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - RuntimeApi::RuntimeApi: RuntimeApiCollection>, + RuntimeApi::RuntimeApi: RuntimeApiCollection, RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, { let sc_service::PartialComponents { diff --git a/orml b/orml index 22a4f7b7d1..b3694e631d 160000 --- a/orml +++ b/orml @@ -1 +1 @@ -Subproject commit 22a4f7b7d1066c1a138222f4546d527d32aa4047 +Subproject commit b3694e631df7f1ca16b1973122937753fcdee9d4 diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index a7612743b5..7b1b5333bb 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -5,6 +5,7 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] +log = { version = "0.4.17", default-features = false } hex-literal = "0.4.1" bstringify = "0.1.2" serde = { version = "1.0.145", default-features = false, features = ["alloc", "derive"] } @@ -14,13 +15,13 @@ scale-info = { version = "2.1", default-features = false, features = ["derive"] enumflags2 = { version = "0.7.7", features = ["serde"] } paste = "1.0" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } orml-traits = { path = "../orml/traits", default-features = false } diff --git a/primitives/src/bonding/controller.rs b/primitives/src/bonding/controller.rs index 85bdc68f7b..e0ae602d51 100644 --- a/primitives/src/bonding/controller.rs +++ b/primitives/src/bonding/controller.rs @@ -17,12 +17,8 @@ // along with this program. If not, see . use codec::Codec; -use frame_support::{ - dispatch::{DispatchError, DispatchResult}, - pallet_prelude::Member, - traits::Get, - Parameter, StorageMap, -}; +use frame_support::{dispatch::DispatchResult, pallet_prelude::Member, traits::Get, Parameter, StorageMap}; +use sp_runtime::DispatchError; use sp_std::prelude::*; use super::error::Error; diff --git a/primitives/src/bonding/error.rs b/primitives/src/bonding/error.rs index ee02c4d1ed..365d049a7e 100644 --- a/primitives/src/bonding/error.rs +++ b/primitives/src/bonding/error.rs @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -use frame_support::RuntimeDebug; +use sp_runtime::RuntimeDebug; #[derive(PartialEq, Eq, RuntimeDebug)] pub enum Error { diff --git a/primitives/src/bonding/ledger.rs b/primitives/src/bonding/ledger.rs index 8ad6d21153..1b199865bf 100644 --- a/primitives/src/bonding/ledger.rs +++ b/primitives/src/bonding/ledger.rs @@ -203,9 +203,10 @@ where mod tests { use super::*; use frame_support::{ - assert_err, bounded_vec, + assert_err, traits::{ConstU128, ConstU32}, }; + use sp_runtime::bounded_vec; type Ledger = BondingLedger, ConstU128<10>>; diff --git a/primitives/src/nft.rs b/primitives/src/nft.rs index 9ea37dfa8e..0dd8724152 100644 --- a/primitives/src/nft.rs +++ b/primitives/src/nft.rs @@ -20,7 +20,7 @@ use codec::{Decode, Encode}; use scale_info::{build::Fields, meta_type, Path, Type, TypeInfo, TypeParameter}; use serde::{Deserialize, Serialize}; -use frame_support::RuntimeDebug; +use sp_runtime::RuntimeDebug; use sp_std::{collections::btree_map::BTreeMap, prelude::*}; use enumflags2::{bitflags, BitFlags}; diff --git a/primitives/src/unchecked_extrinsic.rs b/primitives/src/unchecked_extrinsic.rs index d42e7f635c..64d2fbd079 100644 --- a/primitives/src/unchecked_extrinsic.rs +++ b/primitives/src/unchecked_extrinsic.rs @@ -20,7 +20,6 @@ use crate::{evm::EthereumTransactionMessage, signature::AcalaMultiSignature, to_ use codec::{Decode, Encode}; use frame_support::{ dispatch::{DispatchInfo, GetDispatchInfo}, - log, traits::{ExtrinsicCall, Get}, }; use module_evm_utility::ethereum::{EIP1559TransactionMessage, LegacyTransactionMessage, TransactionAction}; diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 5f1fde5fd2..dfc73f67f4 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -9,16 +9,16 @@ futures = "0.3.28" jsonrpsee = { version = "0.16.2", features = ["server", "macros"] } codec = { package = "parity-scale-codec", version = "3.4.0" } primitives = { package = "acala-primitives", path = "../primitives" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } runtime-common = { path = "../runtime/common" } diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml index 2be45b4df3..cc87888bc4 100644 --- a/runtime/acala/Cargo.toml +++ b/runtime/acala/Cargo.toml @@ -6,6 +6,7 @@ edition = "2021" build = "build.rs" [dependencies] +log = { version = "0.4.17", default-features = false } smallvec = "1.4.0" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } @@ -14,62 +15,62 @@ hex = { version = "0.4", default-features = false } hex-literal = { version = "0.4.1" } # substrate -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["historical"] } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, features = ["historical"] } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -129,16 +130,16 @@ 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-v1.0.0", default-features = false, optional = true } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } -pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +pallet-bags-list = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", optional = true } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] @@ -346,6 +347,7 @@ try-runtime = [ "pallet-transaction-payment/try-runtime", "pallet-treasury/try-runtime", "pallet-utility/try-runtime", + "pallet-bags-list/try-runtime", "cumulus-pallet-aura-ext/try-runtime", "cumulus-pallet-dmp-queue/try-runtime", diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index be9c5008f0..7c4e54c522 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -43,6 +43,7 @@ use sp_runtime::{ }, transaction_validity::{TransactionSource, TransactionValidity}, ApplyExtrinsicResult, ArithmeticError, DispatchResult, FixedPointNumber, Perbill, Percent, Permill, Perquintill, + RuntimeDebug, }; use sp_std::prelude::*; #[cfg(feature = "std")] @@ -68,7 +69,7 @@ use orml_utilities::simulate_execution; use pallet_transaction_payment::RuntimeDispatchInfo; pub use frame_support::{ - construct_runtime, log, + construct_runtime, pallet_prelude::InvalidTransaction, parameter_types, traits::{ @@ -77,7 +78,7 @@ pub use frame_support::{ KeyOwnerProofSystem, LockIdentifier, Nothing, OnRuntimeUpgrade, OnUnbalanced, Randomness, SortedMembers, }, weights::{constants::RocksDbWeight, ConstantMultiplier, IdentityFee, Weight}, - PalletId, RuntimeDebug, StorageValue, + PalletId, StorageValue, }; pub use pallet_collective::MemberCount; @@ -2205,10 +2206,10 @@ sp_api::impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark as frame_add_benchmark, TrackedStorageKey}; + use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark as frame_add_benchmark}; use module_nft::benchmarking::Pallet as NftBench; + use frame_support::traits::{WhitelistedStorageKeys, TrackedStorageKey}; - use frame_support::traits::WhitelistedStorageKeys; let mut whitelist: Vec = AllPalletsWithSystem::whitelisted_storage_keys(); // Treasury Account diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index ccff1f3ec6..e4751233ee 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -20,31 +20,31 @@ ethabi = { version = "18.0.0", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["tuples-96"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, features = ["tuples-96"] } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # cumulus -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # modules module-currencies = { path = "../../modules/currencies", default-features = false } @@ -75,13 +75,13 @@ orml-oracle = { path = "../../orml/oracle", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } orml-xtokens = { path = "../../orml/xtokens", default-features = false } -wasm-bencher = { git = "https://github.com/open-web3-stack/wasm-bencher", version = "0.5.0", default-features = false, optional = true } +wasm-bencher = { git = "https://github.com/open-web3-stack/wasm-bencher", branch = "polkadot-v1.1.0", default-features = false, optional = true } orml-nft = { path = "../../orml/nft", default-features = false, optional = true } orml-currencies = { path = "../../orml/currencies", default-features = false, optional = true } orml-rewards = { path = "../../orml/rewards", default-features = false, optional = true } [dev-dependencies] -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } orml-utilities = { path = "../../orml/utilities" } [features] diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 74a2e1770c..df38dad0a5 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -24,11 +24,13 @@ use codec::{Decode, Encode, MaxEncodedLen}; use cumulus_pallet_parachain_system::CheckAssociatedRelayNumber; use frame_support::{ - dispatch::{DispatchClass, Weight}, + dispatch::DispatchClass, parameter_types, traits::{Contains, EitherOfDiverse, Get}, - weights::constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND}, - RuntimeDebug, + weights::{ + constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND}, + Weight, + }, }; use frame_system::{limits, EnsureRoot}; use orml_traits::{currency::MutationHooks, GetByKey}; @@ -39,7 +41,7 @@ use primitives::{ }; use scale_info::TypeInfo; use sp_core::{Bytes, H160}; -use sp_runtime::{traits::Convert, transaction_validity::TransactionPriority, Perbill}; +use sp_runtime::{traits::Convert, transaction_validity::TransactionPriority, Perbill, RuntimeDebug}; use sp_std::{marker::PhantomData, prelude::*}; use static_assertions::const_assert; diff --git a/runtime/common/src/mock.rs b/runtime/common/src/mock.rs index fbc2f20d2d..32b20797c2 100644 --- a/runtime/common/src/mock.rs +++ b/runtime/common/src/mock.rs @@ -21,7 +21,7 @@ use frame_support::{ ord_parameter_types, parameter_types, traits::{ConstU128, ConstU32, ConstU64, FindAuthor, Nothing}, weights::Weight, - ConsensusEngineId, RuntimeDebug, + ConsensusEngineId, }; use module_evm::{EvmChainId, EvmTask}; use module_evm_accounts::EvmAddressMapping; @@ -33,9 +33,11 @@ use primitives::{ }; use scale_info::TypeInfo; use sp_core::{H160, H256}; -use sp_runtime::traits::Convert; -use sp_runtime::traits::{BlakeTwo256, BlockNumberProvider, IdentityLookup, Zero}; pub use sp_runtime::AccountId32; +use sp_runtime::{ + traits::{BlakeTwo256, BlockNumberProvider, Convert, IdentityLookup, Zero}, + RuntimeDebug, +}; use std::str::FromStr; type Block = frame_system::mocking::MockBlock; diff --git a/runtime/common/src/precompile/dex.rs b/runtime/common/src/precompile/dex.rs index 3de2d40afd..f6734307d0 100644 --- a/runtime/common/src/precompile/dex.rs +++ b/runtime/common/src/precompile/dex.rs @@ -21,7 +21,7 @@ use super::{ target_gas_limit, }; use crate::WeightToGas; -use frame_support::{log, traits::Get}; +use frame_support::traits::Get; use module_dex::WeightInfo; use module_evm::{ precompiles::Precompile, diff --git a/runtime/common/src/precompile/evm.rs b/runtime/common/src/precompile/evm.rs index 24d8dd2d82..3d533b0aa0 100644 --- a/runtime/common/src/precompile/evm.rs +++ b/runtime/common/src/precompile/evm.rs @@ -145,7 +145,7 @@ where let contract = input.evm_address_at(2)?; let new_maintainer = input.evm_address_at(3)?; - frame_support::log::debug!( + log::debug!( target: "evm", "evm: from: {:?}, contract: {:?}, new_maintainer: {:?}", from, contract, new_maintainer, diff --git a/runtime/common/src/precompile/homa.rs b/runtime/common/src/precompile/homa.rs index bc9c0ec421..dcbb0e0e3f 100644 --- a/runtime/common/src/precompile/homa.rs +++ b/runtime/common/src/precompile/homa.rs @@ -21,7 +21,7 @@ use super::{ target_gas_limit, }; use crate::WeightToGas; -use frame_support::{log, traits::Get}; +use frame_support::traits::Get; use module_evm::{ precompiles::Precompile, runner::state::{PrecompileFailure, PrecompileOutput, PrecompileResult}, diff --git a/runtime/common/src/precompile/honzon.rs b/runtime/common/src/precompile/honzon.rs index 8986ae0a53..381d35ca6e 100644 --- a/runtime/common/src/precompile/honzon.rs +++ b/runtime/common/src/precompile/honzon.rs @@ -21,7 +21,7 @@ use super::{ target_gas_limit, }; use crate::WeightToGas; -use frame_support::{log, traits::Get}; +use frame_support::traits::Get; use module_evm::{ precompiles::Precompile, runner::state::{PrecompileFailure, PrecompileOutput, PrecompileResult}, diff --git a/runtime/common/src/precompile/liquid_crowdloan.rs b/runtime/common/src/precompile/liquid_crowdloan.rs index de905dd739..c701fcd041 100644 --- a/runtime/common/src/precompile/liquid_crowdloan.rs +++ b/runtime/common/src/precompile/liquid_crowdloan.rs @@ -21,7 +21,6 @@ use super::{ target_gas_limit, }; use crate::WeightToGas; -use frame_support::log; use module_evm::{ precompiles::Precompile, runner::state::{PrecompileFailure, PrecompileOutput, PrecompileResult}, diff --git a/runtime/common/src/precompile/mock.rs b/runtime/common/src/precompile/mock.rs index 5550ab9660..5c5f3933b2 100644 --- a/runtime/common/src/precompile/mock.rs +++ b/runtime/common/src/precompile/mock.rs @@ -27,7 +27,7 @@ use frame_support::{ OnInitialize, SortedMembers, }, weights::{ConstantMultiplier, IdentityFee}, - PalletId, RuntimeDebug, + PalletId, }; use frame_system::{offchain::SendTransactionTypes, EnsureRoot, EnsureSignedBy}; use module_cdp_engine::CollateralCurrencyIds; @@ -50,7 +50,7 @@ use scale_info::TypeInfo; use sp_core::{H160, H256}; use sp_runtime::{ traits::{AccountIdConversion, BlakeTwo256, BlockNumberProvider, Convert, IdentityLookup, One as OneT, Zero}, - AccountId32, DispatchResult, FixedPointNumber, FixedU128, Perbill, Percent, + AccountId32, DispatchResult, FixedPointNumber, FixedU128, Perbill, Percent, RuntimeDebug, }; use sp_std::prelude::*; use xcm::{prelude::*, v3::Xcm}; diff --git a/runtime/common/src/precompile/mod.rs b/runtime/common/src/precompile/mod.rs index 105c13713b..7c0c510919 100644 --- a/runtime/common/src/precompile/mod.rs +++ b/runtime/common/src/precompile/mod.rs @@ -25,7 +25,6 @@ pub mod mock; mod tests; mod weights; -use frame_support::log; use hex_literal::hex; use module_evm::{ precompiles::{ diff --git a/runtime/common/src/precompile/multicurrency.rs b/runtime/common/src/precompile/multicurrency.rs index 184a718963..3b179387b6 100644 --- a/runtime/common/src/precompile/multicurrency.rs +++ b/runtime/common/src/precompile/multicurrency.rs @@ -21,10 +21,7 @@ use super::{ target_gas_limit, }; use crate::WeightToGas; -use frame_support::{ - log, - traits::{Currency, Get}, -}; +use frame_support::traits::{Currency, Get}; use module_currencies::WeightInfo; use module_evm::{ precompiles::Precompile, diff --git a/runtime/common/src/precompile/nft.rs b/runtime/common/src/precompile/nft.rs index 5ebaeb06fa..9b157c7d7a 100644 --- a/runtime/common/src/precompile/nft.rs +++ b/runtime/common/src/precompile/nft.rs @@ -20,10 +20,7 @@ use super::{ input::{Input, InputT, Output}, target_gas_limit, }; -use frame_support::{ - log, - traits::tokens::nonfungibles::{Inspect, Transfer}, -}; +use frame_support::traits::tokens::nonfungibles::{Inspect, Transfer}; use module_evm::{ precompiles::Precompile, runner::state::{PrecompileFailure, PrecompileOutput, PrecompileResult}, diff --git a/runtime/common/src/precompile/oracle.rs b/runtime/common/src/precompile/oracle.rs index 756c036950..51d810f2a3 100644 --- a/runtime/common/src/precompile/oracle.rs +++ b/runtime/common/src/precompile/oracle.rs @@ -22,7 +22,6 @@ use super::{ weights::PrecompileWeights, }; use crate::{Weight, WeightToGas}; -use frame_support::log; use module_evm::{ precompiles::Precompile, runner::state::{PrecompileFailure, PrecompileOutput, PrecompileResult}, diff --git a/runtime/common/src/precompile/schedule.rs b/runtime/common/src/precompile/schedule.rs index 1666a8e23a..43f24f3f4e 100644 --- a/runtime/common/src/precompile/schedule.rs +++ b/runtime/common/src/precompile/schedule.rs @@ -25,8 +25,7 @@ use super::{ }; use codec::{Decode, Encode}; use frame_support::{ - dispatch::Dispatchable, - ensure, log, parameter_types, + ensure, parameter_types, traits::{ schedule::{DispatchTime, Named as ScheduleNamed}, Currency, IsType, OriginTrait, @@ -42,7 +41,7 @@ use num_enum::{IntoPrimitive, TryFromPrimitive}; use pallet_scheduler::TaskAddress; use primitives::{Balance, BlockNumber}; use sp_core::H160; -use sp_runtime::RuntimeDebug; +use sp_runtime::{traits::Dispatchable, RuntimeDebug}; use sp_std::{fmt::Debug, marker::PhantomData, prelude::*}; parameter_types! { diff --git a/runtime/common/src/precompile/xtokens.rs b/runtime/common/src/precompile/xtokens.rs index f5f38d768a..a7cdcf245e 100644 --- a/runtime/common/src/precompile/xtokens.rs +++ b/runtime/common/src/precompile/xtokens.rs @@ -21,10 +21,7 @@ use super::{ target_gas_limit, }; use crate::WeightToGas; -use frame_support::{ - log, - pallet_prelude::{Decode, Encode, IsType}, -}; +use frame_support::pallet_prelude::{Decode, Encode, IsType}; 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 fe7127331f..37d8e958dc 100644 --- a/runtime/common/src/xcm_impl.rs +++ b/runtime/common/src/xcm_impl.rs @@ -140,7 +140,7 @@ impl, R: TakeRevenue, M: BuyWeightRate> WeightTrader for Fi } } - fn buy_weight(&mut self, weight: XcmWeight, payment: Assets) -> Result { + fn buy_weight(&mut self, weight: XcmWeight, payment: Assets, _context: &XcmContext) -> Result { log::trace!(target: "xcm::weight", "buy_weight weight: {:?}, payment: {:?}", weight, payment); // only support first fungible assets now. @@ -184,7 +184,7 @@ impl, R: TakeRevenue, M: BuyWeightRate> WeightTrader for Fi Err(XcmError::TooExpensive) } - fn refund_weight(&mut self, weight: XcmWeight) -> Option { + fn refund_weight(&mut self, weight: XcmWeight, _context: &XcmContext) -> Option { log::trace!( target: "xcm::weight", "refund_weight weight: {:?}, weight: {:?}, amount: {:?}, ratio: {:?}, multi_location: {:?}", weight, self.weight, self.amount, self.ratio, self.multi_location @@ -400,11 +400,24 @@ mod tests { let asset: MultiAsset = (Parent, 100).into(); let assets: Assets = asset.into(); let mut trader = >::new(); - let buy_weight = trader.buy_weight(XcmWeight::from_parts(WEIGHT_REF_TIME_PER_SECOND, 0), assets.clone()); + let ctx = XcmContext { + origin: Some(Parent.into()), + message_id: XcmHash::default(), + topic: None, + }; + let buy_weight = trader.buy_weight( + XcmWeight::from_parts(WEIGHT_REF_TIME_PER_SECOND, 0), + assets.clone(), + &ctx, + ); assert_noop!(buy_weight, XcmError::TooExpensive); let mut trader = >>::new(); - let buy_weight = trader.buy_weight(XcmWeight::from_parts(WEIGHT_REF_TIME_PER_SECOND, 0), assets.clone()); + let buy_weight = trader.buy_weight( + XcmWeight::from_parts(WEIGHT_REF_TIME_PER_SECOND, 0), + assets.clone(), + &ctx, + ); let asset: MultiAsset = (Parent, 90).into(); let assets: Assets = asset.into(); assert_ok!(buy_weight, assets.clone()); diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index aee2666778..f376ecf9af 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -13,61 +13,61 @@ hex-literal = { version = "0.4.1" } libsecp256k1 = { version = "0.7" } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-bounties = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-indices = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-tips = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # polkadot -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # orml orml-auction = { path = "../../orml/auction" } @@ -119,14 +119,14 @@ acala-runtime = { path = "../acala", optional = true } [dev-dependencies] env_logger = "0.9.0" log = "0.4.17" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } -polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } acala-service = { path = "../../node/service", features = ["with-all-runtime"] } module-aggregated-dex = { path = "../../modules/aggregated-dex" } diff --git a/runtime/integration-tests/src/payment.rs b/runtime/integration-tests/src/payment.rs index fefeaeee60..3933f546f0 100644 --- a/runtime/integration-tests/src/payment.rs +++ b/runtime/integration-tests/src/payment.rs @@ -18,7 +18,10 @@ use crate::setup::*; use crate::stable_asset::enable_stable_asset; -use frame_support::dispatch::{DispatchClass, DispatchInfo, Pays, PostDispatchInfo, Weight}; +use frame_support::{ + dispatch::{DispatchClass, DispatchInfo, Pays, PostDispatchInfo}, + weights::Weight, +}; use module_support::AggregatedSwapPath; use sp_runtime::{ traits::{AccountIdConversion, SignedExtension, UniqueSaturatedInto}, diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml index d43e7af78c..df78846da3 100644 --- a/runtime/karura/Cargo.toml +++ b/runtime/karura/Cargo.toml @@ -6,6 +6,7 @@ edition = "2021" build = "build.rs" [dependencies] +log = { version = "0.4.17", default-features = false } smallvec = "1.4.0" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } @@ -14,62 +15,62 @@ hex = { version = "0.4", default-features = false } hex-literal = { version = "0.4.1" } # substrate -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["historical"] } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, features = ["historical"] } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -129,16 +130,16 @@ 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-v1.0.0", default-features = false, optional = true } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } -pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +pallet-bags-list = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", optional = true } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } [features] default = ["std"] @@ -347,6 +348,7 @@ try-runtime = [ "pallet-transaction-payment/try-runtime", "pallet-treasury/try-runtime", "pallet-utility/try-runtime", + "pallet-bags-list/try-runtime", "cumulus-pallet-aura-ext/try-runtime", "cumulus-pallet-dmp-queue/try-runtime", diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs index 034fc0a195..95c612e700 100644 --- a/runtime/karura/src/lib.rs +++ b/runtime/karura/src/lib.rs @@ -43,6 +43,7 @@ use sp_runtime::{ }, transaction_validity::{TransactionSource, TransactionValidity}, ApplyExtrinsicResult, ArithmeticError, DispatchResult, FixedPointNumber, Perbill, Percent, Permill, Perquintill, + RuntimeDebug, }; use sp_std::prelude::*; #[cfg(feature = "std")] @@ -68,7 +69,7 @@ use orml_utilities::simulate_execution; use pallet_transaction_payment::RuntimeDispatchInfo; pub use frame_support::{ - construct_runtime, log, + construct_runtime, pallet_prelude::InvalidTransaction, parameter_types, traits::{ @@ -77,7 +78,7 @@ pub use frame_support::{ KeyOwnerProofSystem, LockIdentifier, Nothing, OnRuntimeUpgrade, OnUnbalanced, Randomness, SortedMembers, }, weights::{constants::RocksDbWeight, ConstantMultiplier, IdentityFee, Weight}, - PalletId, RuntimeDebug, StorageValue, + PalletId, StorageValue, }; pub use pallet_collective::MemberCount; @@ -2207,10 +2208,10 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark as frame_add_benchmark, TrackedStorageKey}; + use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark as frame_add_benchmark}; use module_nft::benchmarking::Pallet as NftBench; + use frame_support::traits::{WhitelistedStorageKeys, TrackedStorageKey}; - use frame_support::traits::WhitelistedStorageKeys; let mut whitelist: Vec = AllPalletsWithSystem::whitelisted_storage_keys(); // Treasury Account diff --git a/runtime/mandala/Cargo.toml b/runtime/mandala/Cargo.toml index 54788bbd92..f938a4aa68 100644 --- a/runtime/mandala/Cargo.toml +++ b/runtime/mandala/Cargo.toml @@ -6,6 +6,7 @@ edition = "2021" build = "build.rs" [dependencies] +log = { version = "0.4.17", default-features = false } smallvec = "1.4.0" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } @@ -14,66 +15,66 @@ hex = { version = "0.4", default-features = false } hex-literal = { version = "0.4.1" } # substrate -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features =false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-root-testing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features =false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-recovery = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-root-testing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0", default-features = false } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -136,18 +137,19 @@ 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-v1.0.0", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } +pallet-bags-list = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", optional = true } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } acala-service = { path = "../../node/service", features = ["with-mandala-runtime"] } @@ -168,6 +170,7 @@ std = [ "frame-try-runtime/std", "pallet-aura/std", "pallet-authorship/std", + "pallet-bags-list/std", "pallet-balances/std", "pallet-bounties/std", "pallet-bounties/std", @@ -284,6 +287,7 @@ runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-bags-list/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-bounties/runtime-benchmarks", "pallet-collective/runtime-benchmarks", @@ -354,6 +358,7 @@ try-runtime = [ "pallet-aura/try-runtime", "pallet-authorship/try-runtime", + "pallet-bags-list/try-runtime", "pallet-balances/try-runtime", "pallet-bounties/try-runtime", "pallet-collective/try-runtime", diff --git a/runtime/mandala/src/benchmarking/evm.rs b/runtime/mandala/src/benchmarking/evm.rs index b5496ef599..8682788155 100644 --- a/runtime/mandala/src/benchmarking/evm.rs +++ b/runtime/mandala/src/benchmarking/evm.rs @@ -19,13 +19,13 @@ use crate::{AccountId, EvmAccounts, Runtime, RuntimeEvent, RuntimeOrigin, System, EVM}; use super::utils::{dollar, set_balance, NATIVE}; -use frame_support::dispatch::DispatchError; use frame_system::RawOrigin; use module_evm::MaxCodeSize; use module_support::AddressMapping; use orml_benchmarking::{runtime_benchmarks, whitelist_account}; use sp_core::{H160, H256}; use sp_io::hashing::keccak_256; +use sp_runtime::DispatchError; use sp_std::{str::FromStr, vec}; fn contract_addr() -> H160 { diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs index 024bbf61ea..a4d53254fb 100644 --- a/runtime/mandala/src/lib.rs +++ b/runtime/mandala/src/lib.rs @@ -36,7 +36,7 @@ use frame_support::pallet_prelude::InvalidTransaction; pub use frame_support::{ construct_runtime, dispatch::DispatchClass, - log, parameter_types, + parameter_types, traits::{ ConstBool, ConstU128, ConstU16, ConstU32, Contains, ContainsLengthBound, Currency as PalletCurrency, EnsureOrigin, EqualPrivilegeOnly, Everything, Get, Imbalance, InstanceFilter, IsSubType, IsType, @@ -47,7 +47,7 @@ pub use frame_support::{ constants::{BlockExecutionWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND}, ConstantMultiplier, IdentityFee, Weight, }, - PalletId, RuntimeDebug, StorageValue, + PalletId, StorageValue, }; use frame_system::{EnsureRoot, EnsureSigned, RawOrigin}; use module_asset_registry::{AssetIdMaps, EvmErc20InfoMapping}; @@ -83,7 +83,7 @@ use sp_runtime::{ StaticLookup, }, transaction_validity::{TransactionSource, TransactionValidity}, - ApplyExtrinsicResult, ArithmeticError, DispatchResult, FixedPointNumber, + ApplyExtrinsicResult, ArithmeticError, DispatchResult, FixedPointNumber, RuntimeDebug, }; use sp_std::prelude::*; @@ -1961,21 +1961,8 @@ pub type SignedPayload = generic::SignedPayload; /// Extrinsic type that has already been checked. pub type CheckedExtrinsic = generic::CheckedExtrinsic; /// Executive: handles dispatch to the various modules. -pub type Executive = frame_executive::Executive< - Runtime, - Block, - frame_system::ChainContext, - Runtime, - AllPalletsWithSystem, - ( - pallet_balances::migration::MigrateToTrackInactive, - pallet_scheduler::migration::v4::CleanupAgendas, - // "Use 2D weights in XCM v3" - pallet_xcm::migration::v1::MigrateToV1, - orml_unknown_tokens::Migration, - // Note: The following Migrations do not use the StorageVersion feature, must to be removed after the upgrade - ), ->; +pub type Executive = + frame_executive::Executive, Runtime, AllPalletsWithSystem, ()>; construct_runtime!( pub enum Runtime { @@ -2431,10 +2418,10 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark as frame_add_benchmark, TrackedStorageKey}; + use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark as frame_add_benchmark}; use module_nft::benchmarking::Pallet as NftBench; + use frame_support::traits::{WhitelistedStorageKeys, TrackedStorageKey}; - use frame_support::traits::WhitelistedStorageKeys; let mut whitelist: Vec = AllPalletsWithSystem::whitelisted_storage_keys(); // Treasury Account diff --git a/ts-tests/tests/test-balance.ts b/ts-tests/tests/test-balance.ts index 7b9d52f97a..a4e6e5a90a 100644 --- a/ts-tests/tests/test-balance.ts +++ b/ts-tests/tests/test-balance.ts @@ -26,9 +26,9 @@ describeWithAcala("Acala RPC (Balance)", (context) => { expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000995937431778000000"); await transfer(context, alice.substrateAddress, alice_stash.substrateAddress, 1000); - expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999992033958023000000"); + expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999992037566906000000"); expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000995937432778000000"); - expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999992033958023000000"); + expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999992037566906000000"); expect((await context.provider.getBalance(alice_stash.getAddress(), "earliest")).toString()).to.equal("0"); }); });