From fb31aac0b2a69db5cd0ec6f0ba39f3427455a202 Mon Sep 17 00:00:00 2001 From: zqhxuyuan Date: Thu, 16 Jun 2022 11:09:37 +0800 Subject: [PATCH] update polkadot-v0.9.23 (#2183) * update polkadot-v0.9.23 * introduce weight_to_fee * update deps * companior orml#754 * fix tests * fix testf * fix benchmark * fix constants test * revert LengthToFee * fix ts-tests * update deps * bring test back * Update modules/transaction-payment/src/mock.rs Co-authored-by: Shaun Wang --- Cargo.lock | 1108 ++++++++--------- Cargo.toml | 388 +++--- ecosystem-modules/compound-cash/Cargo.toml | 12 +- ecosystem-modules/ren/renvm-bridge/Cargo.toml | 14 +- .../ren/renvm-bridge/src/mock.rs | 2 + ecosystem-modules/stable-asset | 2 +- ecosystem-modules/starport/Cargo.toml | 14 +- ecosystem-modules/starport/src/lib.rs | 22 +- ecosystem-modules/starport/src/mock.rs | 2 + ecosystem-modules/starport/src/tests.rs | 6 +- evm-tests | 2 +- inspect/Cargo.toml | 12 +- modules/aggregated-dex/Cargo.toml | 17 +- modules/aggregated-dex/src/mock.rs | 2 + modules/asset-registry/Cargo.toml | 18 +- modules/auction-manager/Cargo.toml | 14 +- modules/auction-manager/src/mock.rs | 4 +- modules/cdp-engine/Cargo.toml | 18 +- modules/cdp-engine/src/mock.rs | 4 +- modules/cdp-treasury/Cargo.toml | 14 +- modules/cdp-treasury/src/lib.rs | 2 +- modules/cdp-treasury/src/mock.rs | 2 + modules/collator-selection/Cargo.toml | 32 +- modules/collator-selection/src/lib.rs | 2 +- modules/currencies/Cargo.toml | 18 +- modules/currencies/src/mock.rs | 4 +- modules/dex-oracle/Cargo.toml | 18 +- modules/dex/Cargo.toml | 16 +- modules/dex/src/lib.rs | 2 +- modules/dex/src/mock.rs | 2 + modules/earning/Cargo.toml | 14 +- modules/emergency-shutdown/Cargo.toml | 14 +- modules/emergency-shutdown/src/mock.rs | 4 +- modules/evm-accounts/Cargo.toml | 14 +- modules/evm-accounts/src/mock.rs | 2 + modules/evm-bridge/Cargo.toml | 16 +- modules/evm-utility/Cargo.toml | 2 +- modules/evm/Cargo.toml | 18 +- modules/evm/rpc/Cargo.toml | 20 +- modules/evm/rpc/runtime_api/Cargo.toml | 8 +- modules/evm/src/bench/mock.rs | 6 +- modules/evm/src/mock.rs | 2 + modules/example/Cargo.toml | 10 +- modules/homa-lite/Cargo.toml | 28 +- modules/homa-lite/src/mock.rs | 2 + modules/homa-lite/src/mock_no_fees.rs | 2 + modules/homa-validator-list/Cargo.toml | 14 +- modules/homa-validator-list/src/mock.rs | 2 + modules/homa/Cargo.toml | 20 +- modules/homa/src/lib.rs | 2 +- modules/homa/src/mock.rs | 2 + modules/honzon-bridge/Cargo.toml | 14 +- modules/honzon-bridge/src/lib.rs | 2 +- modules/honzon-bridge/src/mock.rs | 2 + modules/honzon/Cargo.toml | 16 +- modules/honzon/src/mock.rs | 4 +- modules/idle-scheduler/Cargo.toml | 12 +- modules/incentives/Cargo.toml | 14 +- modules/incentives/src/lib.rs | 2 +- modules/incentives/src/mock.rs | 2 + modules/loans/Cargo.toml | 14 +- modules/loans/src/lib.rs | 2 +- modules/loans/src/mock.rs | 4 +- modules/nft/Cargo.toml | 20 +- modules/nft/src/benchmarking.rs | 3 +- modules/nft/src/lib.rs | 25 +- modules/nft/src/mock.rs | 2 + modules/nft/src/tests.rs | 2 +- modules/nominees-election/Cargo.toml | 14 +- modules/nominees-election/src/mock.rs | 2 + modules/prices/Cargo.toml | 12 +- modules/prices/src/mock.rs | 2 + modules/relaychain/Cargo.toml | 16 +- modules/session-manager/Cargo.toml | 14 +- modules/support/Cargo.toml | 12 +- modules/transaction-pause/Cargo.toml | 14 +- modules/transaction-pause/src/mock.rs | 2 + modules/transaction-payment/Cargo.toml | 20 +- modules/transaction-payment/src/lib.rs | 18 +- modules/transaction-payment/src/mock.rs | 8 +- modules/transaction-payment/src/tests.rs | 8 +- modules/xcm-interface/Cargo.toml | 24 +- node/cli/Cargo.toml | 30 +- node/e2e-tests/test-service/Cargo.toml | 104 +- node/e2e-tests/test-service/src/builder.rs | 4 +- node/e2e-tests/test-service/src/lib.rs | 4 +- node/service/Cargo.toml | 108 +- orml | 2 +- primitives/Cargo.toml | 12 +- rpc/Cargo.toml | 22 +- rpc/src/lib.rs | 8 +- runtime/acala/Cargo.toml | 114 +- runtime/acala/src/authority.rs | 18 +- runtime/acala/src/constants.rs | 6 +- runtime/acala/src/lib.rs | 42 +- runtime/acala/src/xcm_config.rs | 4 +- runtime/common/Cargo.toml | 36 +- runtime/common/src/mock.rs | 2 + runtime/common/src/precompile/mock.rs | 8 +- runtime/common/src/precompile/nft.rs | 2 +- runtime/integration-tests/Cargo.toml | 130 +- runtime/integration-tests/src/authority.rs | 2 +- runtime/integration-tests/src/evm.rs | 16 +- runtime/integration-tests/src/nft.rs | 15 +- runtime/integration-tests/src/payment.rs | 73 +- .../integration-tests/src/relaychain/erc20.rs | 18 +- .../relaychain/kusama_cross_chain_transfer.rs | 68 +- .../src/relaychain/kusama_test_net.rs | 2 +- .../polkadot_cross_chain_transfer.rs | 4 +- .../src/relaychain/polkadot_test_net.rs | 2 +- .../src/relaychain/statemine.rs | 26 +- runtime/integration-tests/src/runtime.rs | 4 +- runtime/integration-tests/src/setup.rs | 4 +- runtime/integration-tests/src/stable_asset.rs | 2 +- runtime/integration-tests/src/treasury.rs | 6 +- runtime/integration-tests/src/vesting.rs | 2 +- runtime/karura/Cargo.toml | 114 +- runtime/karura/src/authority.rs | 18 +- runtime/karura/src/constants.rs | 5 +- runtime/karura/src/lib.rs | 45 +- runtime/karura/src/xcm_config.rs | 6 +- runtime/mandala/Cargo.toml | 126 +- runtime/mandala/src/authority.rs | 18 +- .../mandala/src/benchmarking/currencies.rs | 2 +- runtime/mandala/src/benchmarking/mod.rs | 2 +- .../src/benchmarking/transaction_payment.rs | 8 +- runtime/mandala/src/constants.rs | 3 +- runtime/mandala/src/lib.rs | 42 +- runtime/mandala/src/xcm_config.rs | 4 +- ts-tests/tests/test-balance.ts | 14 +- ts-tests/tests/test-bodhi.ts | 2 +- ts-tests/tests/test-gas-limit.ts | 4 +- ts-tests/tests/test-gas.ts | 4 +- 133 files changed, 1828 insertions(+), 1770 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 026f6a2e4d..1d54ba0fd7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -779,7 +779,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "beefy-primitives", "fnv", @@ -813,7 +813,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -833,12 +833,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "scale-info", @@ -950,17 +950,6 @@ dependencies = [ "constant_time_eq", ] -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq", -] - [[package]] name = "blake2b_simd" version = "1.0.0" @@ -1069,7 +1058,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bp-runtime", "finality-grandpa", @@ -1086,7 +1075,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bp-runtime", "frame-support", @@ -1098,7 +1087,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bitvec 1.0.0", "bp-runtime", @@ -1115,7 +1104,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bp-messages", "bp-runtime", @@ -1133,7 +1122,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -1150,7 +1139,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-support", "hash-db", @@ -1168,7 +1157,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -1183,7 +1172,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -1198,7 +1187,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -1579,6 +1568,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "comfy-table" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b103d85ca6e209388771bfb7aa6b68a7aeec4afbf6f0a0264bfbf50360e5212e" +dependencies = [ + "strum 0.23.0", + "strum_macros 0.23.1", + "unicode-width", +] + [[package]] name = "concurrent-queue" version = "1.2.2" @@ -1910,15 +1910,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct 0.6.1", -] - [[package]] name = "ctor" version = "0.1.22" @@ -1952,7 +1943,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "clap 3.1.18", "sc-cli", @@ -1963,7 +1954,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1987,7 +1978,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -2016,7 +2007,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -2037,7 +2028,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -2061,7 +2052,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -2086,7 +2077,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -2110,7 +2101,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -2140,7 +2131,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "frame-executive", "frame-support", @@ -2158,7 +2149,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2176,7 +2167,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -2206,7 +2197,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2217,7 +2208,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "frame-support", "frame-system", @@ -2230,7 +2221,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2247,7 +2238,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2265,7 +2256,7 @@ dependencies = [ [[package]] name = "cumulus-ping" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-pallet-xcm", "cumulus-primitives-core", @@ -2282,7 +2273,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "frame-support", "parity-scale-codec", @@ -2298,7 +2289,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2321,7 +2312,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-primitives-core", "futures 0.3.21", @@ -2334,7 +2325,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2351,7 +2342,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2359,13 +2350,15 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parking_lot 0.12.0", + "polkadot-cli", "polkadot-client", "polkadot-service", + "sc-cli", "sc-client-api", "sc-consensus-babe", "sc-network", "sc-service", - "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22)", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23)", "sc-telemetry", "sc-tracing", "sp-api", @@ -2380,7 +2373,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2404,7 +2397,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "async-trait", "backoff", @@ -2430,7 +2423,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2443,7 +2436,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-validation-worker-provider" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "polkadot-node-core-pvf", ] @@ -2594,17 +2587,6 @@ dependencies = [ "dirs-sys-next", ] -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.5", - "winapi", -] - [[package]] name = "dirs-sys" version = "0.3.7" @@ -2612,7 +2594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "redox_users 0.4.3", + "redox_users", "winapi", ] @@ -2623,7 +2605,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.3", + "redox_users", "winapi", ] @@ -2801,12 +2783,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - [[package]] name = "enum-as-inner" version = "0.4.0" @@ -3222,7 +3198,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", ] @@ -3240,7 +3216,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", @@ -3262,11 +3238,12 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "Inflector", "chrono", "clap 3.1.18", + "comfy-table", "frame-benchmarking", "frame-support", "frame-system", @@ -3280,7 +3257,6 @@ dependencies = [ "log", "memory-db", "parity-scale-codec", - "prettytable-rs", "rand 0.8.5", "rand_pcg 0.3.1", "sc-block-builder", @@ -3289,7 +3265,7 @@ dependencies = [ "sc-client-db", "sc-executor", "sc-service", - "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb)", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596)", "serde", "serde_json", "serde_nanos", @@ -3312,7 +3288,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3323,7 +3299,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3339,7 +3315,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", @@ -3367,7 +3343,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "bitflags", "frame-metadata", @@ -3397,7 +3373,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -3409,7 +3385,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -3421,7 +3397,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "proc-macro2", "quote", @@ -3431,7 +3407,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "log", @@ -3448,7 +3424,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -3463,7 +3439,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "sp-api", @@ -3472,7 +3448,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "sp-api", @@ -3608,8 +3584,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01fe9932a224b72b45336d96040aa86386d674a31d0af27d800ea7bc8ca97fe" dependencies = [ "futures-io", - "rustls 0.20.6", - "webpki 0.22.0", + "rustls", + "webpki", ] [[package]] @@ -3979,19 +3955,17 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ - "ct-logs", - "futures-util", + "http", "hyper", "log", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", + "rustls", + "rustls-native-certs", "tokio", - "tokio-rustls 0.22.0", - "webpki 0.21.4", + "tokio-rustls", ] [[package]] @@ -4201,11 +4175,11 @@ dependencies = [ "jsonrpsee-core", "jsonrpsee-types", "pin-project 1.0.10", - "rustls-native-certs 0.6.2", + "rustls-native-certs", "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tokio-util", "tracing", "webpki-roots", @@ -4449,8 +4423,8 @@ checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "kusama-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "beefy-primitives", "bitvec 1.0.0", @@ -4463,7 +4437,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants 0.9.22 (git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d)", + "kusama-runtime-constants 0.9.23 (git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0)", "log", "pallet-authority-discovery", "pallet-authorship", @@ -4542,8 +4516,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.22#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.23#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-support", "polkadot-primitives", @@ -4554,8 +4528,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-support", "polkadot-primitives", @@ -4718,7 +4692,7 @@ dependencies = [ "libp2p-request-response", "libp2p-swarm", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.8.5", ] @@ -4745,7 +4719,7 @@ dependencies = [ "multistream-select", "parking_lot 0.12.0", "pin-project 1.0.10", - "prost", + "prost 0.9.0", "prost-build", "rand 0.8.5", "ring", @@ -4795,7 +4769,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.7.3", "smallvec", @@ -4819,7 +4793,7 @@ dependencies = [ "libp2p-swarm", "log", "prometheus-client", - "prost", + "prost 0.9.0", "prost-build", "rand 0.7.3", "regex", @@ -4841,7 +4815,7 @@ dependencies = [ "libp2p-swarm", "log", "lru 0.7.6", - "prost", + "prost 0.9.0", "prost-build", "smallvec", ] @@ -4863,7 +4837,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.7.3", "sha2 0.10.2", @@ -4941,7 +4915,7 @@ dependencies = [ "lazy_static", "libp2p-core", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.8.5", "sha2 0.10.2", @@ -4978,7 +4952,7 @@ dependencies = [ "futures 0.3.21", "libp2p-core", "log", - "prost", + "prost 0.9.0", "prost-build", "unsigned-varint", "void", @@ -5014,7 +4988,7 @@ dependencies = [ "libp2p-swarm", "log", "pin-project 1.0.10", - "prost", + "prost 0.9.0", "prost-build", "rand 0.8.5", "smallvec", @@ -5038,7 +5012,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.8.5", "sha2 0.10.2", @@ -5521,6 +5495,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memfd" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" +dependencies = [ + "libc", +] + [[package]] name = "memmap2" version = "0.2.3" @@ -5586,21 +5569,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "metered-channel" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "coarsetime", - "crossbeam-queue", - "derive_more", - "futures 0.3.21", - "futures-timer", - "nanorand", - "thiserror", - "tracing-gum", -] - [[package]] name = "mick-jaeger" version = "0.1.8" @@ -6443,7 +6411,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689" dependencies = [ - "blake2b_simd 1.0.0", + "blake2b_simd", "blake2s_simd", "blake3", "core2", @@ -6839,6 +6807,35 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "orchestra" +version = "0.0.1" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +dependencies = [ + "async-trait", + "dyn-clonable", + "futures 0.3.21", + "futures-timer", + "orchestra-proc-macro", + "pin-project 1.0.10", + "prioritized-metered-channel", + "thiserror", + "tracing", +] + +[[package]] +name = "orchestra-proc-macro" +version = "0.0.1" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +dependencies = [ + "expander 0.0.6", + "petgraph", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ordered-float" version = "1.1.1" @@ -7266,7 +7263,7 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", @@ -7283,7 +7280,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7297,7 +7294,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", @@ -7313,7 +7310,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", @@ -7329,7 +7326,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", @@ -7344,7 +7341,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7368,7 +7365,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7388,7 +7385,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7403,7 +7400,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "beefy-primitives", "frame-support", @@ -7419,7 +7416,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -7442,7 +7439,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7460,7 +7457,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -7477,7 +7474,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bp-header-chain", "bp-runtime", @@ -7499,7 +7496,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bitvec 1.0.0", "bp-message-dispatch", @@ -7520,7 +7517,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7539,7 +7536,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "frame-benchmarking", "frame-support", @@ -7559,7 +7556,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7576,7 +7573,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7592,7 +7589,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7615,7 +7612,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7628,7 +7625,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7646,7 +7643,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7661,7 +7658,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7684,7 +7681,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "enumflags2 0.7.5", "frame-benchmarking", @@ -7700,7 +7697,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7720,7 +7717,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7737,7 +7734,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7754,7 +7751,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -7772,7 +7769,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -7787,7 +7784,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7802,7 +7799,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", @@ -7816,10 +7813,11 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -7831,7 +7829,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7850,7 +7848,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", @@ -7867,7 +7865,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7890,7 +7888,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7906,7 +7904,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7921,7 +7919,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7936,7 +7934,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7952,7 +7950,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", @@ -7973,7 +7971,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -7989,7 +7987,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", @@ -8003,7 +8001,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8026,7 +8024,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8037,7 +8035,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "log", "sp-arithmetic", @@ -8046,7 +8044,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", @@ -8060,7 +8058,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -8078,7 +8076,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -8097,14 +8095,13 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", - "smallvec", "sp-core", "sp-io", "sp-runtime", @@ -8114,7 +8111,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -8129,7 +8126,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -8140,7 +8137,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -8157,7 +8154,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -8172,7 +8169,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -8188,7 +8185,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-benchmarking", "frame-support", @@ -8202,8 +8199,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-support", "frame-system", @@ -8220,8 +8217,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-benchmarking", "frame-support", @@ -8238,7 +8235,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -8251,7 +8248,7 @@ dependencies = [ [[package]] name = "parachains-common" version = "1.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "frame-executive", "frame-support", @@ -8406,7 +8403,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "smallvec", "winapi", ] @@ -8419,7 +8416,7 @@ checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "smallvec", "windows-sys", ] @@ -8645,8 +8642,8 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -8660,8 +8657,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -8674,8 +8671,8 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "derive_more", "fatality", @@ -8697,8 +8694,8 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "fatality", "futures 0.3.21", @@ -8718,8 +8715,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "clap 3.1.18", "frame-benchmarking-cli", @@ -8732,7 +8729,7 @@ dependencies = [ "polkadot-service", "sc-cli", "sc-service", - "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22)", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23)", "sc-tracing", "sp-core", "sp-trie", @@ -8743,8 +8740,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -8784,8 +8781,8 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "always-assert", "fatality", @@ -8805,8 +8802,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -8818,8 +8815,8 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "derive_more", "fatality", @@ -8841,8 +8838,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -8855,8 +8852,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "futures 0.3.21", "futures-timer", @@ -8875,8 +8872,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "always-assert", "async-trait", @@ -8896,8 +8893,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "futures 0.3.21", "parity-scale-codec", @@ -8914,8 +8911,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bitvec 1.0.0", "derive_more", @@ -8943,8 +8940,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bitvec 1.0.0", "futures 0.3.21", @@ -8963,8 +8960,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bitvec 1.0.0", "fatality", @@ -8982,8 +8979,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -8997,8 +8994,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "async-trait", "futures 0.3.21", @@ -9015,8 +9012,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -9030,8 +9027,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9047,8 +9044,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "fatality", "futures 0.3.21", @@ -9066,8 +9063,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "async-trait", "futures 0.3.21", @@ -9083,8 +9080,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bitvec 1.0.0", "fatality", @@ -9101,8 +9098,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "always-assert", "assert_matches", @@ -9126,13 +9123,14 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-tracing", "sp-wasm-interface", + "tempfile", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -9147,8 +9145,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "futures 0.3.21", "memory-lru", @@ -9159,14 +9157,13 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-consensus-babe", - "sp-core", "tracing-gum", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "async-std", "lazy_static", @@ -9183,16 +9180,16 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bs58", "futures 0.3.21", "futures-timer", "log", - "metered-channel", "parity-scale-codec", "polkadot-primitives", + "prioritized-metered-channel", "sc-cli", "sc-service", "sc-tracing", @@ -9202,8 +9199,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "async-trait", "derive_more", @@ -9218,12 +9215,13 @@ dependencies = [ "sc-network", "strum 0.24.0", "thiserror", + "tracing-gum", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bounded-vec", "futures 0.3.21", @@ -9244,8 +9242,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -9254,15 +9252,15 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "derive_more", "futures 0.3.21", + "orchestra", "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", - "polkadot-overseer-gen", "polkadot-primitives", "polkadot-statement-table", "sc-network", @@ -9273,8 +9271,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "async-trait", "derive_more", @@ -9283,7 +9281,6 @@ dependencies = [ "itertools", "kvdb", "lru 0.7.6", - "metered-channel", "parity-db", "parity-scale-codec", "parity-util-mem", @@ -9296,6 +9293,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", + "prioritized-metered-channel", "rand 0.8.5", "sp-application-crypto", "sp-core", @@ -9306,58 +9304,30 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "futures 0.3.21", "futures-timer", "lru 0.7.6", + "orchestra", "parity-util-mem", "parking_lot 0.12.0", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem-types", - "polkadot-overseer-gen", "polkadot-primitives", "sc-client-api", "sp-api", + "sp-core", "tracing-gum", ] -[[package]] -name = "polkadot-overseer-gen" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "async-trait", - "futures 0.3.21", - "futures-timer", - "metered-channel", - "pin-project 1.0.10", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-overseer-gen-proc-macro", - "thiserror", - "tracing-gum", -] - -[[package]] -name = "polkadot-overseer-gen-proc-macro" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" -dependencies = [ - "expander 0.0.6", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "polkadot-parachain" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "derive_more", "frame-support", @@ -9373,8 +9343,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "env_logger", "kusama-runtime", @@ -9388,8 +9358,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bitvec 1.0.0", "frame-system", @@ -9418,8 +9388,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -9450,8 +9420,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "beefy-primitives", "bitvec 1.0.0", @@ -9536,8 +9506,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "beefy-primitives", "bitvec 1.0.0", @@ -9583,8 +9553,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-support", "polkadot-primitives", @@ -9595,8 +9565,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bs58", "parity-scale-codec", @@ -9607,8 +9577,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "bitflags", "bitvec 1.0.0", @@ -9650,8 +9620,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "async-trait", "beefy-gadget", @@ -9693,6 +9663,7 @@ dependencies = [ "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-parachain", @@ -9721,7 +9692,7 @@ dependencies = [ "sc-offchain", "sc-service", "sc-sync-state-rpc", - "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22)", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23)", "sc-telemetry", "sc-transaction-pool", "serde", @@ -9753,8 +9724,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -9774,8 +9745,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -9784,8 +9755,8 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "beefy-primitives", "bitvec 1.0.0", @@ -9846,8 +9817,8 @@ dependencies = [ [[package]] name = "polkadot-test-service" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-benchmarking", "frame-system", @@ -9940,20 +9911,6 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -[[package]] -name = "prettytable-rs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" -dependencies = [ - "atty", - "csv", - "encode_unicode", - "lazy_static", - "term", - "unicode-width", -] - [[package]] name = "primitive-types" version = "0.11.1" @@ -9968,6 +9925,21 @@ dependencies = [ "uint", ] +[[package]] +name = "prioritized-metered-channel" +version = "0.2.0" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" +dependencies = [ + "coarsetime", + "crossbeam-queue", + "derive_more", + "futures 0.3.21", + "futures-timer", + "nanorand", + "thiserror", + "tracing", +] + [[package]] name = "proc-macro-crate" version = "1.1.3" @@ -10055,7 +10027,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.9.0", +] + +[[package]] +name = "prost" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +dependencies = [ + "bytes", + "prost-derive 0.10.1", ] [[package]] @@ -10071,7 +10053,7 @@ dependencies = [ "log", "multimap", "petgraph", - "prost", + "prost 0.9.0", "prost-types", "regex", "tempfile", @@ -10091,6 +10073,19 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost-types" version = "0.9.0" @@ -10098,7 +10093,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost", + "prost 0.9.0", ] [[package]] @@ -10278,12 +10273,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.13" @@ -10293,17 +10282,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - [[package]] name = "redox_users" version = "0.4.3" @@ -10311,7 +10289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.6", - "redox_syscall 0.2.13", + "redox_syscall", "thiserror", ] @@ -10400,7 +10378,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "env_logger", "jsonrpsee", @@ -10509,8 +10487,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -10586,8 +10564,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-support", "polkadot-primitives", @@ -10706,7 +10684,7 @@ dependencies = [ "hex-literal", "karura-runtime", "kusama-runtime", - "kusama-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.22)", + "kusama-runtime-constants 0.9.23 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.23)", "libsecp256k1", "log", "mandala-runtime", @@ -10806,18 +10784,6 @@ dependencies = [ "xcm-executor", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.0", - "blake2b_simd 0.5.11", - "constant_time_eq", - "crossbeam-utils", -] - [[package]] name = "rustc-demangle" version = "0.1.21" @@ -10859,19 +10825,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.0", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - [[package]] name = "rustls" version = "0.20.6" @@ -10880,20 +10833,8 @@ checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -dependencies = [ - "openssl-probe", - "rustls 0.19.1", - "schannel", - "security-framework", + "sct", + "webpki", ] [[package]] @@ -10961,7 +10902,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "log", "sp-core", @@ -10972,7 +10913,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "futures 0.3.21", @@ -10981,7 +10922,7 @@ dependencies = [ "libp2p", "log", "parity-scale-codec", - "prost", + "prost 0.10.4", "prost-build", "rand 0.7.3", "sc-client-api", @@ -10999,7 +10940,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "futures-timer", @@ -11022,7 +10963,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -11038,7 +10979,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", @@ -11055,7 +10996,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11066,7 +11007,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "chrono", "clap 3.1.18", @@ -11105,7 +11046,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "fnv", "futures 0.3.21", @@ -11133,7 +11074,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "hash-db", "kvdb", @@ -11158,7 +11099,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "futures 0.3.21", @@ -11182,7 +11123,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "futures 0.3.21", @@ -11211,7 +11152,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "fork-tree", @@ -11254,7 +11195,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "jsonrpsee", @@ -11276,7 +11217,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "fork-tree", "parity-scale-codec", @@ -11289,7 +11230,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "assert_matches", "async-trait", @@ -11323,7 +11264,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "futures 0.3.21", @@ -11348,7 +11289,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "sc-client-api", "sp-authorship", @@ -11359,7 +11300,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "lazy_static", "lru 0.7.6", @@ -11386,7 +11327,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "environmental", "parity-scale-codec", @@ -11403,7 +11344,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "log", "parity-scale-codec", @@ -11418,7 +11359,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "cfg-if 1.0.0", "libc", @@ -11436,7 +11377,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "ahash", "async-trait", @@ -11476,7 +11417,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "finality-grandpa", "futures 0.3.21", @@ -11497,7 +11438,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "ansi_term", "futures 0.3.21", @@ -11514,7 +11455,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "hex", @@ -11529,7 +11470,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "asynchronous-codec", @@ -11551,13 +11492,14 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.0", "pin-project 1.0.10", - "prost", + "prost 0.10.4", "prost-build", "rand 0.7.3", "sc-block-builder", "sc-client-api", "sc-consensus", "sc-network-common", + "sc-network-light", "sc-network-sync", "sc-peerset", "sc-utils", @@ -11580,7 +11522,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "libp2p", @@ -11593,7 +11535,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "ahash", "futures 0.3.21", @@ -11607,10 +11549,30 @@ dependencies = [ "tracing", ] +[[package]] +name = "sc-network-light" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" +dependencies = [ + "futures 0.3.21", + "libp2p", + "log", + "parity-scale-codec", + "prost 0.10.4", + "prost-build", + "sc-client-api", + "sc-network-common", + "sc-peerset", + "sp-blockchain", + "sp-core", + "sp-runtime", + "thiserror", +] + [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "bitflags", "either", @@ -11620,7 +11582,7 @@ dependencies = [ "log", "lru 0.7.6", "parity-scale-codec", - "prost", + "prost 0.10.4", "prost-build", "sc-client-api", "sc-consensus", @@ -11639,7 +11601,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "bytes", "fnv", @@ -11667,7 +11629,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "libp2p", @@ -11680,7 +11642,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -11689,7 +11651,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "hash-db", @@ -11719,7 +11681,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "jsonrpsee", @@ -11742,7 +11704,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "jsonrpsee", @@ -11755,7 +11717,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "directories", @@ -11783,7 +11745,7 @@ dependencies = [ "sc-offchain", "sc-rpc", "sc-rpc-server", - "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb)", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596)", "sc-telemetry", "sc-tracing", "sc-transaction-pool", @@ -11820,7 +11782,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "log", "parity-scale-codec", @@ -11834,7 +11796,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -11853,7 +11815,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "libc", @@ -11872,7 +11834,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "libc", @@ -11891,7 +11853,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "chrono", "futures 0.3.21", @@ -11909,7 +11871,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "ansi_term", "atty", @@ -11940,7 +11902,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11951,7 +11913,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "futures-timer", @@ -11978,7 +11940,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "log", @@ -11991,7 +11953,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "futures-timer", @@ -12061,16 +12023,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sct" version = "0.7.0" @@ -12365,8 +12317,8 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "slot-range-helper" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "enumn", "parity-scale-codec", @@ -12442,7 +12394,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "hash-db", "log", @@ -12459,7 +12411,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "blake2 0.10.4", "proc-macro-crate", @@ -12471,7 +12423,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "scale-info", @@ -12484,7 +12436,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "integer-sqrt", "num-traits", @@ -12499,7 +12451,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "scale-info", @@ -12512,7 +12464,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "parity-scale-codec", @@ -12524,7 +12476,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "sp-api", @@ -12536,7 +12488,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "log", @@ -12554,7 +12506,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "futures 0.3.21", @@ -12573,7 +12525,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "parity-scale-codec", @@ -12591,7 +12543,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "merlin", @@ -12614,7 +12566,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "scale-info", @@ -12628,7 +12580,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "scale-info", @@ -12641,7 +12593,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "base58 0.2.0", "bitflags", @@ -12687,7 +12639,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "blake2 0.10.4", "byteorder", @@ -12701,7 +12653,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "proc-macro2", "quote", @@ -12712,7 +12664,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "kvdb", "parking_lot 0.12.0", @@ -12721,7 +12673,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "proc-macro2", "quote", @@ -12731,7 +12683,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "environmental", "parity-scale-codec", @@ -12742,7 +12694,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "finality-grandpa", "log", @@ -12760,7 +12712,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -12774,7 +12726,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "hash-db", @@ -12799,7 +12751,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "lazy_static", "sp-core", @@ -12810,7 +12762,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "futures 0.3.21", @@ -12827,7 +12779,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "thiserror", "zstd", @@ -12836,7 +12788,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "log", "parity-scale-codec", @@ -12851,7 +12803,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "scale-info", @@ -12865,7 +12817,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "sp-api", "sp-core", @@ -12875,7 +12827,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "backtrace", "lazy_static", @@ -12885,7 +12837,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "rustc-hash", "serde", @@ -12895,7 +12847,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "either", "hash256-std-hasher", @@ -12917,7 +12869,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -12934,7 +12886,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "Inflector", "proc-macro-crate", @@ -12946,7 +12898,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "log", "parity-scale-codec", @@ -12960,7 +12912,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "serde", "serde_json", @@ -12969,7 +12921,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "scale-info", @@ -12983,7 +12935,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "scale-info", @@ -12994,7 +12946,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "hash-db", "log", @@ -13016,12 +12968,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13034,7 +12986,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "log", "sp-core", @@ -13047,7 +12999,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "futures-timer", @@ -13063,7 +13015,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "sp-std", @@ -13075,7 +13027,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "sp-api", "sp-runtime", @@ -13084,7 +13036,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "log", @@ -13100,7 +13052,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "hash-db", "memory-db", @@ -13116,7 +13068,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13133,7 +13085,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -13144,7 +13096,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "impl-trait-for-tuples", "log", @@ -13194,7 +13146,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "statemine-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=7ffdccab93bbf011f00f61b12ff2e487ebe6294c#7ffdccab93bbf011f00f61b12ff2e487ebe6294c" +source = "git+https://github.com/paritytech//cumulus?rev=e5889f1d71975a192c98fa43b1c18c94ffda3bbd#e5889f1d71975a192c98fa43b1c18c94ffda3bbd" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -13210,7 +13162,7 @@ dependencies = [ "frame-support", "frame-system", "frame-system-rpc-runtime-api", - "kusama-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.22)", + "kusama-runtime-constants 0.9.23 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.23)", "log", "pallet-asset-tx-payment", "pallet-assets", @@ -13221,7 +13173,6 @@ dependencies = [ "pallet-multisig", "pallet-proxy", "pallet-session", - "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -13384,7 +13335,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "platforms 2.0.0", ] @@ -13392,7 +13343,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -13413,7 +13364,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures-util", "hyper", @@ -13426,7 +13377,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.22#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.23#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "jsonrpsee", "log", @@ -13447,7 +13398,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "async-trait", "futures 0.3.21", @@ -13473,7 +13424,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "futures 0.3.21", "substrate-test-utils-derive", @@ -13483,7 +13434,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -13494,7 +13445,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "ansi_term", "build-helper", @@ -13578,22 +13529,11 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "libc", - "redox_syscall 0.2.13", + "redox_syscall", "remove_dir_all", "winapi", ] -[[package]] -name = "term" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -dependencies = [ - "byteorder", - "dirs", - "winapi", -] - [[package]] name = "termcolor" version = "1.1.3" @@ -13605,8 +13545,8 @@ dependencies = [ [[package]] name = "test-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-support", "polkadot-primitives", @@ -13895,26 +13835,15 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki 0.21.4", -] - [[package]] name = "tokio-rustls" version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.6", + "rustls", "tokio", - "webpki 0.22.0", + "webpki", ] [[package]] @@ -13992,8 +13921,8 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -14003,8 +13932,8 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -14143,7 +14072,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=616d33ea23bab86cafffaf116fc607b6790fb4eb#616d33ea23bab86cafffaf116fc607b6790fb4eb" +source = "git+https://github.com/paritytech//substrate?rev=6cbe1772bf258793fa9845daa8f43ea0cadee596#6cbe1772bf258793fa9845daa8f43ea0cadee596" dependencies = [ "clap 3.1.18", "jsonrpsee", @@ -14656,6 +14585,7 @@ dependencies = [ "libc", "log", "mach", + "memfd", "memoffset", "more-asserts", "rand 0.8.5", @@ -14689,16 +14619,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki" version = "0.22.0" @@ -14715,7 +14635,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" dependencies = [ - "webpki 0.22.0", + "webpki", ] [[package]] @@ -14748,8 +14668,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "beefy-primitives", "bitvec 1.0.0", @@ -14837,8 +14757,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-support", "polkadot-primitives", @@ -15012,8 +14932,8 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -15025,8 +14945,8 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-support", "frame-system", @@ -15046,7 +14966,7 @@ dependencies = [ [[package]] name = "xcm-emulator" version = "0.1.0" -source = "git+https://github.com/shaunxw/xcm-simulator?rev=5a04d6286ee9082d4b7433541e48508f8b65616b#5a04d6286ee9082d4b7433541e48508f8b65616b" +source = "git+https://github.com/shaunxw/xcm-simulator?rev=897fff07c8ac51baf9afcb0a895980fce7a5c921#897fff07c8ac51baf9afcb0a895980fce7a5c921" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -15069,8 +14989,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-benchmarking", "frame-support", @@ -15088,7 +15008,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "Inflector", "proc-macro2", @@ -15098,8 +15018,8 @@ dependencies = [ [[package]] name = "xcm-simulator" -version = "0.9.22" -source = "git+https://github.com/paritytech//polkadot?rev=17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d#17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" +version = "0.9.23" +source = "git+https://github.com/paritytech//polkadot?rev=a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0#a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" dependencies = [ "frame-support", "parity-scale-codec", diff --git a/Cargo.toml b/Cargo.toml index f92c289833..d0b594adcd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -128,201 +128,201 @@ yamux = { opt-level = 3 } zeroize = { opt-level = 3 } [patch."https://github.com/paritytech/substrate"] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -frame-executive = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-gilt = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-nicks = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-society = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-beefy = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-bags-list = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -pallet-preimage = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -beefy-primitives = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -beefy-merkle-tree = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -beefy-gadget = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -beefy-gadget-rpc = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-cli = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-consensus-uncles = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-informant = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-network = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-service = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-serializer = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -substrate-test-client = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } -substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-executive = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-gilt = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-nicks = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-society = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-beefy = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-bags-list = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +pallet-preimage = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +beefy-primitives = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +beefy-merkle-tree = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +beefy-gadget = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +beefy-gadget-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-cli = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-consensus-uncles = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-informant = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-network = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-service = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-serializer = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +substrate-test-client = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } +substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "6cbe1772bf258793fa9845daa8f43ea0cadee596" } [patch."https://github.com/paritytech/polkadot"] -kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -test-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -xcm = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } +kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +test-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "a7e188cd9665c735f4b9d5a58cdbc4dd1850eae0" } [patch."https://github.com/paritytech/cumulus"] -cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -statemine-runtime = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } -parachains-common = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } +cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +statemine-runtime = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } +parachains-common = { git = "https://github.com/paritytech//cumulus", rev = "e5889f1d71975a192c98fa43b1c18c94ffda3bbd" } diff --git a/ecosystem-modules/compound-cash/Cargo.toml b/ecosystem-modules/compound-cash/Cargo.toml index ae4d48c31c..8528abc204 100644 --- a/ecosystem-modules/compound-cash/Cargo.toml +++ b/ecosystem-modules/compound-cash/Cargo.toml @@ -8,16 +8,16 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } module-support = { path = "../../modules/support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/ecosystem-modules/ren/renvm-bridge/Cargo.toml b/ecosystem-modules/ren/renvm-bridge/Cargo.toml index 07aaca5c1d..25af83b0e9 100644 --- a/ecosystem-modules/ren/renvm-bridge/Cargo.toml +++ b/ecosystem-modules/ren/renvm-bridge/Cargo.toml @@ -8,12 +8,12 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } support = { package = "module-support", path = "../../../modules/support", default-features = false } orml-traits = { path = "../../../orml/traits", default-features = false } primitives = { package = "acala-primitives", path = "../../../primitives", default-features = false } @@ -22,7 +22,7 @@ primitives = { package = "acala-primitives", path = "../../../primitives", defau hex-literal = "0.3.1" orml-currencies = { path = "../../../orml/currencies" } orml-tokens = { path = "../../../orml/tokens" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/ecosystem-modules/ren/renvm-bridge/src/mock.rs b/ecosystem-modules/ren/renvm-bridge/src/mock.rs index 20c1f37ebc..ed062c4086 100644 --- a/ecosystem-modules/ren/renvm-bridge/src/mock.rs +++ b/ecosystem-modules/ren/renvm-bridge/src/mock.rs @@ -105,6 +105,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { diff --git a/ecosystem-modules/stable-asset b/ecosystem-modules/stable-asset index 83dc2a7787..4b727152ba 160000 --- a/ecosystem-modules/stable-asset +++ b/ecosystem-modules/stable-asset @@ -1 +1 @@ -Subproject commit 83dc2a7787c10fdcfc1af851792ce1bf54408354 +Subproject commit 4b727152ba5c49d95407c51602148bd6301a036e diff --git a/ecosystem-modules/starport/Cargo.toml b/ecosystem-modules/starport/Cargo.toml index 24cc419cb1..651a6f1426 100644 --- a/ecosystem-modules/starport/Cargo.toml +++ b/ecosystem-modules/starport/Cargo.toml @@ -7,18 +7,18 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens"} diff --git a/ecosystem-modules/starport/src/lib.rs b/ecosystem-modules/starport/src/lib.rs index dbec396350..2df1a6a5f0 100644 --- a/ecosystem-modules/starport/src/lib.rs +++ b/ecosystem-modules/starport/src/lib.rs @@ -374,7 +374,12 @@ impl Pallet { // All other tokens are transferred to the admin's account. match currency_id { CurrencyId::Token(TokenSymbol::CASH) => T::Currency::withdraw(currency_id, &from, locked_amount), - _ => T::Currency::transfer(currency_id, &from, &T::PalletId::get().into_account(), locked_amount), + _ => T::Currency::transfer( + currency_id, + &from, + &T::PalletId::get().into_account_truncating(), + locked_amount, + ), }?; // Fund locked. Now reduce the supply caps @@ -399,11 +404,20 @@ impl Pallet { _ => { // Ensure the admin has sufficient balance for the transfer ensure!( - T::Currency::ensure_can_withdraw(currency_id, &T::PalletId::get().into_account(), unlock_amount) - .is_ok(), + T::Currency::ensure_can_withdraw( + currency_id, + &T::PalletId::get().into_account_truncating(), + unlock_amount + ) + .is_ok(), Error::::InsufficientAssetToUnlock ); - T::Currency::transfer(currency_id, &T::PalletId::get().into_account(), &to, unlock_amount) + T::Currency::transfer( + currency_id, + &T::PalletId::get().into_account_truncating(), + &to, + unlock_amount, + ) } }?; diff --git a/ecosystem-modules/starport/src/mock.rs b/ecosystem-modules/starport/src/mock.rs index 7709180360..46be35d044 100644 --- a/ecosystem-modules/starport/src/mock.rs +++ b/ecosystem-modules/starport/src/mock.rs @@ -97,6 +97,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { diff --git a/ecosystem-modules/starport/src/tests.rs b/ecosystem-modules/starport/src/tests.rs index 8ab470bea9..ab5d67cdff 100644 --- a/ecosystem-modules/starport/src/tests.rs +++ b/ecosystem-modules/starport/src/tests.rs @@ -49,7 +49,7 @@ fn lock_works() { // Locked ACALA are transferred from the user's account into Admin's account. assert_eq!(Currencies::free_balance(ACALA, &ALICE), 0); assert_eq!( - Currencies::free_balance(ACALA, &StarportPalletId::get().into_account()), + Currencies::free_balance(ACALA, &StarportPalletId::get().into_account_truncating()), INITIAL_BALANCE ); @@ -73,7 +73,7 @@ fn lock_works() { // Locked ACALA are transferred from the user's account into Admin's account. assert_eq!(Currencies::free_balance(CASH, &ALICE), 0); assert_eq!( - Currencies::free_balance(CASH, &StarportPalletId::get().into_account()), + Currencies::free_balance(CASH, &StarportPalletId::get().into_account_truncating()), 0 ); @@ -104,7 +104,7 @@ fn lock_to_works() { // Locked ACALA are transferred from the user's account into Admin's account. assert_eq!(Currencies::free_balance(ACALA, &ALICE), 0); assert_eq!( - Currencies::free_balance(ACALA, &StarportPalletId::get().into_account()), + Currencies::free_balance(ACALA, &StarportPalletId::get().into_account_truncating()), INITIAL_BALANCE ); // Supply caps are reduced accordingly. diff --git a/evm-tests b/evm-tests index 3f18ead64d..4aa67e0b83 160000 --- a/evm-tests +++ b/evm-tests @@ -1 +1 @@ -Subproject commit 3f18ead64d0adbf35312a2bfabb00b02be7f7c9c +Subproject commit 4aa67e0b832e487bfcb598517a95746c3f5adc2d diff --git a/inspect/Cargo.toml b/inspect/Cargo.toml index edc0084a5b..d34f859a3c 100644 --- a/inspect/Cargo.toml +++ b/inspect/Cargo.toml @@ -9,9 +9,9 @@ codec = { package = "parity-scale-codec", version = "3.0.0" } clap = { version = "3.1.6", features = ["derive"] } derive_more = "0.99" log = "0.4.17" -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } diff --git a/modules/aggregated-dex/Cargo.toml b/modules/aggregated-dex/Cargo.toml index b315b4ddae..7ef519bc66 100644 --- a/modules/aggregated-dex/Cargo.toml +++ b/modules/aggregated-dex/Cargo.toml @@ -8,11 +8,11 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", 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,10 @@ module-dex = { package = "module-dex", path = "../dex", default-features = false orml-tokens = { path = "../../orml/tokens", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +orml-tokens = { path = "../../orml/tokens" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/modules/aggregated-dex/src/mock.rs b/modules/aggregated-dex/src/mock.rs index 4bb4c93fdd..7fc8e11e3f 100644 --- a/modules/aggregated-dex/src/mock.rs +++ b/modules/aggregated-dex/src/mock.rs @@ -95,6 +95,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } ord_parameter_types! { diff --git a/modules/asset-registry/Cargo.toml b/modules/asset-registry/Cargo.toml index ee00ffd65a..5b8dcb3c4e 100644 --- a/modules/asset-registry/Cargo.toml +++ b/modules/asset-registry/Cargo.toml @@ -9,23 +9,23 @@ log = { version = "0.4.17", default-features = false } serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] serde_json = "1.0.68" hex = "0.4" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } module-evm = { path = "../evm" } module-evm-bridge = { path = "../evm-bridge" } diff --git a/modules/auction-manager/Cargo.toml b/modules/auction-manager/Cargo.toml index e84cd55219..86ab900d11 100644 --- a/modules/auction-manager/Cargo.toml +++ b/modules/auction-manager/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } 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/mock.rs b/modules/auction-manager/src/mock.rs index 5f3921a2d9..c68d3e15e3 100644 --- a/modules/auction-manager/src/mock.rs +++ b/modules/auction-manager/src/mock.rs @@ -99,6 +99,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl orml_auction::Config for Runtime { @@ -117,7 +119,7 @@ parameter_types! { pub const GetStableCurrencyId: CurrencyId = AUSD; pub const MaxAuctionsCount: u32 = 10_000; pub const CDPTreasuryPalletId: PalletId = PalletId(*b"aca/cdpt"); - pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account(); + pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account_truncating(); pub AlternativeSwapPathJointList: Vec> = vec![ vec![DOT], ]; diff --git a/modules/cdp-engine/Cargo.toml b/modules/cdp-engine/Cargo.toml index fd129cb7da..914ab780f3 100644 --- a/modules/cdp-engine/Cargo.toml +++ b/modules/cdp-engine/Cargo.toml @@ -8,14 +8,14 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } @@ -23,9 +23,9 @@ rand_chacha = { version = "0.2", default-features = false } nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } 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/mock.rs b/modules/cdp-engine/src/mock.rs index b3d4254e7d..b634d4a486 100644 --- a/modules/cdp-engine/src/mock.rs +++ b/modules/cdp-engine/src/mock.rs @@ -103,6 +103,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Runtime { @@ -217,7 +219,7 @@ impl AuctionManager for MockAuctionManager { parameter_types! { pub const GetStableCurrencyId: CurrencyId = AUSD; pub const CDPTreasuryPalletId: PalletId = PalletId(*b"aca/cdpt"); - pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account(); + pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account_truncating(); pub AlternativeSwapPathJointList: Vec> = vec![ vec![ACA], ]; diff --git a/modules/cdp-treasury/Cargo.toml b/modules/cdp-treasury/Cargo.toml index 918e23fa6e..f7560dccf0 100644 --- a/modules/cdp-treasury/Cargo.toml +++ b/modules/cdp-treasury/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } 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 88031c6aba..b061d8c178 100644 --- a/modules/cdp-treasury/src/lib.rs +++ b/modules/cdp-treasury/src/lib.rs @@ -269,7 +269,7 @@ pub mod module { impl Pallet { /// Get account of cdp treasury module. pub fn account_id() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } /// Get current total surplus of system. diff --git a/modules/cdp-treasury/src/mock.rs b/modules/cdp-treasury/src/mock.rs index 035c390d96..98aedd058e 100644 --- a/modules/cdp-treasury/src/mock.rs +++ b/modules/cdp-treasury/src/mock.rs @@ -102,6 +102,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Runtime { diff --git a/modules/collator-selection/Cargo.toml b/modules/collator-selection/Cargo.toml index 8da762eacb..f0050fbc3a 100644 --- a/modules/collator-selection/Cargo.toml +++ b/modules/collator-selection/Cargo.toml @@ -13,26 +13,26 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ['std'] diff --git a/modules/collator-selection/src/lib.rs b/modules/collator-selection/src/lib.rs index 1c1867b8f4..5005370791 100644 --- a/modules/collator-selection/src/lib.rs +++ b/modules/collator-selection/src/lib.rs @@ -390,7 +390,7 @@ pub mod pallet { impl Pallet { /// Get a unique, inaccessible account id from the `PotId`. pub fn account_id() -> T::AccountId { - T::PotId::get().into_account() + T::PotId::get().into_account_truncating() } /// Removes a candidate if they exist and sends them back their deposit diff --git a/modules/currencies/Cargo.toml b/modules/currencies/Cargo.toml index 8ccc7c4da5..6026231153 100644 --- a/modules/currencies/Cargo.toml +++ b/modules/currencies/Cargo.toml @@ -8,13 +8,13 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } @@ -26,9 +26,9 @@ support = { package = "module-support", path = "../support", default-features = serde_json = "1.0.68" hex = "0.4" hex-literal = "0.3.1" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } tokens = { package = "orml-tokens", path = "../../orml/tokens" } module-evm = { path = "../evm" } module-evm-bridge = { path = "../evm-bridge" } diff --git a/modules/currencies/src/mock.rs b/modules/currencies/src/mock.rs index 5179f25e92..d621411abd 100644 --- a/modules/currencies/src/mock.rs +++ b/modules/currencies/src/mock.rs @@ -79,7 +79,7 @@ parameter_type_with_key! { } parameter_types! { - pub DustAccount: AccountId = PalletId(*b"orml/dst").into_account(); + pub DustAccount: AccountId = PalletId(*b"orml/dst").into_account_truncating(); } impl tokens::Config for Runtime { @@ -94,6 +94,8 @@ impl tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } pub const NATIVE_CURRENCY_ID: CurrencyId = CurrencyId::Token(TokenSymbol::ACA); diff --git a/modules/dex-oracle/Cargo.toml b/modules/dex-oracle/Cargo.toml index 84d655b122..4433158154 100644 --- a/modules/dex-oracle/Cargo.toml +++ b/modules/dex-oracle/Cargo.toml @@ -8,20 +8,20 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/modules/dex/Cargo.toml b/modules/dex/Cargo.toml index c03091f260..4924c783d5 100644 --- a/modules/dex/Cargo.toml +++ b/modules/dex/Cargo.toml @@ -8,20 +8,20 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] orml-tokens = { path = "../../orml/tokens" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/modules/dex/src/lib.rs b/modules/dex/src/lib.rs index 4140158cd9..cc3732e2e4 100644 --- a/modules/dex/src/lib.rs +++ b/modules/dex/src/lib.rs @@ -848,7 +848,7 @@ pub mod module { impl Pallet { fn account_id() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } fn try_mutate_liquidity_pool( diff --git a/modules/dex/src/mock.rs b/modules/dex/src/mock.rs index e8063f57b2..69aee2a56d 100644 --- a/modules/dex/src/mock.rs +++ b/modules/dex/src/mock.rs @@ -99,6 +99,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } pub struct MockDEXIncentives; diff --git a/modules/earning/Cargo.toml b/modules/earning/Cargo.toml index 4931c5130b..757ff72719 100644 --- a/modules/earning/Cargo.toml +++ b/modules/earning/Cargo.toml @@ -9,11 +9,11 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } @@ -23,8 +23,8 @@ primitives = { package = "acala-primitives", path = "../../primitives", default- paste = "1.0" [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/modules/emergency-shutdown/Cargo.toml b/modules/emergency-shutdown/Cargo.toml index 6c0f3bd246..6d06b94e5c 100644 --- a/modules/emergency-shutdown/Cargo.toml +++ b/modules/emergency-shutdown/Cargo.toml @@ -8,18 +8,18 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } orml-currencies = { path = "../../orml/currencies" } orml-traits = { path = "../../orml/traits" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/emergency-shutdown/src/mock.rs b/modules/emergency-shutdown/src/mock.rs index d11f994bac..45f94ca3fe 100644 --- a/modules/emergency-shutdown/src/mock.rs +++ b/modules/emergency-shutdown/src/mock.rs @@ -98,6 +98,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Runtime { @@ -203,7 +205,7 @@ ord_parameter_types! { parameter_types! { pub const GetStableCurrencyId: CurrencyId = AUSD; pub const CDPTreasuryPalletId: PalletId = PalletId(*b"aca/cdpt"); - pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account(); + pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account_truncating(); pub AlternativeSwapPathJointList: Vec> = vec![]; } diff --git a/modules/evm-accounts/Cargo.toml b/modules/evm-accounts/Cargo.toml index 9e0013abcc..aecab5f12a 100644 --- a/modules/evm-accounts/Cargo.toml +++ b/modules/evm-accounts/Cargo.toml @@ -10,12 +10,12 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = libsecp256k1 = { version = "0.7", default-features = false, features = ["hmac", "static-context"], optional = true } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } @@ -24,7 +24,7 @@ module-support = { path = "../support", default-features = false } module-evm-utility-macro = { path = "../evm-utility/macro" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/evm-accounts/src/mock.rs b/modules/evm-accounts/src/mock.rs index 68947ecff5..e4db5f0b54 100644 --- a/modules/evm-accounts/src/mock.rs +++ b/modules/evm-accounts/src/mock.rs @@ -97,6 +97,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { diff --git a/modules/evm-bridge/Cargo.toml b/modules/evm-bridge/Cargo.toml index 302c7c0dde..fbbca2d340 100644 --- a/modules/evm-bridge/Cargo.toml +++ b/modules/evm-bridge/Cargo.toml @@ -11,12 +11,12 @@ targets = ["x86_64-unknown-linux-gnu"] serde = { version = "1.0.136", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder"] } impl-trait-for-tuples = "0.2.2" ethereum-types = { version = "0.13.1", default-features = false } @@ -29,8 +29,8 @@ num_enum = { version = "0.5.1", default-features = false } [dev-dependencies] serde_json = "1.0.68" hex = "0.4" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml index 704ac4aa5a..f163cd6ccb 100644 --- a/modules/evm-utility/Cargo.toml +++ b/modules/evm-utility/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] sha3 = { version = "0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } evm = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false, features = ["with-codec"] } evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false } diff --git a/modules/evm/Cargo.toml b/modules/evm/Cargo.toml index b4774612c5..78280c1dba 100644 --- a/modules/evm/Cargo.toml +++ b/modules/evm/Cargo.toml @@ -24,15 +24,15 @@ hex = { version = "0.4", default-features = false, features = ["alloc"], optiona num = { version = "0.4", features = ["alloc"], default-features = false } bn = { package = "substrate-bn", version = "0.6", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-bencher = { path = "../../orml/bencher", default-features = false, optional = true } orml-currencies = { path = "../../orml/currencies", default-features = false, optional = true } @@ -45,7 +45,7 @@ module-idle-scheduler = { path = "../idle-scheduler", default-features = false, module-transaction-payment = { path = "../../modules/transaction-payment", default-features = false } module-dex = { path = "../dex", default-features = false, optional = true } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } [dev-dependencies] hex = "0.4" diff --git a/modules/evm/rpc/Cargo.toml b/modules/evm/rpc/Cargo.toml index a516f5ef63..99c75cd1ae 100644 --- a/modules/evm/rpc/Cargo.toml +++ b/modules/evm/rpc/Cargo.toml @@ -9,16 +9,16 @@ jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } rustc-hex = "2.1.0" serde = { version = "1.0.136", features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } primitives = { package = "acala-primitives", path = "../../../primitives" } module-evm-rpc-runtime-api = { path = "runtime_api" } diff --git a/modules/evm/rpc/runtime_api/Cargo.toml b/modules/evm/rpc/runtime_api/Cargo.toml index fb17572bbb..b9d91a5978 100644 --- a/modules/evm/rpc/runtime_api/Cargo.toml +++ b/modules/evm/rpc/runtime_api/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } primitives = { package = "acala-primitives", path = "../../../../primitives", default-features = false } [features] diff --git a/modules/evm/src/bench/mock.rs b/modules/evm/src/bench/mock.rs index 513b06d154..3bb9d0ef5b 100644 --- a/modules/evm/src/bench/mock.rs +++ b/modules/evm/src/bench/mock.rs @@ -112,6 +112,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = ReserveIdentifier; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { @@ -212,7 +214,7 @@ parameter_types! { pub MaxSwapSlippageCompareToOracle: Ratio = Ratio::one(); pub const TreasuryPalletId: PalletId = PalletId(*b"aca/trsy"); pub const TransactionPaymentPalletId: PalletId = PalletId(*b"aca/fees"); - pub KaruraTreasuryAccount: AccountId32 = TreasuryPalletId::get().into_account(); + pub KaruraTreasuryAccount: AccountId32 = TreasuryPalletId::get().into_account_truncating(); pub const CustomFeeSurplus: Percent = Percent::from_percent(50); pub const AlternativeFeeSurplus: Percent = Percent::from_percent(25); pub DefaultFeeTokens: Vec = vec![AUSD]; @@ -240,12 +242,12 @@ impl module_transaction_payment::Config for Runtime { type Currency = Balances; type MultiCurrency = Currencies; type OnTransactionPayment = (); - type TransactionByteFee = ConstU128<10>; type OperationalFeeMultiplier = ConstU64<5>; type TipPerWeightStep = ConstU128<1>; type MaxTipsOfPriority = ConstU128<1000>; type AlternativeFeeSwapDeposit = ExistenceRequirement; type WeightToFee = IdentityFee; + type TransactionByteFee = ConstU128<10>; type FeeMultiplierUpdate = (); type DEX = Dex; type MaxSwapSlippageCompareToOracle = MaxSwapSlippageCompareToOracle; diff --git a/modules/evm/src/mock.rs b/modules/evm/src/mock.rs index ef7b5f3fec..4d7a9c5244 100644 --- a/modules/evm/src/mock.rs +++ b/modules/evm/src/mock.rs @@ -107,6 +107,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = ReserveIdentifier; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { diff --git a/modules/example/Cargo.toml b/modules/example/Cargo.toml index 33572be76c..f67ea55aef 100644 --- a/modules/example/Cargo.toml +++ b/modules/example/Cargo.toml @@ -8,13 +8,13 @@ edition = "2021" serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/modules/homa-lite/Cargo.toml b/modules/homa-lite/Cargo.toml index 1480469776..c82a6e1904 100644 --- a/modules/homa-lite/Cargo.toml +++ b/modules/homa-lite/Cargo.toml @@ -7,27 +7,27 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } module-relaychain = { path = "../relaychain", features = ["kusama"] } [features] diff --git a/modules/homa-lite/src/mock.rs b/modules/homa-lite/src/mock.rs index c45b8395da..40b96380d9 100644 --- a/modules/homa-lite/src/mock.rs +++ b/modules/homa-lite/src/mock.rs @@ -225,6 +225,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Runtime { diff --git a/modules/homa-lite/src/mock_no_fees.rs b/modules/homa-lite/src/mock_no_fees.rs index c49232ae91..f631a479f7 100644 --- a/modules/homa-lite/src/mock_no_fees.rs +++ b/modules/homa-lite/src/mock_no_fees.rs @@ -173,6 +173,8 @@ impl orml_tokens::Config for NoFeeRuntime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for NoFeeRuntime { diff --git a/modules/homa-validator-list/Cargo.toml b/modules/homa-validator-list/Cargo.toml index e66af87c2f..2facb374a4 100644 --- a/modules/homa-validator-list/Cargo.toml +++ b/modules/homa-validator-list/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } orml-tokens = { path = "../../orml/tokens" } orml-currencies = { path = "../../orml/currencies" } diff --git a/modules/homa-validator-list/src/mock.rs b/modules/homa-validator-list/src/mock.rs index a2d2fea140..684ed45992 100644 --- a/modules/homa-validator-list/src/mock.rs +++ b/modules/homa-validator-list/src/mock.rs @@ -94,6 +94,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Runtime { diff --git a/modules/homa/Cargo.toml b/modules/homa/Cargo.toml index f71bca17ab..58bd8d6727 100644 --- a/modules/homa/Cargo.toml +++ b/modules/homa/Cargo.toml @@ -7,23 +7,23 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } [features] default = ["std"] diff --git a/modules/homa/src/lib.rs b/modules/homa/src/lib.rs index aa295149cb..c06413828b 100644 --- a/modules/homa/src/lib.rs +++ b/modules/homa/src/lib.rs @@ -626,7 +626,7 @@ pub mod module { impl Pallet { /// Module account id pub fn account_id() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } pub fn do_update_ledger( diff --git a/modules/homa/src/mock.rs b/modules/homa/src/mock.rs index 880df99da6..bad1b8e472 100644 --- a/modules/homa/src/mock.rs +++ b/modules/homa/src/mock.rs @@ -122,6 +122,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Runtime { diff --git a/modules/honzon-bridge/Cargo.toml b/modules/honzon-bridge/Cargo.toml index de6a1d3b73..fa031d2940 100644 --- a/modules/honzon-bridge/Cargo.toml +++ b/modules/honzon-bridge/Cargo.toml @@ -8,17 +8,17 @@ edition = "2021" serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } module-currencies = { path = "../../modules/currencies" } module-support = { path = "../../modules/support" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/honzon-bridge/src/lib.rs b/modules/honzon-bridge/src/lib.rs index 504e9bbb45..d67f0f60a7 100644 --- a/modules/honzon-bridge/src/lib.rs +++ b/modules/honzon-bridge/src/lib.rs @@ -131,6 +131,6 @@ pub mod module { impl Pallet { // Returns the current pallet's account ID. pub fn account_id() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } } diff --git a/modules/honzon-bridge/src/mock.rs b/modules/honzon-bridge/src/mock.rs index 73bf953440..a009b8aedc 100644 --- a/modules/honzon-bridge/src/mock.rs +++ b/modules/honzon-bridge/src/mock.rs @@ -90,6 +90,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Runtime { diff --git a/modules/honzon/Cargo.toml b/modules/honzon/Cargo.toml index a20aafd29a..cbf689e103 100644 --- a/modules/honzon/Cargo.toml +++ b/modules/honzon/Cargo.toml @@ -8,20 +8,20 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } cdp-engine = { package = "module-cdp-engine", path = "../cdp-engine", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } orml-currencies = { path = "../../orml/currencies" } orml-traits = { path = "../../orml/traits" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/honzon/src/mock.rs b/modules/honzon/src/mock.rs index 6dc788d48b..9e1177b68b 100644 --- a/modules/honzon/src/mock.rs +++ b/modules/honzon/src/mock.rs @@ -101,6 +101,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = ReserveIdentifier; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Runtime { @@ -201,7 +203,7 @@ ord_parameter_types! { parameter_types! { pub const GetStableCurrencyId: CurrencyId = AUSD; pub const CDPTreasuryPalletId: PalletId = PalletId(*b"aca/cdpt"); - pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account(); + pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account_truncating(); pub AlternativeSwapPathJointList: Vec> = vec![ vec![AUSD], ]; diff --git a/modules/idle-scheduler/Cargo.toml b/modules/idle-scheduler/Cargo.toml index e1598a155a..b6df91d20b 100644 --- a/modules/idle-scheduler/Cargo.toml +++ b/modules/idle-scheduler/Cargo.toml @@ -8,16 +8,16 @@ edition = "2021" serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } acala-primitives = { path = "../../primitives", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/modules/incentives/Cargo.toml b/modules/incentives/Cargo.toml index 98e2ff37ea..0c573e4cc1 100644 --- a/modules/incentives/Cargo.toml +++ b/modules/incentives/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-rewards = { path = "../../orml/rewards", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } 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 0017cf0ec7..7f9e68ca94 100644 --- a/modules/incentives/src/lib.rs +++ b/modules/incentives/src/lib.rs @@ -453,7 +453,7 @@ pub mod module { impl Pallet { pub fn account_id() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } // accumulate incentive rewards of multi currencies diff --git a/modules/incentives/src/mock.rs b/modules/incentives/src/mock.rs index fa50be57bb..6b28669ea0 100644 --- a/modules/incentives/src/mock.rs +++ b/modules/incentives/src/mock.rs @@ -106,6 +106,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } pub struct MockCDPTreasury; diff --git a/modules/loans/Cargo.toml b/modules/loans/Cargo.toml index 69be3b364f..c757047054 100644 --- a/modules/loans/Cargo.toml +++ b/modules/loans/Cargo.toml @@ -8,18 +8,18 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", 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.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } 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 11107cc742..a905ea563c 100644 --- a/modules/loans/src/lib.rs +++ b/modules/loans/src/lib.rs @@ -132,7 +132,7 @@ pub mod module { impl Pallet { pub fn account_id() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } /// confiscate collateral and debit to cdp treasury. diff --git a/modules/loans/src/mock.rs b/modules/loans/src/mock.rs index da012a6726..eef068158d 100644 --- a/modules/loans/src/mock.rs +++ b/modules/loans/src/mock.rs @@ -99,6 +99,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Runtime { @@ -160,7 +162,7 @@ ord_parameter_types! { parameter_types! { pub const GetStableCurrencyId: CurrencyId = AUSD; pub const CDPTreasuryPalletId: PalletId = PalletId(*b"aca/cdpt"); - pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account(); + pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account_truncating(); pub AlternativeSwapPathJointList: Vec> = vec![]; } diff --git a/modules/nft/Cargo.toml b/modules/nft/Cargo.toml index 0ff3b1ab69..6a29491229 100644 --- a/modules/nft/Cargo.toml +++ b/modules/nft/Cargo.toml @@ -9,22 +9,22 @@ serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-nft = { path = "../../orml/nft", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } 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 993276a8e5..437170c330 100644 --- a/modules/nft/src/benchmarking.rs +++ b/modules/nft/src/benchmarking.rs @@ -52,7 +52,8 @@ fn create_token_class(caller: T::AccountId) -> Result::Currency::make_free_balance_be(&caller, base_currency_amount.unique_saturated_into()); - let module_account: T::AccountId = T::PalletId::get().into_sub_account(orml_nft::Pallet::::next_class_id()); + let module_account: T::AccountId = + T::PalletId::get().into_sub_account_truncating(orml_nft::Pallet::::next_class_id()); crate::Pallet::::create_class( RawOrigin::Signed(caller).into(), vec![1], diff --git a/modules/nft/src/lib.rs b/modules/nft/src/lib.rs index 9a0632738f..ff68af5daa 100644 --- a/modules/nft/src/lib.rs +++ b/modules/nft/src/lib.rs @@ -218,7 +218,7 @@ pub mod module { ) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; let next_id = orml_nft::Pallet::::next_class_id(); - let owner: T::AccountId = T::PalletId::get().into_sub_account(next_id); + let owner: T::AccountId = T::PalletId::get().into_sub_account_truncating(next_id); let class_deposit = T::CreateClassDeposit::get(); let data_deposit = Self::data_deposit(&metadata, &attributes)?; @@ -514,24 +514,24 @@ impl InspectExtended for Pallet { orml_nft::TokensByOwner::::iter_prefix((who,)).count() as u128 } - fn next_token_id(class: Self::ClassId) -> Self::InstanceId { + fn next_token_id(class: Self::CollectionId) -> Self::ItemId { orml_nft::Pallet::::next_token_id(class) } } impl Inspect for Pallet { - type InstanceId = TokenIdOf; - type ClassId = ClassIdOf; + type ItemId = TokenIdOf; + type CollectionId = ClassIdOf; - fn owner(class: &Self::ClassId, instance: &Self::InstanceId) -> Option { + fn owner(class: &Self::CollectionId, instance: &Self::ItemId) -> Option { orml_nft::Pallet::::tokens(class, instance).map(|t| t.owner) } - fn class_owner(class: &Self::ClassId) -> Option { + fn collection_owner(class: &Self::CollectionId) -> Option { orml_nft::Pallet::::classes(class).map(|c| c.owner) } - fn can_transfer(class: &Self::ClassId, _: &Self::InstanceId) -> bool { + fn can_transfer(class: &Self::CollectionId, _: &Self::ItemId) -> bool { orml_nft::Pallet::::classes(class).map_or(false, |class_info| { class_info.data.properties.0.contains(ClassProperty::Transferable) }) @@ -540,22 +540,23 @@ impl Inspect for Pallet { impl Mutate for Pallet { /// Mint some asset `instance` of `class` to be owned by `who`. - fn mint_into(class: &Self::ClassId, instance: &Self::InstanceId, who: &T::AccountId) -> DispatchResult { + fn mint_into(class: &Self::CollectionId, instance: &Self::ItemId, who: &T::AccountId) -> DispatchResult { // Ensure the next token ID is correct ensure!( orml_nft::Pallet::::next_token_id(class) == *instance, Error::::IncorrectTokenId ); - let class_owner = >::class_owner(class).ok_or(Error::::ClassIdNotFound)?; + let class_owner = + >::collection_owner(class).ok_or(Error::::ClassIdNotFound)?; Self::do_mint(&class_owner, who, *class, Default::default(), Default::default(), 1u32)?; Ok(()) } /// Burn some asset `instance` of `class`. fn burn( - class: &Self::ClassId, - instance: &Self::InstanceId, + class: &Self::CollectionId, + instance: &Self::ItemId, _maybe_check_owner: Option<&T::AccountId>, ) -> DispatchResult { let owner = >::owner(class, instance).ok_or(Error::::TokenIdNotFound)?; @@ -565,7 +566,7 @@ impl Mutate for Pallet { impl Transfer for Pallet { /// Transfer asset `instance` of `class` into `destination` account. - fn transfer(class: &Self::ClassId, instance: &Self::InstanceId, destination: &T::AccountId) -> DispatchResult { + fn transfer(class: &Self::CollectionId, instance: &Self::ItemId, destination: &T::AccountId) -> DispatchResult { let owner = >::owner(class, instance).ok_or(Error::::TokenIdNotFound)?; Self::do_transfer(&owner, destination, (*class, *instance)) } diff --git a/modules/nft/src/mock.rs b/modules/nft/src/mock.rs index 19e8376b46..4a53773918 100644 --- a/modules/nft/src/mock.rs +++ b/modules/nft/src/mock.rs @@ -158,6 +158,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } pub const NATIVE_CURRENCY_ID: CurrencyId = CurrencyId::Token(TokenSymbol::ACA); diff --git a/modules/nft/src/tests.rs b/modules/nft/src/tests.rs index 1de4ddfba1..dca2973041 100644 --- a/modules/nft/src/tests.rs +++ b/modules/nft/src/tests.rs @@ -38,7 +38,7 @@ fn reserved_balance(who: &AccountId) -> Balance { } fn class_id_account() -> AccountId { - ::PalletId::get().into_sub_account(CLASS_ID) + ::PalletId::get().into_sub_account_truncating(CLASS_ID) } fn test_attr(x: u8) -> Attributes { diff --git a/modules/nominees-election/Cargo.toml b/modules/nominees-election/Cargo.toml index 22bb7c0eab..c50a48c29f 100644 --- a/modules/nominees-election/Cargo.toml +++ b/modules/nominees-election/Cargo.toml @@ -8,18 +8,18 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/nominees-election/src/mock.rs b/modules/nominees-election/src/mock.rs index 191945ec5e..c932a4ed51 100644 --- a/modules/nominees-election/src/mock.rs +++ b/modules/nominees-election/src/mock.rs @@ -89,6 +89,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Runtime { diff --git a/modules/prices/Cargo.toml b/modules/prices/Cargo.toml index 9e5fc43daa..102f73f037 100644 --- a/modules/prices/Cargo.toml +++ b/modules/prices/Cargo.toml @@ -8,17 +8,17 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } orml-tokens = { path = "../../orml/tokens" } [features] diff --git a/modules/prices/src/mock.rs b/modules/prices/src/mock.rs index 3b16a88389..4cb98dcecb 100644 --- a/modules/prices/src/mock.rs +++ b/modules/prices/src/mock.rs @@ -211,6 +211,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl BlockNumberProvider for MockRelayBlockNumberProvider { diff --git a/modules/relaychain/Cargo.toml b/modules/relaychain/Cargo.toml index 527d8b23de..6ceb8322a1 100644 --- a/modules/relaychain/Cargo.toml +++ b/modules/relaychain/Cargo.toml @@ -7,18 +7,18 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } module-support = { path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/modules/session-manager/Cargo.toml b/modules/session-manager/Cargo.toml index 7d64f031e0..29f1a898f6 100644 --- a/modules/session-manager/Cargo.toml +++ b/modules/session-manager/Cargo.toml @@ -9,15 +9,15 @@ log = { version = "0.4.17", default-features = false } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/modules/support/Cargo.toml b/modules/support/Cargo.toml index e4e5ca1a1e..29a3bb30f5 100644 --- a/modules/support/Cargo.toml +++ b/modules/support/Cargo.toml @@ -8,14 +8,14 @@ edition = "2021" impl-trait-for-tuples = "0.2.2" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } [features] default = ["std"] diff --git a/modules/transaction-pause/Cargo.toml b/modules/transaction-pause/Cargo.toml index 836c890441..cafc721670 100644 --- a/modules/transaction-pause/Cargo.toml +++ b/modules/transaction-pause/Cargo.toml @@ -7,15 +7,15 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } orml-tokens = { path = "../../orml/tokens" } orml-traits = { path = "../../orml/traits" } primitives = { package = "acala-primitives", path = "../../primitives" } diff --git a/modules/transaction-pause/src/mock.rs b/modules/transaction-pause/src/mock.rs index 2b870c5580..4a89b7de99 100644 --- a/modules/transaction-pause/src/mock.rs +++ b/modules/transaction-pause/src/mock.rs @@ -96,6 +96,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } ord_parameter_types! { diff --git a/modules/transaction-payment/Cargo.toml b/modules/transaction-payment/Cargo.toml index d42e968141..9c4517c986 100644 --- a/modules/transaction-payment/Cargo.toml +++ b/modules/transaction-payment/Cargo.toml @@ -8,22 +8,22 @@ edition = "2021" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } 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 c5aa08c7f9..9387dcae86 100644 --- a/modules/transaction-payment/src/lib.rs +++ b/modules/transaction-payment/src/lib.rs @@ -36,7 +36,7 @@ use frame_support::{ WithdrawReasons, }, transactional, - weights::{DispatchInfo, GetDispatchInfo, Pays, PostDispatchInfo, WeightToFeeCoefficient, WeightToFeePolynomial}, + weights::{DispatchInfo, GetDispatchInfo, Pays, PostDispatchInfo, WeightToFee}, BoundedVec, PalletId, }; use frame_system::pallet_prelude::*; @@ -297,7 +297,7 @@ pub mod module { /// Convert a weight value into a deductible fee based on the currency /// type. - type WeightToFee: WeightToFeePolynomial>; + type WeightToFee: WeightToFee>; /// Update the multiplier of the next block, based on the previous /// block's weight. @@ -344,16 +344,6 @@ pub mod module { type UpdateOrigin: EnsureOrigin; } - #[pallet::extra_constants] - impl Pallet { - //TODO: rename to snake case after https://github.com/paritytech/substrate/issues/8826 fixed. - #[allow(non_snake_case)] - /// The polynomial that is applied in order to derive fee from weight. - fn WeightToFee() -> Vec>> { - T::WeightToFee::polynomial().to_vec() - } - } - #[pallet::type_value] pub fn DefaultFeeMultiplier() -> Multiplier { Multiplier::saturating_from_integer(1) @@ -762,7 +752,7 @@ where // cap the weight to the maximum defined in runtime, otherwise it will be the // `Bounded` maximum of its data type, which is not desired. let capped_weight = weight.min(T::BlockWeights::get().max_block); - T::WeightToFee::calc(&capped_weight) + T::WeightToFee::weight_to_fee(&capped_weight) } /// If native asset is enough, return `None`, else return the fee amount should be swapped. @@ -946,7 +936,7 @@ where /// The sub account derivated by `PalletId`. fn sub_account_id(id: CurrencyId) -> T::AccountId { - T::PalletId::get().into_sub_account(id) + T::PalletId::get().into_sub_account_truncating(id) } /// Calculate the new exchange rate. diff --git a/modules/transaction-payment/src/mock.rs b/modules/transaction-payment/src/mock.rs index 23c253d347..4b46e21b89 100644 --- a/modules/transaction-payment/src/mock.rs +++ b/modules/transaction-payment/src/mock.rs @@ -25,7 +25,7 @@ pub use crate as transaction_payment; use frame_support::{ construct_runtime, ord_parameter_types, parameter_types, traits::{ConstU128, ConstU32, ConstU64, Everything, Nothing}, - weights::WeightToFeeCoefficients, + weights::{WeightToFeeCoefficients, WeightToFeePolynomial}, PalletId, }; use frame_system::EnsureSignedBy; @@ -120,6 +120,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Runtime { @@ -241,7 +243,7 @@ parameter_types! { pub const HigerSwapThreshold: Balance = 9500; pub const TransactionPaymentPalletId: PalletId = PalletId(*b"aca/fees"); pub const TreasuryPalletId: PalletId = PalletId(*b"aca/trsy"); - pub KaruraTreasuryAccount: AccountId = TreasuryPalletId::get().into_account(); + pub KaruraTreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating(); } ord_parameter_types! { pub const ListingOrigin: AccountId = ALICE; @@ -257,11 +259,11 @@ impl Config for Runtime { type Currency = PalletBalances; type MultiCurrency = Currencies; type OnTransactionPayment = DealWithFees; - type TransactionByteFee = TransactionByteFee; type OperationalFeeMultiplier = ConstU64<5>; type TipPerWeightStep = TipPerWeightStep; type MaxTipsOfPriority = ConstU128<1000>; type WeightToFee = WeightToFee; + type TransactionByteFee = TransactionByteFee; type FeeMultiplierUpdate = (); type DEX = DEXModule; type MaxSwapSlippageCompareToOracle = MaxSwapSlippageCompareToOracle; diff --git a/modules/transaction-payment/src/tests.rs b/modules/transaction-payment/src/tests.rs index 1137a296b6..b93abd5d64 100644 --- a/modules/transaction-payment/src/tests.rs +++ b/modules/transaction-payment/src/tests.rs @@ -165,7 +165,7 @@ fn enable_dex_and_tx_fee_pool() { // validate tx fee pool works vec![AUSD, DOT].iter().for_each(|token| { let ed = (>::minimum_balance(token.clone())).unique_saturated_into(); - let sub_account: AccountId = ::PalletId::get().into_sub_account(token.clone()); + let sub_account: AccountId = ::PalletId::get().into_sub_account_truncating(token.clone()); assert_eq!(Currencies::free_balance(token.clone(), &treasury_account), 0); assert_eq!(Currencies::free_balance(token.clone(), &sub_account), ed); assert_eq!(Currencies::free_balance(ACA, &sub_account), init_balance); @@ -504,7 +504,7 @@ fn refund_should_not_works() { fn charges_fee_when_validate_with_fee_path_call() { // Enable dex with Alice, and initialize tx charge fee pool builder_with_dex_and_fee_pool(true).execute_with(|| { - let dex_acc: AccountId = PalletId(*b"aca/dexm").into_account(); + let dex_acc: AccountId = PalletId(*b"aca/dexm").into_account_truncating(); let dex_aca = Currencies::free_balance(ACA, &dex_acc); let fee: Balance = 50 * 2 + 100 + 10; @@ -1575,7 +1575,7 @@ fn swap_from_pool_and_dex_with_higher_threshold() { #[test] fn swap_from_pool_and_dex_with_midd_threshold() { builder_with_dex_and_fee_pool(true).execute_with(|| { - let sub_account: AccountId = ::PalletId::get().into_sub_account(DOT); + let sub_account: AccountId = ::PalletId::get().into_sub_account_truncating(DOT); let dot_ed = >::minimum_balance(DOT); let trading_path = vec![DOT, AUSD, ACA]; @@ -1835,7 +1835,7 @@ fn charge_fee_pool_operation_works() { )); let treasury_account: AccountId = ::TreasuryAccount::get(); - let sub_account: AccountId = ::PalletId::get().into_sub_account(AUSD); + let sub_account: AccountId = ::PalletId::get().into_sub_account_truncating(AUSD); let usd_ed = >::minimum_balance(AUSD); let pool_size = FeePoolSize::get(); let swap_threshold = crate::mock::MiddSwapThreshold::get(); diff --git a/modules/xcm-interface/Cargo.toml b/modules/xcm-interface/Cargo.toml index 5a56a03aa2..92a470171d 100644 --- a/modules/xcm-interface/Cargo.toml +++ b/modules/xcm-interface/Cargo.toml @@ -7,25 +7,25 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } module-relaychain = { path = "../relaychain", features = ["kusama"] } [features] diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 5fa91a5859..6efc4d5cb8 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -9,22 +9,22 @@ log = "0.4.17" clap = { version = "3.1.6", features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", optional = true } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", optional = true } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", optional = true } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", optional = true } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", optional = true } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", optional = true } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } inspect = { package = "acala-inspect", path = "../../inspect" } service = { package = "acala-service", path = "../service", default-features = false, optional = true } diff --git a/node/e2e-tests/test-service/Cargo.toml b/node/e2e-tests/test-service/Cargo.toml index 5526d13876..7439b111b9 100644 --- a/node/e2e-tests/test-service/Cargo.toml +++ b/node/e2e-tests/test-service/Cargo.toml @@ -21,60 +21,60 @@ rlp = "0.5" sha3 = "0.10" # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", features = [ "wasmtime" ] } -sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", features = [ "wasmtime" ] } +sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } # Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } # Cumulus dependencies -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } runtime-common = { path = "../../../runtime/common" } node-runtime = { package = "mandala-runtime", path = "../../../runtime/mandala" } @@ -91,5 +91,5 @@ ecosystem-renvm-bridge = { path = "../../../ecosystem-modules/ren/renvm-bridge" [dev-dependencies] # Substrate dependencies -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } diff --git a/node/e2e-tests/test-service/src/builder.rs b/node/e2e-tests/test-service/src/builder.rs index 97965dc893..c17eb3a020 100644 --- a/node/e2e-tests/test-service/src/builder.rs +++ b/node/e2e-tests/test-service/src/builder.rs @@ -297,7 +297,9 @@ pub fn node_config( state_pruning: Some(PruningMode::ArchiveAll), keep_blocks: KeepBlocks::All, chain_spec: spec, - wasm_method: WasmExecutionMethod::Compiled, + wasm_method: WasmExecutionMethod::Compiled { + instantiation_strategy: WasmtimeInstantiationStrategy::PoolingCopyOnWrite, + }, // NOTE: we enforce the use of the native runtime to make the errors more debuggable execution_strategies: ExecutionStrategies { syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible, diff --git a/node/e2e-tests/test-service/src/lib.rs b/node/e2e-tests/test-service/src/lib.rs index 53f7495c08..61ea6d35e1 100644 --- a/node/e2e-tests/test-service/src/lib.rs +++ b/node/e2e-tests/test-service/src/lib.rs @@ -52,13 +52,13 @@ use sc_consensus_manual_seal::{ rpc::{ManualSeal, ManualSealApiServer}, EngineCommand, }; -use sc_executor::NativeElseWasmExecutor; +use sc_executor::{NativeElseWasmExecutor, WasmExecutionMethod, WasmtimeInstantiationStrategy}; use sc_network::{config::TransportConfig, multiaddr, NetworkService}; pub use sc_rpc::SubscriptionTaskExecutor; use sc_service::{ config::{ DatabaseSource, KeepBlocks, KeystoreConfig, MultiaddrWithPeerId, NetworkConfiguration, OffchainWorkerConfig, - PruningMode, WasmExecutionMethod, + PruningMode, }, BasePath, ChainSpec, Configuration, PartialComponents, Role, RpcHandlers, SpawnTasksParams, TFullBackend, TFullCallExecutor, TFullClient, TaskManager, diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 2ddeaf15a5..798aa5f06e 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -21,63 +21,63 @@ elliptic-curve = { version = "0.11.12", default-features = false, features = ["h k256 = { version = "0.10.4", default-features = false, features = ["keccak256", "ecdsa", "std"] } tiny-keccak = { version = "2.0", features = ["keccak"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22"} -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23"} +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } ecosystem-renvm-bridge = { path = "../../ecosystem-modules/ren/renvm-bridge" } module-collator-selection = { path = "../../modules/collator-selection" } diff --git a/orml b/orml index 3576772a89..e1caed6585 160000 --- a/orml +++ b/orml @@ -1 +1 @@ -Subproject commit 3576772a896e039abf07c57e1efa305e6c0cddb0 +Subproject commit e1caed6585f97110c2fd6f5fbcde9eea011457df diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 9bfb09d3d3..e26fdf5b11 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -15,13 +15,13 @@ scale-info = { version = "2.1", default-features = false, features = ["derive"] enumflags2 = { version = "0.6.3" } paste = "1.0" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } orml-traits = { path = "../orml/traits", default-features = false } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 4c77489563..d841df9cd5 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -9,17 +9,17 @@ futures = "0.3.21" jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } codec = { package = "parity-scale-codec", version = "3.0.0" } primitives = { package = "acala-primitives", path = "../primitives" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } orml-oracle-rpc = { path = "../orml/oracle/rpc" } runtime-common = { path = "../runtime/common" } diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index 2b81e86ac4..ac278fd798 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -28,12 +28,12 @@ use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; use std::sync::Arc; /// substrate rpc -use pallet_transaction_payment_rpc::{TransactionPaymentApiServer, TransactionPaymentRpc}; +use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; use sc_consensus_manual_seal::rpc::{EngineCommand, ManualSeal, ManualSealApiServer}; pub use sc_rpc::dev::Dev; pub use sc_rpc_api::{dev::DevApiServer, DenyUnsafe}; use sc_transaction_pool_api::TransactionPool; -use substrate_frame_rpc_system::{SystemApiServer, SystemRpc}; +use substrate_frame_rpc_system::{System, SystemApiServer}; /// orml rpc use orml_oracle_rpc::{Oracle, OracleApiServer}; @@ -79,8 +79,8 @@ where command_sink, } = deps; - module.merge(SystemRpc::new(client.clone(), pool, deny_unsafe).into_rpc())?; - module.merge(TransactionPaymentRpc::new(client.clone()).into_rpc())?; + module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?; + module.merge(TransactionPayment::new(client.clone()).into_rpc())?; // Making synchronous calls in light client freezes the browser currently, // more context: https://github.com/paritytech/substrate/pull/3480 diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml index 39b3800141..ae4cfe0cc8 100644 --- a/runtime/acala/Cargo.toml +++ b/runtime/acala/Cargo.toml @@ -15,64 +15,64 @@ hex = { version = "0.4", default-features = false } hex-literal = { version = "0.3.1" } # substrate -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, features = ["historical"] } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, features = ["historical"] } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -128,13 +128,13 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = # benchmarking deps libsecp256k1 = { version = "0.7", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/runtime/acala/src/authority.rs b/runtime/acala/src/authority.rs index 997b84dd69..0a57adadbe 100644 --- a/runtime/acala/src/authority.rs +++ b/runtime/acala/src/authority.rs @@ -79,16 +79,22 @@ impl orml_authority::AsOriginId for AuthoritysOriginId { fn into_origin(self) -> OriginCaller { match self { AuthoritysOriginId::Root => Origin::root().caller().clone(), - AuthoritysOriginId::Treasury => Origin::signed(TreasuryPalletId::get().into_account()).caller().clone(), - AuthoritysOriginId::HonzonTreasury => Origin::signed(HonzonTreasuryPalletId::get().into_account()) + AuthoritysOriginId::Treasury => Origin::signed(TreasuryPalletId::get().into_account_truncating()) .caller() .clone(), - AuthoritysOriginId::HomaTreasury => Origin::signed(HomaTreasuryPalletId::get().into_account()) - .caller() - .clone(), - AuthoritysOriginId::TreasuryReserve => Origin::signed(TreasuryReservePalletId::get().into_account()) + AuthoritysOriginId::HonzonTreasury => { + Origin::signed(HonzonTreasuryPalletId::get().into_account_truncating()) + .caller() + .clone() + } + AuthoritysOriginId::HomaTreasury => Origin::signed(HomaTreasuryPalletId::get().into_account_truncating()) .caller() .clone(), + AuthoritysOriginId::TreasuryReserve => { + Origin::signed(TreasuryReservePalletId::get().into_account_truncating()) + .caller() + .clone() + } } } diff --git a/runtime/acala/src/constants.rs b/runtime/acala/src/constants.rs index d4f45ab5f3..eb08d35ce0 100644 --- a/runtime/acala/src/constants.rs +++ b/runtime/acala/src/constants.rs @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -//! A set of constant values used in dev runtime. +//! A set of constant values used in Acala runtime. /// Time and blocks. pub mod time { @@ -103,7 +103,7 @@ mod tests { let q = Balance::from(ExtrinsicBaseWeight::get()); assert_eq!(p, 1_000_000_000); - assert_eq!(q, 125_000_000); - assert_eq!(p / q, 8); + assert_eq!(q, 85_795_000); + assert_eq!(p / q, 11) } } diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index 16fea9c553..373c97fbff 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -163,7 +163,7 @@ parameter_types! { pub const TreasuryReservePalletId: PalletId = PalletId(*b"aca/reve"); pub const NftPalletId: PalletId = PalletId(*b"aca/aNFT"); // Vault all unrleased native token. - pub UnreleasedNativeVaultAccountId: AccountId = PalletId(*b"aca/urls").into_account(); + pub UnreleasedNativeVaultAccountId: AccountId = PalletId(*b"aca/urls").into_account_truncating(); // This Pallet is only used to payment fee pool, it's not added to whitelist by design. // because transaction payment pallet will ensure the accounts always have enough ED. pub const TransactionPaymentPalletId: PalletId = PalletId(*b"aca/fees"); @@ -172,18 +172,18 @@ parameter_types! { pub fn get_all_module_accounts() -> Vec { vec![ - LoansPalletId::get().into_account(), - CDPTreasuryPalletId::get().into_account(), - CollatorPotId::get().into_account(), - DEXPalletId::get().into_account(), - HomaPalletId::get().into_account(), - HomaTreasuryPalletId::get().into_account(), - HonzonTreasuryPalletId::get().into_account(), - IncentivesPalletId::get().into_account(), - TreasuryPalletId::get().into_account(), - TreasuryReservePalletId::get().into_account(), + LoansPalletId::get().into_account_truncating(), + CDPTreasuryPalletId::get().into_account_truncating(), + CollatorPotId::get().into_account_truncating(), + DEXPalletId::get().into_account_truncating(), + HomaPalletId::get().into_account_truncating(), + HomaTreasuryPalletId::get().into_account_truncating(), + HonzonTreasuryPalletId::get().into_account_truncating(), + IncentivesPalletId::get().into_account_truncating(), + TreasuryPalletId::get().into_account_truncating(), + TreasuryReservePalletId::get().into_account_truncating(), UnreleasedNativeVaultAccountId::get(), - StableAssetPalletId::get().into_account(), + StableAssetPalletId::get().into_account_truncating(), ] } @@ -774,7 +774,7 @@ impl Contains for DustRemovalWhitelist { } parameter_types! { - pub AcalaTreasuryAccount: AccountId = TreasuryPalletId::get().into_account(); + pub AcalaTreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating(); } impl orml_tokens::Config for Runtime { @@ -789,6 +789,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = MaxReserves; type ReserveIdentifier = ReserveIdentifier; type DustRemovalWhitelist = DustRemovalWhitelist; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_type_with_key! { @@ -861,8 +863,8 @@ parameter_types! { hex_literal::hex!["5336f96b54fa1832d517549bbffdfba2cae8983b8dcf65caff82d616014f5951"].into(), // 22khtd8Zu9CpCY7DR4EPmmX66Aqsc91ShRAhehSWKGL7XDpL hex_literal::hex!["26adf1c3a5b73f8640404d59ccb81de3ede79965b140addc7d8c0ff8736b5c53"].into(), // 21kK5T9tvL8nVdAAWizjtBgRbGcAs466iU6ZxeNWb7mFgg5i hex_literal::hex!["7e32626ae20238b3f2c63299bdc1eb4729c7aadc995ce2abaa4e42130209f5d5"].into(), // 23j4ay2zBSgaSs18xstipmHBNi39W2Su9n8G89kWrz8eCe8F - TreasuryPalletId::get().into_account(), - TreasuryReservePalletId::get().into_account(), + TreasuryPalletId::get().into_account_truncating(), + TreasuryReservePalletId::get().into_account_truncating(), ]; } @@ -1118,7 +1120,7 @@ impl module_dex_oracle::Config for Runtime { } parameter_types! { - pub HonzonTreasuryAccount: AccountId = HonzonTreasuryPalletId::get().into_account(); + pub HonzonTreasuryAccount: AccountId = HonzonTreasuryPalletId::get().into_account_truncating(); pub AlternativeSwapPathJointList: Vec> = vec![ vec![LCDOT], vec![DOT], @@ -1175,11 +1177,11 @@ impl module_transaction_payment::Config for Runtime { type MultiCurrency = Currencies; type OnTransactionPayment = DealWithFees; type AlternativeFeeSwapDeposit = NativeTokenExistentialDeposit; - type TransactionByteFee = TransactionByteFee; type OperationalFeeMultiplier = OperationalFeeMultiplier; type TipPerWeightStep = TipPerWeightStep; type MaxTipsOfPriority = MaxTipsOfPriority; type WeightToFee = WeightToFee; + type TransactionByteFee = TransactionByteFee; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type DEX = Dex; type MaxSwapSlippageCompareToOracle = MaxSwapSlippageCompareToOracle; @@ -1440,7 +1442,7 @@ impl cumulus_pallet_aura_ext::Config for Runtime {} parameter_types! { pub DefaultExchangeRate: ExchangeRate = ExchangeRate::saturating_from_rational(1, 10); - pub HomaTreasuryAccount: AccountId = HomaTreasuryPalletId::get().into_account(); + pub HomaTreasuryAccount: AccountId = HomaTreasuryPalletId::get().into_account_truncating(); pub ActiveSubAccountsIndexList: Vec = vec![ 0, // 15sr8Dvq3AT3Z2Z1y8FnQ4VipekAHhmQnrkgzegUr1tNgbcn ]; @@ -1471,7 +1473,7 @@ pub fn create_x2_parachain_multilocation(index: u16) -> MultiLocation { 1, X1(AccountId32 { network: NetworkId::Any, - id: Utility::derivative_account_id(ParachainInfo::get().into_account(), index).into(), + id: Utility::derivative_account_id(ParachainInfo::get().into_account_truncating(), index).into(), }), ) } @@ -1484,7 +1486,7 @@ impl Convert for SubAccountIndexMultiLocationConvertor { } parameter_types! { - pub ParachainAccount: AccountId = ParachainInfo::get().into_account(); + pub ParachainAccount: AccountId = ParachainInfo::get().into_account_truncating(); } impl module_xcm_interface::Config for Runtime { diff --git a/runtime/acala/src/xcm_config.rs b/runtime/acala/src/xcm_config.rs index 22820f35c8..59e121d792 100644 --- a/runtime/acala/src/xcm_config.rs +++ b/runtime/acala/src/xcm_config.rs @@ -336,8 +336,8 @@ parameter_types! { } parameter_type_with_key! { - pub ParachainMinFee: |_location: MultiLocation| -> u128 { - u128::MAX + pub ParachainMinFee: |_location: MultiLocation| -> Option { + None }; } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 5f5c686872..27efc1643e 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -21,28 +21,28 @@ ethabi = { version = "17.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } # cumulus -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false, optional = true } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false, optional = true } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } # modules module-currencies = { path = "../../modules/currencies", default-features = false } diff --git a/runtime/common/src/mock.rs b/runtime/common/src/mock.rs index 9b900d3d46..2704e7168b 100644 --- a/runtime/common/src/mock.rs +++ b/runtime/common/src/mock.rs @@ -113,6 +113,8 @@ impl orml_tokens::Config for TestRuntime { type MaxReserves = (); type ReserveIdentifier = ReserveIdentifier; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { diff --git a/runtime/common/src/precompile/mock.rs b/runtime/common/src/precompile/mock.rs index f25569eb9e..ab9ef4b613 100644 --- a/runtime/common/src/precompile/mock.rs +++ b/runtime/common/src/precompile/mock.rs @@ -140,6 +140,8 @@ impl orml_tokens::Config for Test { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl pallet_balances::Config for Test { @@ -248,7 +250,7 @@ parameter_types! { pub MaxSwapSlippageCompareToOracle: Ratio = Ratio::one(); pub const TreasuryPalletId: PalletId = PalletId(*b"aca/trsy"); pub const TransactionPaymentPalletId: PalletId = PalletId(*b"aca/fees"); - pub KaruraTreasuryAccount: AccountId = TreasuryPalletId::get().into_account(); + pub KaruraTreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating(); pub const CustomFeeSurplus: Percent = Percent::from_percent(50); pub const AlternativeFeeSurplus: Percent = Percent::from_percent(25); pub DefaultFeeTokens: Vec = vec![AUSD]; @@ -261,12 +263,12 @@ impl module_transaction_payment::Config for Test { type Currency = Balances; type MultiCurrency = Currencies; type OnTransactionPayment = (); - type TransactionByteFee = ConstU128<10>; type OperationalFeeMultiplier = ConstU64<5>; type TipPerWeightStep = ConstU128<1>; type MaxTipsOfPriority = ConstU128<1000>; type AlternativeFeeSwapDeposit = ExistenceRequirement; type WeightToFee = IdentityFee; + type TransactionByteFee = ConstU128<10>; type FeeMultiplierUpdate = (); type DEX = DexModule; type MaxSwapSlippageCompareToOracle = MaxSwapSlippageCompareToOracle; @@ -475,7 +477,7 @@ impl EmergencyShutdown for MockEmergencyShutdown { parameter_types! { pub const CDPTreasuryPalletId: PalletId = PalletId(*b"aca/cdpt"); - pub CDPTreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account(); + pub CDPTreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account_truncating(); pub AlternativeSwapPathJointList: Vec> = vec![ vec![AUSD], ]; diff --git a/runtime/common/src/precompile/nft.rs b/runtime/common/src/precompile/nft.rs index 522df54c9a..37f0d4f142 100644 --- a/runtime/common/src/precompile/nft.rs +++ b/runtime/common/src/precompile/nft.rs @@ -60,7 +60,7 @@ impl Precompile for NFTPrecompile where Runtime: module_evm::Config + module_prices::Config + module_nft::Config, module_nft::Pallet: InspectExtended - + Inspect + + Inspect + Transfer, { fn execute(input: &[u8], target_gas: Option, _context: &Context, _is_static: bool) -> PrecompileResult { diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index d74780e657..15bb1f3ed4 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -14,64 +14,64 @@ hex-literal = { version = "0.3.1" } libsecp256k1 = { version = "0.7" } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22"} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22"} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features =false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23"} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23"} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features =false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } # orml orml-auction = { path = "../../orml/auction" } @@ -130,20 +130,20 @@ ecosystem-compound-cash = { path = "../../ecosystem-modules/compound-cash" } [dev-dependencies] env_logger = "0.9.0" log = "0.4.17" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23" } -xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "5a04d6286ee9082d4b7433541e48508f8b65616b" } +xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "897fff07c8ac51baf9afcb0a895980fce7a5c921" } acala-service = { path = "../../node/service", features = ["with-all-runtime"] } diff --git a/runtime/integration-tests/src/authority.rs b/runtime/integration-tests/src/authority.rs index f22a935674..b82147728d 100644 --- a/runtime/integration-tests/src/authority.rs +++ b/runtime/integration-tests/src/authority.rs @@ -115,7 +115,7 @@ fn test_authority_module() { run_to_block(one_day_later); assert_eq!( - Currencies::free_balance(USD_CURRENCY, &TreasuryPalletId::get().into_account()), + Currencies::free_balance(USD_CURRENCY, &TreasuryPalletId::get().into_account_truncating()), 500 * dollar(USD_CURRENCY) ); assert_eq!( diff --git a/runtime/integration-tests/src/evm.rs b/runtime/integration-tests/src/evm.rs index 99f2b1c40e..0d0c65f817 100644 --- a/runtime/integration-tests/src/evm.rs +++ b/runtime/integration-tests/src/evm.rs @@ -804,7 +804,7 @@ fn test_default_evm_address_in_evm_accounts_module() { fn transaction_payment_module_works_with_evm_contract() { let dex_share = CurrencyId::DexShare(DexShare::Erc20(erc20_address_0()), DexShare::Token(NATIVE_TOKEN_SYMBOL)); let sub_account: AccountId = - TransactionPaymentPalletId::get().into_sub_account(CurrencyId::Erc20(erc20_address_0())); + TransactionPaymentPalletId::get().into_sub_account_truncating(CurrencyId::Erc20(erc20_address_0())); ExtBuilder::default() .balances(vec![ @@ -1017,11 +1017,11 @@ fn transaction_payment_module_works_with_evm_contract() { }; let fee = module_transaction_payment::Pallet::::compute_fee(len, &info, 0); #[cfg(feature = "with-mandala-runtime")] - assert_eq!(fee, 16000000800); + assert_eq!(fee, 16000001166); #[cfg(feature = "with-karura-runtime")] - assert_eq!(fee, 2500000800); + assert_eq!(fee, 2500001166); #[cfg(feature = "with-acala-runtime")] - assert_eq!(fee, 2500000800); + assert_eq!(fee, 2500001166); let surplus_perc = Percent::from_percent(25); let fee_surplus = surplus_perc.mul_ceil(fee); @@ -1042,11 +1042,11 @@ fn transaction_payment_module_works_with_evm_contract() { ); let erc20_fee = Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &sub_account); #[cfg(feature = "with-mandala-runtime")] - assert_eq!(erc20_fee, 12013104212); + assert_eq!(erc20_fee, 12_013_104_258); #[cfg(feature = "with-karura-runtime")] - assert_eq!(erc20_fee, 10344471099); + assert_eq!(erc20_fee, 10_344_471_145); #[cfg(feature = "with-acala-runtime")] - assert_eq!(erc20_fee, 10344471099); + assert_eq!(erc20_fee, 10_344_471_145); assert_eq!( Currencies::free_balance(NATIVE_CURRENCY, &sub_account), @@ -1172,7 +1172,7 @@ fn create_contract_use_none_native_token_to_charge_storage() { #[test] fn evm_limits() { ExtBuilder::default().build().execute_with(|| { - assert_eq!(runtime_common::EvmLimits::::max_gas_limit(), 33_319_444); + assert_eq!(runtime_common::EvmLimits::::max_gas_limit(), 33_323_800); assert_eq!(runtime_common::EvmLimits::::max_storage_limit(), 3_670_016); }); } diff --git a/runtime/integration-tests/src/nft.rs b/runtime/integration-tests/src/nft.rs index d9024aab2b..4da1373604 100644 --- a/runtime/integration-tests/src/nft.rs +++ b/runtime/integration-tests/src/nft.rs @@ -43,9 +43,12 @@ fn test_nft_module() { )); let deposit = Proxy::deposit(1u32) + CreateClassDeposit::get() + DataDepositPerByte::get() * (metadata.len() as u128); - assert_eq!(Balances::free_balance(&NftPalletId::get().into_sub_account(0)), 0); assert_eq!( - Balances::reserved_balance(&NftPalletId::get().into_sub_account(0)), + Balances::free_balance(&NftPalletId::get().into_sub_account_truncating(0)), + 0 + ); + assert_eq!( + Balances::reserved_balance(&NftPalletId::get().into_sub_account_truncating(0)), deposit ); assert_eq!( @@ -54,11 +57,11 @@ fn test_nft_module() { ); assert_eq!(Balances::reserved_balance(AccountId::from(ALICE)), 0); assert_ok!(Balances::deposit_into_existing( - &NftPalletId::get().into_sub_account(0), + &NftPalletId::get().into_sub_account_truncating(0), 1 * (CreateTokenDeposit::get() + DataDepositPerByte::get()) )); assert_ok!(NFT::mint( - Origin::signed(NftPalletId::get().into_sub_account(0)), + Origin::signed(NftPalletId::get().into_sub_account_truncating(0)), MultiAddress::Id(AccountId::from(BOB)), 0, metadata.clone(), @@ -72,14 +75,14 @@ fn test_nft_module() { ); assert_noop!( NFT::destroy_class( - Origin::signed(NftPalletId::get().into_sub_account(0)), + Origin::signed(NftPalletId::get().into_sub_account_truncating(0)), 0, MultiAddress::Id(AccountId::from(BOB)) ), pallet_proxy::Error::::NotFound ); assert_ok!(NFT::destroy_class( - Origin::signed(NftPalletId::get().into_sub_account(0)), + Origin::signed(NftPalletId::get().into_sub_account_truncating(0)), 0, MultiAddress::Id(AccountId::from(ALICE)) )); diff --git a/runtime/integration-tests/src/payment.rs b/runtime/integration-tests/src/payment.rs index 6468a42829..4e88ca1b75 100644 --- a/runtime/integration-tests/src/payment.rs +++ b/runtime/integration-tests/src/payment.rs @@ -103,7 +103,8 @@ fn initial_charge_fee_pool_works() { .build() .execute_with(|| { let treasury_account = TreasuryAccount::get(); - let fee_account1: AccountId = TransactionPaymentPalletId::get().into_sub_account(RELAY_CHAIN_CURRENCY); + let fee_account1: AccountId = + TransactionPaymentPalletId::get().into_sub_account_truncating(RELAY_CHAIN_CURRENCY); // FeePoolSize set to 5 KAR = 50*ED, the treasury already got ED balance when startup. let ed = NativeTokenExistentialDeposit::get(); let pool_size = fee_pool_size(); @@ -184,14 +185,14 @@ fn initial_charge_fee_pool_works() { assert_eq!( Currencies::free_balance( NATIVE_CURRENCY, - &TransactionPaymentPalletId::get().into_sub_account(token.clone()) + &TransactionPaymentPalletId::get().into_sub_account_truncating(token.clone()) ), pool_size ); assert_eq!( Currencies::free_balance( token.clone(), - &TransactionPaymentPalletId::get().into_sub_account(token.clone()) + &TransactionPaymentPalletId::get().into_sub_account_truncating(token.clone()) ), ed ); @@ -199,20 +200,41 @@ fn initial_charge_fee_pool_works() { assert_eq!( Currencies::free_balance( NATIVE_CURRENCY, - &TransactionPaymentPalletId::get().into_sub_account(LIQUID_CURRENCY) + &TransactionPaymentPalletId::get().into_sub_account_truncating(LIQUID_CURRENCY) ), 0 ); assert_eq!( Currencies::free_balance( LIQUID_CURRENCY, - &TransactionPaymentPalletId::get().into_sub_account(LIQUID_CURRENCY) + &TransactionPaymentPalletId::get().into_sub_account_truncating(LIQUID_CURRENCY) ), 0 ); }); } +#[test] +fn token_per_second_works() { + #[cfg(feature = "with-karura-runtime")] + { + let kar_per_second = karura_runtime::kar_per_second(); + assert_eq!(11_655_000_000_000, kar_per_second); + + let ksm_per_second = karura_runtime::ksm_per_second(); + assert_eq!(233_100_000_000, ksm_per_second); + } + + #[cfg(feature = "with-acala-runtime")] + { + let aca_per_second = acala_runtime::aca_per_second(); + assert_eq!(11_655_000_000_000, aca_per_second); + + let dot_per_second = acala_runtime::dot_per_second(); + assert_eq!(2_331_000_000, dot_per_second); + } +} + #[test] fn trader_works() { // 4 instructions, each instruction cost 200_000_000 @@ -235,20 +257,31 @@ fn trader_works() { let expect_weight: Weight = 800_000_000; #[cfg(feature = "with-acala-runtime")] let expect_weight: Weight = 800_000_000; + + #[cfg(feature = "with-mandala-runtime")] + let base_per_second = mandala_runtime::aca_per_second(); + #[cfg(feature = "with-karura-runtime")] + let base_per_second = karura_runtime::kar_per_second(); + #[cfg(feature = "with-acala-runtime")] + let base_per_second = acala_runtime::aca_per_second(); + let xcm_weight: Weight = ::Weigher::weight(&mut message).unwrap(); assert_eq!(xcm_weight, expect_weight); - // fixed rate, ksm_per_second/kar_per_second=1/50, kar_per_second = 8*dollar(KAR), - // ksm_per_second = 0.16 * dollar(KAR), fee = 0.16 * weight = 0.16 * 800_000_000 = 128_000_000 - let total_balance: Balance = 130_000_000; + let total_balance: Balance = 10_00_000_000; let asset: MultiAsset = (Parent, total_balance).into(); + let assets: Assets = asset.into(); + + // ksm_per_second/kar_per_second=1/50 + // v0.9.22: kar_per_second = 8*dollar(KAR), ksm_per_second = 0.16 * dollar(KAR), fee = 0.16 * weight + // = 0.16 * 800_000_000 = 128_000_000 v0.9.23: kar_per_second = 11.655*dollar(KAR), ksm_per_second = + // 0.2331 * dollar(KAR), fee = 0.2331 * weight = 186_480_000 #[cfg(feature = "with-mandala-runtime")] - let expect_unspent: MultiAsset = (Parent, 129_680_000).into(); + let expect_unspent: MultiAsset = (Parent, 999_533_800).into(); // 466200 #[cfg(feature = "with-karura-runtime")] - let expect_unspent: MultiAsset = (Parent, 2_000_000).into(); + let expect_unspent: MultiAsset = (Parent, 813_520_000).into(); // 186480000 #[cfg(feature = "with-acala-runtime")] - let expect_unspent: MultiAsset = (Parent, 128_720_000).into(); - let assets: Assets = asset.into(); + let expect_unspent: MultiAsset = (Parent, 998_135_200).into(); // 1864800 // when no runtime upgrade, the newly `TransactionFeePoolTrader` will failed. ExtBuilder::default().build().execute_with(|| { @@ -282,7 +315,8 @@ fn trader_works() { .build() .execute_with(|| { let treasury_account = TreasuryAccount::get(); - let fee_account1: AccountId = TransactionPaymentPalletId::get().into_sub_account(RELAY_CHAIN_CURRENCY); + let fee_account1: AccountId = + TransactionPaymentPalletId::get().into_sub_account_truncating(RELAY_CHAIN_CURRENCY); // FeePoolSize set to 5 KAR = 50*ED, the treasury already got ED balance when startup. let ed = NativeTokenExistentialDeposit::get(); let relay_ed = >::minimum_balance(RELAY_CHAIN_CURRENCY); @@ -325,9 +359,18 @@ fn trader_works() { assert_eq!(Currencies::free_balance(NATIVE_CURRENCY, &fee_account1), pool_size); assert_eq!(Currencies::free_balance(RELAY_CHAIN_CURRENCY, &fee_account1), relay_ed); + // base_token_per_second * (weight/WEIGHT_PER_SECOND) * relay_exchange_rate + // v0.9.22: base_per_second = 8*10^12, 8*10^12 * weight/10^12 * relay_exchange_rate = + // relay_exchange_rate * 8 * weight v0.9.23: base_per_second = 11.655*10^12, relay_exchange_rate * + // 11.655 * weight let relay_exchange_rate: Ratio = module_transaction_payment::Pallet::::token_exchange_rate(RELAY_CHAIN_CURRENCY).unwrap(); - let spent = relay_exchange_rate.saturating_mul_int(8 * expect_weight); + let weight_ratio = Ratio::saturating_from_rational( + expect_weight as u128, + frame_support::weights::constants::WEIGHT_PER_SECOND as u128, + ); + let asset_per_second = relay_exchange_rate.saturating_mul_int(base_per_second); + let spent = weight_ratio.saturating_mul_int(asset_per_second); let expect_unspent: MultiAsset = (Parent, total_balance - spent as u128).into(); // the newly `TransactionFeePoolTrader` works fine as first priority @@ -345,7 +388,7 @@ fn charge_transaction_payment_and_threshold_works() { let relay_ed = >::minimum_balance(RELAY_CHAIN_CURRENCY); let treasury_account = TreasuryAccount::get(); - let sub_account1: AccountId = TransactionPaymentPalletId::get().into_sub_account(RELAY_CHAIN_CURRENCY); + let sub_account1: AccountId = TransactionPaymentPalletId::get().into_sub_account_truncating(RELAY_CHAIN_CURRENCY); let bob_relay_balance = 100 * dollar(RELAY_CHAIN_CURRENCY); ExtBuilder::default() diff --git a/runtime/integration-tests/src/relaychain/erc20.rs b/runtime/integration-tests/src/relaychain/erc20.rs index 0b75a8b9fd..cbc773d2cb 100644 --- a/runtime/integration-tests/src/relaychain/erc20.rs +++ b/runtime/integration-tests/src/relaychain/erc20.rs @@ -43,10 +43,10 @@ pub fn alice_evm_addr() -> EvmAddress { } fn sibling_reserve_account() -> AccountId { - polkadot_parachain::primitives::Sibling::from(SIBLING_ID).into_account() + polkadot_parachain::primitives::Sibling::from(SIBLING_ID).into_account_truncating() } fn karura_reserve_account() -> AccountId { - polkadot_parachain::primitives::Sibling::from(KARURA_ID).into_account() + polkadot_parachain::primitives::Sibling::from(KARURA_ID).into_account_truncating() } pub fn deploy_erc20_contracts() { @@ -203,7 +203,7 @@ fn erc20_transfer_between_sibling() { Sibling::execute_with(|| { // Sibling will take (1, 2000, GeneralKey(Erc20(address))) as foreign asset assert_eq!( - 9_999_360_000_000, + 9_999_067_600_000, Currencies::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); @@ -229,7 +229,7 @@ fn erc20_transfer_between_sibling() { )); assert_eq!( - 4_999_360_000_000, + 4_999_067_600_000, Currencies::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); }); @@ -242,11 +242,11 @@ fn erc20_transfer_between_sibling() { Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &sibling_reserve_account()) ); assert_eq!( - 4_993_600_000_000, + 4_990_676_000_000, Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &AccountId::from(BOB)) ); assert_eq!( - 6_400_000_000, + 9_324_000_000, Currencies::free_balance(CurrencyId::Erc20(erc20_address_0()), &KaruraTreasuryAccount::get()) ); assert_eq!( @@ -279,13 +279,13 @@ fn erc20_transfer_between_sibling() { System::assert_has_event(Event::Currencies(module_currencies::Event::Deposited { currency_id: CurrencyId::Erc20(erc20_address_0()), who: AccountId::from(BOB), - amount: 4_993_600_000_000, + amount: 4_990_676_000_000, })); // TakeRevenue deposit from erc20 holding account to treasury account System::assert_has_event(Event::Currencies(module_currencies::Event::Deposited { currency_id: CurrencyId::Erc20(erc20_address_0()), who: KaruraTreasuryAccount::get(), - amount: 6_400_000_000, + amount: 9_324_000_000, })); }); } @@ -378,7 +378,7 @@ fn sibling_erc20_to_self_as_foreign_asset() { Karura::execute_with(|| { assert_eq!( - 9_999_360_000_000, + 9_999_067_600_000, Currencies::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); }); diff --git a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs b/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs index d10ef44b14..f2454d0dd0 100644 --- a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs +++ b/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs @@ -39,10 +39,10 @@ pub const MOCK_BIFROST_ID: u32 = 2001; pub const SIBLING_ID: u32 = 2002; fn karura_reserve_account() -> AccountId { - polkadot_parachain::primitives::Sibling::from(KARURA_ID).into_account() + polkadot_parachain::primitives::Sibling::from(KARURA_ID).into_account_truncating() } fn sibling_reserve_account() -> AccountId { - polkadot_parachain::primitives::Sibling::from(SIBLING_ID).into_account() + polkadot_parachain::primitives::Sibling::from(SIBLING_ID).into_account_truncating() } #[test] @@ -65,7 +65,9 @@ fn transfer_from_relay_chain() { }); Karura::execute_with(|| { - assert_eq!(Tokens::free_balance(KSM, &AccountId::from(BOB)), 999_872_000_000); + // v0.9.22: 1_000_000_000_000-128_000_000=999_872_000_000 + // v0.9.23: 1_000_000_000_000-186_480_000=999_813_520_000 + assert_eq!(Tokens::free_balance(KSM, &AccountId::from(BOB)), 999_813_520_000); }); } @@ -165,12 +167,12 @@ fn transfer_sibling_chain_asset() { ); assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()), - 9_999_360_000_000 + 9_999_067_600_000 ); }); Sibling::execute_with(|| { - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 9_989_120_000_000); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 9_984_149_200_000); assert_ok!(XTokens::transfer( Origin::signed(BOB.into()), @@ -192,23 +194,23 @@ fn transfer_sibling_chain_asset() { 1_000_000_000, )); - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 4_989_120_000_000); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 4_984_149_200_000); }); MockBifrost::execute_with(|| { // Sibling -->(transfer 5_000_000_000_000)--> Karura assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &karura_reserve_account()), - 94_999_360_000_000 + 94_999_067_600_000 ); assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()), - 4_999_360_000_000 + 4_999_067_600_000 ); }); Karura::execute_with(|| { - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 94_989_120_000_000); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 94_984_149_200_000); }); } @@ -226,7 +228,7 @@ fn transfer_from_relay_chain_deposit_to_treasury_if_below_ed() { .into() .into() ), - Box::new((Here, 128_000_111).into()), + Box::new((Here, 186_480_111).into()), 0 )); }); @@ -235,7 +237,7 @@ fn transfer_from_relay_chain_deposit_to_treasury_if_below_ed() { assert_eq!(Tokens::free_balance(KSM, &AccountId::from(BOB)), 0); assert_eq!( Tokens::free_balance(KSM, &karura_runtime::KaruraTreasuryAccount::get()), - 1_000_128_000_111 + 1_000_186_480_111 ); }); } @@ -272,10 +274,10 @@ fn xcm_transfer_execution_barrier_trader_works() { Karura::execute_with(|| { assert!(System::events().iter().any(|r| matches!( r.event, - Event::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward( - _, - Outcome::Error(XcmError::Barrier) - )) + Event::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { + outcome: Outcome::Error(XcmError::Barrier), + .. + }) ))); }); @@ -301,11 +303,11 @@ fn xcm_transfer_execution_barrier_trader_works() { }); // trader inside BuyExecution have TooExpensive error if payment less than calculated weight amount. - // the minimum of calculated weight amount(`FixedRateOfFungible`) is 96_000_000 + // the minimum of calculated weight amount(`FixedRateOfFungible`) is 139_860_000 let message = Xcm::(vec![ - ReserveAssetDeposited((Parent, 95_999_999).into()), + ReserveAssetDeposited((Parent, 139_859_999).into()), BuyExecution { - fees: (Parent, 95_999_999).into(), + fees: (Parent, 139_859_999).into(), weight_limit: Limited(expect_weight_limit), }, DepositAsset { @@ -324,9 +326,9 @@ fn xcm_transfer_execution_barrier_trader_works() { // all situation fulfilled, execute success let message = Xcm::(vec![ - ReserveAssetDeposited((Parent, 96_000_000).into()), + ReserveAssetDeposited((Parent, 139_860_000).into()), BuyExecution { - fees: (Parent, 96_000_000).into(), + fees: (Parent, 139_860_000).into(), weight_limit: Limited(expect_weight_limit), }, DepositAsset { @@ -501,14 +503,14 @@ fn test_asset_registry_module() { ); assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()), - 9_999_360_000_000 + 9_999_067_600_000 ); }); Sibling::execute_with(|| { assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)), - 9_989_120_000_000 + 9_984_149_200_000 ); assert_ok!(XTokens::transfer( @@ -533,7 +535,7 @@ fn test_asset_registry_module() { assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)), - 4_989_120_000_000 + 4_984_149_200_000 ); }); @@ -541,18 +543,18 @@ fn test_asset_registry_module() { // Sibling -->(transfer 5_000_000_000_000)--> Karura assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &karura_reserve_account()), - 94_999_360_000_000 + 94_999_067_600_000 ); assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &sibling_reserve_account()), - 4_999_360_000_000 + 4_999_067_600_000 ); }); Karura::execute_with(|| { assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)), - 94_989_120_000_000 + 94_984_149_200_000 ); }); } @@ -679,7 +681,7 @@ fn trap_assets_larger_than_ed_works() { let mut kar_treasury_amount = 0; let (ksm_asset_amount, kar_asset_amount) = (dollar(KSM), dollar(KAR)); - let trader_weight_to_treasury: u128 = 96_000_000; + let trader_weight_to_treasury: u128 = 139_860_000; let parent_account: AccountId = ParentIsPreset::::convert(Parent.into()).unwrap(); @@ -726,8 +728,12 @@ fn trap_assets_larger_than_ed_works() { fn trap_assets_lower_than_ed_works() { TestNet::reset(); + // 233_100_000_000 * weight(600000000) / WEIGHT_PER_SECOND(10^12) = 0.2331 * 600000000 = 139_860_000 + let ksm_per_second = karura_runtime::ksm_per_second(); + assert_eq!(233_100_000_000, ksm_per_second); + let mut kar_treasury_amount = 0; - let (ksm_asset_amount, kar_asset_amount) = (cent(KSM) / 100, cent(KAR)); + let (ksm_asset_amount, kar_asset_amount) = (150_000_000, cent(KAR)); let parent_account: AccountId = ParentIsPreset::::convert(Parent.into()).unwrap(); @@ -877,7 +883,7 @@ fn transfer_native_chain_asset() { }); Karura::execute_with(|| { - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 9_989_760_000_000); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 9_985_081_600_000); assert_ok!(XTokens::transfer( Origin::signed(BOB.into()), @@ -899,7 +905,7 @@ fn transfer_native_chain_asset() { 1_000_000_000, )); - assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 4_989_760_000_000); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 4_985_081_600_000); }); MockBifrost::execute_with(|| { @@ -909,7 +915,7 @@ fn transfer_native_chain_asset() { assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)), - 4_999_360_000_000 + 4_999_067_600_000 ); assert_eq!(Tokens::free_balance(BNC, &AccountId::from(ALICE)), 90_000_000_000_000); }); diff --git a/runtime/integration-tests/src/relaychain/kusama_test_net.rs b/runtime/integration-tests/src/relaychain/kusama_test_net.rs index 3cd5f86530..c28a3f5c32 100644 --- a/runtime/integration-tests/src/relaychain/kusama_test_net.rs +++ b/runtime/integration-tests/src/relaychain/kusama_test_net.rs @@ -136,7 +136,7 @@ pub fn kusama_ext() -> sp_io::TestExternalities { pallet_balances::GenesisConfig:: { balances: vec![ (AccountId::from(ALICE), 2002 * dollar(KSM)), - (ParaId::from(2000).into_account(), 2 * dollar(KSM)), + (ParaId::from(2000).into_account_truncating(), 2 * dollar(KSM)), ], } .assimilate_storage(&mut t) diff --git a/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs b/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs index bf0a047907..2843b80578 100644 --- a/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs +++ b/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs @@ -45,7 +45,7 @@ fn transfer_from_relay_chain() { }); Acala::execute_with(|| { - assert_eq!(9_998_720_000, Tokens::free_balance(DOT, &AccountId::from(BOB))); + assert_eq!(9_998_135_200, Tokens::free_balance(DOT, &AccountId::from(BOB))); }); } @@ -79,7 +79,7 @@ fn transfer_to_relay_chain() { ); assert_eq!( 5 * dollar(DOT), - polkadot_runtime::Balances::free_balance(&ParaId::from(2000).into_account()) + polkadot_runtime::Balances::free_balance(&ParaId::from(2000).into_account_truncating()) ); }); } diff --git a/runtime/integration-tests/src/relaychain/polkadot_test_net.rs b/runtime/integration-tests/src/relaychain/polkadot_test_net.rs index 2cbbb50cf1..9032c4c6cf 100644 --- a/runtime/integration-tests/src/relaychain/polkadot_test_net.rs +++ b/runtime/integration-tests/src/relaychain/polkadot_test_net.rs @@ -125,7 +125,7 @@ pub fn polkadot_ext() -> sp_io::TestExternalities { pallet_balances::GenesisConfig:: { balances: vec![ (AccountId::from(ALICE), 2002 * dollar(DOT)), - (ParaId::from(2000).into_account(), 10 * dollar(DOT)), + (ParaId::from(2000).into_account_truncating(), 10 * dollar(DOT)), ], } .assimilate_storage(&mut t) diff --git a/runtime/integration-tests/src/relaychain/statemine.rs b/runtime/integration-tests/src/relaychain/statemine.rs index 1b13c8c64b..86367f5ffd 100644 --- a/runtime/integration-tests/src/relaychain/statemine.rs +++ b/runtime/integration-tests/src/relaychain/statemine.rs @@ -32,7 +32,7 @@ use xcm_emulator::TestExt; pub const UNIT: Balance = 1_000_000_000_000; pub const TEN: Balance = 10_000_000_000_000; pub const FEE_WEIGHT: Balance = 4_000_000_000; -pub const FEE_STATEMINE: Balance = 10_666_664; +pub const FEE_STATEMINE: Balance = 15_540_916; fn init_statemine_xcm_interface() { let xcm_operation = @@ -54,20 +54,20 @@ fn init_statemine_xcm_interface() { #[test] fn statemine_min_xcm_fee_matched() { Statemine::execute_with(|| { - use frame_support::weights::{IdentityFee, WeightToFeePolynomial}; + use frame_support::weights::{IdentityFee, WeightToFee}; init_statemine_xcm_interface(); let weight = FEE_WEIGHT as u64; - let fee: Balance = IdentityFee::calc(&weight); + let fee: Balance = IdentityFee::weight_to_fee(&weight); let statemine: MultiLocation = (1, Parachain(parachains::statemine::ID)).into(); let bifrost: MultiLocation = (1, Parachain(parachains::bifrost::ID)).into(); - let statemine_fee: u128 = ParachainMinFee::get(&statemine); + let statemine_fee: u128 = ParachainMinFee::get(&statemine).unwrap(); assert_eq!(fee, statemine_fee); - let bifrost_fee: u128 = ParachainMinFee::get(&bifrost); - assert_eq!(u128::MAX, bifrost_fee); + let bifrost_fee: Option = ParachainMinFee::get(&bifrost); + assert_eq!(None, bifrost_fee); }); } @@ -101,9 +101,9 @@ fn transfer_from_relay_chain() { #[test] fn karura_statemine_transfer_works() { TestNet::reset(); - let para_2000: AccountId = Sibling::from(2000).into_account(); - let child_2000: AccountId = ParaId::from(2000).into_account(); - let child_1000: AccountId = ParaId::from(1000).into_account(); + let para_2000: AccountId = Sibling::from(2000).into_account_truncating(); + let child_2000: AccountId = ParaId::from(2000).into_account_truncating(); + let child_1000: AccountId = ParaId::from(1000).into_account_truncating(); // minimum asset should be: FEE_WEIGHT+FEE_KUSAMA+max(KUSAMA_ED,STATEMINE_ED+FEE_STATEMINE). // but due to current half fee, sender asset should at lease: FEE_WEIGHT + 2 * FEE_KUSAMA @@ -137,7 +137,7 @@ fn karura_statemine_transfer_works() { UNIT + FEE_WEIGHT - FEE_STATEMINE, Balances::free_balance(&AccountId::from(BOB)) ); - assert_eq!(996022666670, Balances::free_balance(¶_2000)); + assert_eq!(996_017_792_418, Balances::free_balance(¶_2000)); }); } @@ -147,7 +147,7 @@ fn karura_side(fee_amount: u128) { init_statemine_xcm_interface(); assert_eq!( - 9_999_936_000_000, + 9_999_906_760_000, Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); // ensure sender has enough KSM balance to be charged as fee @@ -174,7 +174,7 @@ fn karura_side(fee_amount: u128) { )); assert_eq!( - 8_999_936_000_000, + 8_999_906_760_000, Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(BOB)) ); assert_eq!(TEN - fee_amount, Tokens::free_balance(KSM, &AccountId::from(BOB))); @@ -185,7 +185,7 @@ fn karura_side(fee_amount: u128) { fn statemine_side(para_2000_init_amount: u128) { register_asset(); - let para_acc: AccountId = Sibling::from(2000).into_account(); + let para_acc: AccountId = Sibling::from(2000).into_account_truncating(); Statemine::execute_with(|| { use statemine_runtime::*; diff --git a/runtime/integration-tests/src/runtime.rs b/runtime/integration-tests/src/runtime.rs index 588c70c89f..efb5793b25 100644 --- a/runtime/integration-tests/src/runtime.rs +++ b/runtime/integration-tests/src/runtime.rs @@ -223,7 +223,7 @@ fn currency_id_convert() { #[test] fn parachain_subaccounts_are_unique() { ExtBuilder::default().build().execute_with(|| { - let parachain: AccountId = ParachainInfo::parachain_id().into_account(); + let parachain: AccountId = ParachainInfo::parachain_id().into_account_truncating(); assert_eq!( parachain, hex_literal::hex!["70617261d0070000000000000000000000000000000000000000000000000000"].into() @@ -409,7 +409,7 @@ mod mandala_only_tests { bytes.len() ), Ok(ValidTransaction { - priority: 62_878_701_600_000_000, + priority: 81_156_562_730_100_000, requires: vec![], provides: vec![], longevity: 18_446_744_073_709_551_615, diff --git a/runtime/integration-tests/src/setup.rs b/runtime/integration-tests/src/setup.rs index 3814cb84d0..27d6d0af88 100644 --- a/runtime/integration-tests/src/setup.rs +++ b/runtime/integration-tests/src/setup.rs @@ -113,7 +113,7 @@ mod karura_imports { TradingPair::from_currency_ids(USD_CURRENCY, LIQUID_CURRENCY).unwrap(), TradingPair::from_currency_ids(RELAY_CHAIN_CURRENCY, NATIVE_CURRENCY).unwrap(), ]; - pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account(); + pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating(); } pub const NATIVE_CURRENCY: CurrencyId = KAR; @@ -165,7 +165,7 @@ mod acala_imports { TradingPair::from_currency_ids(RELAY_CHAIN_CURRENCY, NATIVE_CURRENCY).unwrap(), TradingPair::from_currency_ids(RELAY_CHAIN_CURRENCY, LCDOT).unwrap(), ]; - pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account(); + pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating(); } pub const NATIVE_CURRENCY: CurrencyId = ACA; diff --git a/runtime/integration-tests/src/stable_asset.rs b/runtime/integration-tests/src/stable_asset.rs index e1fdb39e1e..23379e5ecd 100644 --- a/runtime/integration-tests/src/stable_asset.rs +++ b/runtime/integration-tests/src/stable_asset.rs @@ -62,7 +62,7 @@ fn test_mint() { let ksm_target_amount = 10_000_123u128; let lksm_target_amount = 10_000_456u128; let exchange_rate = Homa::current_exchange_rate(); - let account_id: AccountId = StableAssetPalletId::get().into_sub_account(0); + let account_id: AccountId = StableAssetPalletId::get().into_sub_account_truncating(0); assert_ok!(StableAsset::mint( Origin::signed(AccountId::from(ALICE)), 0, diff --git a/runtime/integration-tests/src/treasury.rs b/runtime/integration-tests/src/treasury.rs index 4faa772db4..b531bfd377 100644 --- a/runtime/integration-tests/src/treasury.rs +++ b/runtime/integration-tests/src/treasury.rs @@ -23,11 +23,11 @@ fn treasury_should_take_xcm_execution_revenue() { ExtBuilder::default().build().execute_with(|| { let dot_amount = 1000 * dollar(RELAY_CHAIN_CURRENCY); #[cfg(feature = "with-mandala-runtime")] // Mandala uses DOT, which has 10 d.p. accuracy. - let actual_amount = 9_999_999_760_000; + let actual_amount = 9_999_999_650_350; #[cfg(feature = "with-karura-runtime")] // Karura uses KSM, which has 12 d.p. accuracy. - let actual_amount = 999_999_904_000_000; + let actual_amount = 999_999_860_140_000; #[cfg(feature = "with-acala-runtime")] // Acala uses DOT, which has 10 d.p. accuracy. - let actual_amount = 9_999_999_040_000; + let actual_amount = 9_999_998_601_400; #[cfg(feature = "with-mandala-runtime")] let shallow_weight = 3_000_000; diff --git a/runtime/integration-tests/src/vesting.rs b/runtime/integration-tests/src/vesting.rs index 9da1656054..e9192f5970 100644 --- a/runtime/integration-tests/src/vesting.rs +++ b/runtime/integration-tests/src/vesting.rs @@ -23,7 +23,7 @@ use orml_vesting::VestingSchedule; fn test_vesting_use_relaychain_block_number() { ExtBuilder::default().build().execute_with(|| { #[cfg(feature = "with-mandala-runtime")] - let signer: AccountId = TreasuryPalletId::get().into_account(); + let signer: AccountId = TreasuryPalletId::get().into_account_truncating(); #[cfg(feature = "with-karura-runtime")] let signer: AccountId = KaruraFoundationAccounts::get()[0].clone(); #[cfg(feature = "with-acala-runtime")] diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml index b907dfe21a..b7ed4f2872 100644 --- a/runtime/karura/Cargo.toml +++ b/runtime/karura/Cargo.toml @@ -15,64 +15,64 @@ hex = { version = "0.4", default-features = false } hex-literal = { version = "0.3.1" } # substrate -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, features = ["historical"] } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, features = ["historical"] } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -129,13 +129,13 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = # benchmarking deps libsecp256k1 = { version = "0.7", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [features] default = ["std"] diff --git a/runtime/karura/src/authority.rs b/runtime/karura/src/authority.rs index 997b84dd69..0a57adadbe 100644 --- a/runtime/karura/src/authority.rs +++ b/runtime/karura/src/authority.rs @@ -79,16 +79,22 @@ impl orml_authority::AsOriginId for AuthoritysOriginId { fn into_origin(self) -> OriginCaller { match self { AuthoritysOriginId::Root => Origin::root().caller().clone(), - AuthoritysOriginId::Treasury => Origin::signed(TreasuryPalletId::get().into_account()).caller().clone(), - AuthoritysOriginId::HonzonTreasury => Origin::signed(HonzonTreasuryPalletId::get().into_account()) + AuthoritysOriginId::Treasury => Origin::signed(TreasuryPalletId::get().into_account_truncating()) .caller() .clone(), - AuthoritysOriginId::HomaTreasury => Origin::signed(HomaTreasuryPalletId::get().into_account()) - .caller() - .clone(), - AuthoritysOriginId::TreasuryReserve => Origin::signed(TreasuryReservePalletId::get().into_account()) + AuthoritysOriginId::HonzonTreasury => { + Origin::signed(HonzonTreasuryPalletId::get().into_account_truncating()) + .caller() + .clone() + } + AuthoritysOriginId::HomaTreasury => Origin::signed(HomaTreasuryPalletId::get().into_account_truncating()) .caller() .clone(), + AuthoritysOriginId::TreasuryReserve => { + Origin::signed(TreasuryReservePalletId::get().into_account_truncating()) + .caller() + .clone() + } } } diff --git a/runtime/karura/src/constants.rs b/runtime/karura/src/constants.rs index e708667a98..01e35992d9 100644 --- a/runtime/karura/src/constants.rs +++ b/runtime/karura/src/constants.rs @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -//! A set of constant values used in dev runtime. +//! A set of constant values used in Karura runtime. /// Time and blocks. pub mod time { @@ -124,7 +124,6 @@ mod tests { let q = Balance::from(ExtrinsicBaseWeight::get()); assert_eq!(p, 1_000_000_000); - assert_eq!(q, 125_000_000); - assert_eq!(p / q, 8); + assert_eq!(q, 85_795_000); } } diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs index 0d5bac823c..74eacb2472 100644 --- a/runtime/karura/src/lib.rs +++ b/runtime/karura/src/lib.rs @@ -166,7 +166,7 @@ parameter_types! { pub const TreasuryReservePalletId: PalletId = PalletId(*b"aca/reve"); pub const NftPalletId: PalletId = PalletId(*b"aca/aNFT"); // Vault all unrleased native token. - pub UnreleasedNativeVaultAccountId: AccountId = PalletId(*b"aca/urls").into_account(); + pub UnreleasedNativeVaultAccountId: AccountId = PalletId(*b"aca/urls").into_account_truncating(); // This Pallet is only used to payment fee pool, it's not added to whitelist by design. // because transaction payment pallet will ensure the accounts always have enough ED. pub const TransactionPaymentPalletId: PalletId = PalletId(*b"aca/fees"); @@ -176,19 +176,19 @@ parameter_types! { pub fn get_all_module_accounts() -> Vec { vec![ - LoansPalletId::get().into_account(), - CDPTreasuryPalletId::get().into_account(), - CollatorPotId::get().into_account(), - DEXPalletId::get().into_account(), - HomaPalletId::get().into_account(), - HomaTreasuryPalletId::get().into_account(), - HonzonTreasuryPalletId::get().into_account(), - IncentivesPalletId::get().into_account(), - TreasuryPalletId::get().into_account(), - TreasuryReservePalletId::get().into_account(), + LoansPalletId::get().into_account_truncating(), + CDPTreasuryPalletId::get().into_account_truncating(), + CollatorPotId::get().into_account_truncating(), + DEXPalletId::get().into_account_truncating(), + HomaPalletId::get().into_account_truncating(), + HomaTreasuryPalletId::get().into_account_truncating(), + HonzonTreasuryPalletId::get().into_account_truncating(), + IncentivesPalletId::get().into_account_truncating(), + TreasuryPalletId::get().into_account_truncating(), + TreasuryReservePalletId::get().into_account_truncating(), UnreleasedNativeVaultAccountId::get(), - StableAssetPalletId::get().into_account(), - HonzonBridgePalletId::get().into_account(), + StableAssetPalletId::get().into_account_truncating(), + HonzonBridgePalletId::get().into_account_truncating(), ] } @@ -361,6 +361,7 @@ impl pallet_balances::Config for Runtime { } parameter_types! { + /// The fee to be paid for making a transaction; the per-byte portion. pub TransactionByteFee: Balance = millicent(KAR); /// The portion of the `NORMAL_DISPATCH_RATIO` that we adjust the fees with. Blocks filled less /// than this will decrease the weight and more will increase. @@ -789,7 +790,7 @@ impl Contains for DustRemovalWhitelist { } parameter_types! { - pub KaruraTreasuryAccount: AccountId = TreasuryPalletId::get().into_account(); + pub KaruraTreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating(); } impl orml_tokens::Config for Runtime { @@ -804,6 +805,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = MaxReserves; type ReserveIdentifier = ReserveIdentifier; type DustRemovalWhitelist = DustRemovalWhitelist; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_type_with_key! { @@ -873,8 +876,8 @@ parameter_types! { hex_literal::hex!["efd29d0d6e63911ae3727fc71506bc3365c5d3b39e3a1680c857b4457cf8afad"].into(), // tij5W2NzmtxxAbwudwiZpif9ScmZfgFYdzrJWKYq6oNbSNH hex_literal::hex!["41dd2515ea11692c02306b68a2c6ff69b6606ebddaac40682789cfab300971c4"].into(), // pndshZqDAC9GutDvv7LzhGhgWeGv5YX9puFA8xDidHXCyjd hex_literal::hex!["dad0a28c620ba73b51234b1b2ae35064d90ee847e2c37f9268294646c5af65eb"].into(), // tFBV65Ts7wpQPxGM6PET9euNzp4pXdi9DVtgLZDJoFveR9F - TreasuryPalletId::get().into_account(), - TreasuryReservePalletId::get().into_account(), + TreasuryPalletId::get().into_account_truncating(), + TreasuryReservePalletId::get().into_account_truncating(), ]; } @@ -1131,7 +1134,7 @@ impl module_dex_oracle::Config for Runtime { } parameter_types! { - pub HonzonTreasuryAccount: AccountId = HonzonTreasuryPalletId::get().into_account(); + pub HonzonTreasuryAccount: AccountId = HonzonTreasuryPalletId::get().into_account_truncating(); pub AlternativeSwapPathJointList: Vec> = vec![ vec![KSM], vec![LKSM], @@ -1187,11 +1190,11 @@ impl module_transaction_payment::Config for Runtime { type MultiCurrency = Currencies; type OnTransactionPayment = DealWithFees; type AlternativeFeeSwapDeposit = NativeTokenExistentialDeposit; - type TransactionByteFee = TransactionByteFee; type OperationalFeeMultiplier = OperationalFeeMultiplier; type TipPerWeightStep = TipPerWeightStep; type MaxTipsOfPriority = MaxTipsOfPriority; type WeightToFee = WeightToFee; + type TransactionByteFee = TransactionByteFee; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type DEX = Dex; type MaxSwapSlippageCompareToOracle = MaxSwapSlippageCompareToOracle; @@ -1463,7 +1466,7 @@ impl cumulus_pallet_aura_ext::Config for Runtime {} parameter_types! { pub DefaultExchangeRate: ExchangeRate = ExchangeRate::saturating_from_rational(1, 10); - pub HomaTreasuryAccount: AccountId = HomaTreasuryPalletId::get().into_account(); + pub HomaTreasuryAccount: AccountId = HomaTreasuryPalletId::get().into_account_truncating(); pub ActiveSubAccountsIndexList: Vec = vec![ 0, // HTAeD1dokCVs9MwnC1q9s2a7d2kQ52TAjrxE1y5mj5MFLLA 1, // FDVu3RdH5WsE2yTdXN3QMq6v1XVDK8GKjhq5oFjXe8wZYpL @@ -1496,7 +1499,7 @@ pub fn create_x2_parachain_multilocation(index: u16) -> MultiLocation { 1, X1(AccountId32 { network: NetworkId::Any, - id: Utility::derivative_account_id(ParachainInfo::get().into_account(), index).into(), + id: Utility::derivative_account_id(ParachainInfo::get().into_account_truncating(), index).into(), }), ) } @@ -1509,7 +1512,7 @@ impl Convert for SubAccountIndexMultiLocationConvertor { } parameter_types! { - pub ParachainAccount: AccountId = ParachainInfo::get().into_account(); + pub ParachainAccount: AccountId = ParachainInfo::get().into_account_truncating(); } impl module_xcm_interface::Config for Runtime { diff --git a/runtime/karura/src/xcm_config.rs b/runtime/karura/src/xcm_config.rs index 64f0146a4e..dfc0e1223a 100644 --- a/runtime/karura/src/xcm_config.rs +++ b/runtime/karura/src/xcm_config.rs @@ -300,11 +300,11 @@ parameter_types! { } parameter_type_with_key! { - pub ParachainMinFee: |location: MultiLocation| -> u128 { + pub ParachainMinFee: |location: MultiLocation| -> Option { #[allow(clippy::match_ref_pats)] // false positive match (location.parents, location.first_interior()) { - (1, Some(Parachain(parachains::statemine::ID))) => XcmInterface::get_parachain_fee(location.clone()), - _ => u128::MAX, + (1, Some(Parachain(parachains::statemine::ID))) => Some(XcmInterface::get_parachain_fee(location.clone())), + _ => None, } }; } diff --git a/runtime/mandala/Cargo.toml b/runtime/mandala/Cargo.toml index 615d868ccd..756200d86b 100644 --- a/runtime/mandala/Cargo.toml +++ b/runtime/mandala/Cargo.toml @@ -16,67 +16,67 @@ scale-info = { version = "2.1", default-features = false, features = ["derive"] libsecp256k1 = { version = "0.7", default-features = false, optional = true } # substrate -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features =false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features =false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false, features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -138,15 +138,15 @@ ecosystem-compound-cash = { path = "../../ecosystem-modules/compound-cash", defa nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.23" } acala-service = { path = "../../node/service", features = ["with-mandala-runtime"] } diff --git a/runtime/mandala/src/authority.rs b/runtime/mandala/src/authority.rs index add8743756..0340e04958 100644 --- a/runtime/mandala/src/authority.rs +++ b/runtime/mandala/src/authority.rs @@ -79,16 +79,22 @@ impl orml_authority::AsOriginId for AuthoritysOriginId { fn into_origin(self) -> OriginCaller { match self { AuthoritysOriginId::Root => Origin::root().caller().clone(), - AuthoritysOriginId::Treasury => Origin::signed(TreasuryPalletId::get().into_account()).caller().clone(), - AuthoritysOriginId::HonzonTreasury => Origin::signed(HonzonTreasuryPalletId::get().into_account()) + AuthoritysOriginId::Treasury => Origin::signed(TreasuryPalletId::get().into_account_truncating()) .caller() .clone(), - AuthoritysOriginId::HomaTreasury => Origin::signed(HomaTreasuryPalletId::get().into_account()) - .caller() - .clone(), - AuthoritysOriginId::TreasuryReserve => Origin::signed(TreasuryReservePalletId::get().into_account()) + AuthoritysOriginId::HonzonTreasury => { + Origin::signed(HonzonTreasuryPalletId::get().into_account_truncating()) + .caller() + .clone() + } + AuthoritysOriginId::HomaTreasury => Origin::signed(HomaTreasuryPalletId::get().into_account_truncating()) .caller() .clone(), + AuthoritysOriginId::TreasuryReserve => { + Origin::signed(TreasuryReservePalletId::get().into_account_truncating()) + .caller() + .clone() + } } } diff --git a/runtime/mandala/src/benchmarking/currencies.rs b/runtime/mandala/src/benchmarking/currencies.rs index 50e9601d25..1d2828b70b 100644 --- a/runtime/mandala/src/benchmarking/currencies.rs +++ b/runtime/mandala/src/benchmarking/currencies.rs @@ -123,7 +123,7 @@ runtime_benchmarks! { sweep_dust { let c in 1..3u32; - let treasury: AccountId = TreasuryPalletId::get().into_account(); + let treasury: AccountId = TreasuryPalletId::get().into_account_truncating(); let accounts: Vec = vec!["alice", "bob", "charlie"].into_iter().map(|x| account(x, 0, SEED)).collect(); accounts.iter().for_each(|account| { orml_tokens::Accounts::::insert(account, STAKING, orml_tokens::AccountData { diff --git a/runtime/mandala/src/benchmarking/mod.rs b/runtime/mandala/src/benchmarking/mod.rs index 0fcde88176..f7ffc34e99 100644 --- a/runtime/mandala/src/benchmarking/mod.rs +++ b/runtime/mandala/src/benchmarking/mod.rs @@ -57,7 +57,7 @@ pub mod tokens; pub mod vesting; pub fn get_vesting_account() -> super::AccountId { - super::TreasuryPalletId::get().into_account() + super::TreasuryPalletId::get().into_account_truncating() } pub fn get_benchmarking_collateral_currency_ids() -> Vec { diff --git a/runtime/mandala/src/benchmarking/transaction_payment.rs b/runtime/mandala/src/benchmarking/transaction_payment.rs index 3f11e1b4af..6767f9ab81 100644 --- a/runtime/mandala/src/benchmarking/transaction_payment.rs +++ b/runtime/mandala/src/benchmarking/transaction_payment.rs @@ -79,8 +79,8 @@ runtime_benchmarks! { enable_charge_fee_pool { let funder: AccountId = account("funder", 0, SEED); - let treasury_account: AccountId = TreasuryPalletId::get().into_account(); - let sub_account: AccountId = ::PalletId::get().into_sub_account(STABLECOIN); + let treasury_account: AccountId = TreasuryPalletId::get().into_account_truncating(); + let sub_account: AccountId = ::PalletId::get().into_sub_account_truncating(STABLECOIN); let native_ed: Balance = >::minimum_balance(NATIVECOIN); let stable_ed: Balance = >::minimum_balance(STABLECOIN); let pool_size: Balance = native_ed * 50; @@ -117,8 +117,8 @@ runtime_benchmarks! { } disable_charge_fee_pool { - let treasury_account: AccountId = TreasuryPalletId::get().into_account(); - let sub_account: AccountId = ::PalletId::get().into_sub_account(STABLECOIN); + let treasury_account: AccountId = TreasuryPalletId::get().into_account_truncating(); + let sub_account: AccountId = ::PalletId::get().into_sub_account_truncating(STABLECOIN); let native_ed: Balance = >::minimum_balance(NATIVECOIN); let stable_ed: Balance = >::minimum_balance(STABLECOIN); let pool_size: Balance = native_ed * 50; diff --git a/runtime/mandala/src/constants.rs b/runtime/mandala/src/constants.rs index 23601aad7a..e6edfb5e56 100644 --- a/runtime/mandala/src/constants.rs +++ b/runtime/mandala/src/constants.rs @@ -102,7 +102,6 @@ mod tests { let q = Balance::from(ExtrinsicBaseWeight::get()); assert_eq!(p, 1_000_000_000); - assert_eq!(q, 125_000_000); - assert_eq!(p / q, 8); + assert_eq!(q, 85_795_000); } } diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs index cf488c1480..fff94af88b 100644 --- a/runtime/mandala/src/lib.rs +++ b/runtime/mandala/src/lib.rs @@ -171,7 +171,7 @@ parameter_types! { pub const PhragmenElectionPalletId: LockIdentifier = *b"aca/phre"; pub const NftPalletId: PalletId = PalletId(*b"aca/aNFT"); pub const NomineesElectionId: LockIdentifier = *b"aca/nome"; - pub UnreleasedNativeVaultAccountId: AccountId = PalletId(*b"aca/urls").into_account(); + pub UnreleasedNativeVaultAccountId: AccountId = PalletId(*b"aca/urls").into_account_truncating(); // This Pallet is only used to payment fee pool, it's not added to whitelist by design. // because transaction payment pallet will ensure the accounts always have enough ED. pub const TransactionPaymentPalletId: PalletId = PalletId(*b"aca/fees"); @@ -184,18 +184,18 @@ parameter_types! { pub fn get_all_module_accounts() -> Vec { vec![ - TreasuryPalletId::get().into_account(), - LoansPalletId::get().into_account(), - DEXPalletId::get().into_account(), - CDPTreasuryPalletId::get().into_account(), - HonzonTreasuryPalletId::get().into_account(), - HomaTreasuryPalletId::get().into_account(), - IncentivesPalletId::get().into_account(), - TreasuryReservePalletId::get().into_account(), - CollatorPotId::get().into_account(), - StarportPalletId::get().into_account(), + TreasuryPalletId::get().into_account_truncating(), + LoansPalletId::get().into_account_truncating(), + DEXPalletId::get().into_account_truncating(), + CDPTreasuryPalletId::get().into_account_truncating(), + HonzonTreasuryPalletId::get().into_account_truncating(), + HomaTreasuryPalletId::get().into_account_truncating(), + IncentivesPalletId::get().into_account_truncating(), + TreasuryReservePalletId::get().into_account_truncating(), + CollatorPotId::get().into_account_truncating(), + StarportPalletId::get().into_account_truncating(), UnreleasedNativeVaultAccountId::get(), - StableAssetPalletId::get().into_account(), + StableAssetPalletId::get().into_account_truncating(), ] } @@ -838,7 +838,7 @@ parameter_type_with_key! { } parameter_types! { - pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account(); + pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating(); } impl orml_tokens::Config for Runtime { @@ -853,6 +853,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = MaxReserves; type ReserveIdentifier = ReserveIdentifier; type DustRemovalWhitelist = DustRemovalWhitelist; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_type_with_key! { @@ -921,9 +923,9 @@ impl EnsureOrigin for EnsureRootOrTreasury { fn try_origin(o: Origin) -> Result { Into::, Origin>>::into(o).and_then(|o| match o { - RawOrigin::Root => Ok(TreasuryPalletId::get().into_account()), + RawOrigin::Root => Ok(TreasuryPalletId::get().into_account_truncating()), RawOrigin::Signed(caller) => { - if caller == TreasuryPalletId::get().into_account() { + if caller == TreasuryPalletId::get().into_account_truncating() { Ok(caller) } else { Err(Origin::from(Some(caller))) @@ -1177,7 +1179,7 @@ impl module_dex_oracle::Config for Runtime { } parameter_types! { - pub HonzonTreasuryAccount: AccountId = HonzonTreasuryPalletId::get().into_account(); + pub HonzonTreasuryAccount: AccountId = HonzonTreasuryPalletId::get().into_account_truncating(); } impl module_cdp_treasury::Config for Runtime { @@ -1236,11 +1238,11 @@ impl module_transaction_payment::Config for Runtime { type MultiCurrency = Currencies; type OnTransactionPayment = DealWithFees; type AlternativeFeeSwapDeposit = NativeTokenExistentialDeposit; - type TransactionByteFee = TransactionByteFee; type OperationalFeeMultiplier = OperationalFeeMultiplier; type TipPerWeightStep = TipPerWeightStep; type MaxTipsOfPriority = MaxTipsOfPriority; type WeightToFee = WeightToFee; + type TransactionByteFee = TransactionByteFee; type FeeMultiplierUpdate = TargetedFeeAdjustment; type DEX = Dex; type MaxSwapSlippageCompareToOracle = MaxSwapSlippageCompareToOracle; @@ -1331,13 +1333,13 @@ pub fn create_x2_parachain_multilocation(index: u16) -> MultiLocation { 1, X1(AccountId32 { network: NetworkId::Any, - id: Utility::derivative_account_id(ParachainInfo::get().into_account(), index).into(), + id: Utility::derivative_account_id(ParachainInfo::get().into_account_truncating(), index).into(), }), ) } parameter_types! { - pub HomaTreasuryAccount: AccountId = HomaTreasuryPalletId::get().into_account(); + pub HomaTreasuryAccount: AccountId = HomaTreasuryPalletId::get().into_account_truncating(); pub ActiveSubAccountsIndexList: Vec = vec![ 0, // 15sr8Dvq3AT3Z2Z1y8FnQ4VipekAHhmQnrkgzegUr1tNgbcn ]; @@ -1364,7 +1366,7 @@ impl module_homa::Config for Runtime { } parameter_types! { - pub ParachainAccount: AccountId = ParachainInfo::get().into_account(); + pub ParachainAccount: AccountId = ParachainInfo::get().into_account_truncating(); } pub struct SubAccountIndexMultiLocationConvertor; diff --git a/runtime/mandala/src/xcm_config.rs b/runtime/mandala/src/xcm_config.rs index e25a307ee5..fee946d991 100644 --- a/runtime/mandala/src/xcm_config.rs +++ b/runtime/mandala/src/xcm_config.rs @@ -328,8 +328,8 @@ parameter_types! { } parameter_type_with_key! { - pub ParachainMinFee: |_location: MultiLocation| -> u128 { - u128::MAX + pub ParachainMinFee: |_location: MultiLocation| -> Option { + None }; } diff --git a/ts-tests/tests/test-balance.ts b/ts-tests/tests/test-balance.ts index 766603d281..a58970c84b 100644 --- a/ts-tests/tests/test-balance.ts +++ b/ts-tests/tests/test-balance.ts @@ -11,8 +11,8 @@ describeWithAcala("Acala RPC (Balance)", (context) => { }); step("genesis balance is setup correctly", async function () { - expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999986402744000000000"); - expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999986402744000000000"); + expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999985535771315000000"); + expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999985535771315000000"); expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()) .to.equal((await context.provider.api.query.system.account(await alice.getSubstrateAddress())).data.free.toString() + "000000"); @@ -21,13 +21,13 @@ describeWithAcala("Acala RPC (Balance)", (context) => { step("balance to be updated after transfer", async function () { this.timeout(15000); - expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999986402744000000000"); - expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000986402748724000000"); + expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999985535771315000000"); + expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000985535778201000000"); await transfer(context, await alice.getSubstrateAddress(), await alice_stash.getSubstrateAddress(), 1000); - expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999969929155684000000"); - expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000986402749724000000"); - expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999969929155684000000"); + expect((await context.provider.getBalance(alice.getAddress())).toString()).to.equal("8999999968467638103000000"); + expect((await context.provider.getBalance(alice_stash.getAddress())).toString()).to.equal("10100000985535779201000000"); + expect((await context.provider.getBalance(alice.getAddress(), "latest")).toString()).to.equal("8999999968467638103000000"); expect((await context.provider.getBalance(alice_stash.getAddress(), "earliest")).toString()).to.equal("0"); }); }); diff --git a/ts-tests/tests/test-bodhi.ts b/ts-tests/tests/test-bodhi.ts index bf211b04fc..456a9784bf 100644 --- a/ts-tests/tests/test-bodhi.ts +++ b/ts-tests/tests/test-bodhi.ts @@ -92,6 +92,6 @@ describeWithAcala("Acala RPC (bodhi.js)", (context) => { expect(data.gas.toNumber()).to.be.eq(22409); expect(data.storage.toNumber()).to.be.eq(0); - expect(data.weightFee.toNumber()).to.be.eq(3999950550763); + expect(data.weightFee.toNumber()).to.be.eq(5827773367233); }); }); diff --git a/ts-tests/tests/test-gas-limit.ts b/ts-tests/tests/test-gas-limit.ts index 5e9e64ac95..f0f22f441a 100644 --- a/ts-tests/tests/test-gas-limit.ts +++ b/ts-tests/tests/test-gas-limit.ts @@ -18,10 +18,10 @@ describeWithAcala("Acala RPC (GasLimit)", (context) => { const contract = await deployContract(alice as any, Factory); // limited by used_storage const result = await contract.createContractLoop(360); - expect(result.gasLimit.toNumber()).to.be.eq(30_721_769); + expect(result.gasLimit.toNumber()).to.be.eq(30725309); const result2 = await contract.incrementLoop(9_500); - expect(result2.gasLimit.toNumber()).to.be.eq(32_799_219); + expect(result2.gasLimit.toNumber()).to.be.eq(32803507); const storages = await context.provider.api.query.evm.accountStorages.entries(contract.address); // 360 array items diff --git a/ts-tests/tests/test-gas.ts b/ts-tests/tests/test-gas.ts index c72a3d961e..88ad3ac788 100644 --- a/ts-tests/tests/test-gas.ts +++ b/ts-tests/tests/test-gas.ts @@ -29,7 +29,7 @@ describeWithAcala("Acala RPC (Gas)", (context) => { expect(data.gas.toNumber()).to.be.eq(273373); expect(data.storage.toNumber()).to.be.eq(10921); - expect(data.weightFee.toNumber()).to.be.eq(3999960165755); + expect(data.weightFee.toNumber()).to.be.eq(5827787382433); }); it("eth_estimateGas for contract call", async function () { @@ -47,6 +47,6 @@ describeWithAcala("Acala RPC (Gas)", (context) => { expect(data.gas.toNumber()).to.be.eq(22409); expect(data.storage.toNumber()).to.be.eq(0); - expect(data.weightFee.toNumber()).to.be.eq(3999940935794); + expect(data.weightFee.toNumber()).to.be.eq(5827759352067); }); });