From 29b07317c7ef460d6c9f1f0d702241dcf3151254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Pa=C4=8Dandi?= <3002868+Dinonard@users.noreply.github.com> Date: Fri, 9 Aug 2024 06:11:02 +0200 Subject: [PATCH] polkadot-sdk v1.11.0 uplift (#1314) * Update deps - init commit * Local uplift WIP * Shibuya progress * mend * Shibuya compiles * Changes * Basic compilation * All features compile * Tests passing * Integration tests * Fix evm-tracing init block code * Rename to make it consistent with frontier * Remove getters * Fix tests * Resolve issues * Review comments * Minor changes * tracing integration test update * xcm api integration tests wip * Finish integration tests * Weights * Fixes * Benchmark fixes * fixes * Revert some changes * Missing migrations, dead code removal * Fix for broken benchmarks * Comments * Fixes * Minor fix for xcm-simulator * weight updates * remove NativeElseWasmExecutor * fix benchmarking --------- Co-authored-by: Ermal Kaleci --- Cargo.lock | 2235 ++++++++++------- Cargo.toml | 308 +-- bin/collator/Cargo.toml | 4 +- bin/collator/src/benchmarking.rs | 78 +- bin/collator/src/cli.rs | 4 - bin/collator/src/command.rs | 171 +- bin/collator/src/local/mod.rs | 2 +- bin/collator/src/local/service.rs | 93 +- bin/collator/src/parachain/mod.rs | 4 +- bin/collator/src/parachain/service.rs | 282 +-- bin/collator/src/rpc.rs | 21 +- bin/collator/src/rpc/tracing.rs | 8 +- .../src/generic/benchmarking.rs | 10 +- pallets/astar-xcm-benchmarks/src/mock.rs | 3 + pallets/collator-selection/Cargo.toml | 2 +- pallets/collator-selection/src/lib.rs | 31 +- pallets/collator-selection/src/mock.rs | 1 + pallets/collator-selection/src/tests.rs | 75 +- pallets/dapp-staking-migration/src/lib.rs | 2 +- pallets/dapp-staking-v3/src/migration.rs | 9 +- pallets/inflation/src/benchmarking.rs | 8 +- pallets/inflation/src/lib.rs | 62 +- pallets/inflation/src/mock.rs | 19 +- pallets/price-aggregator/src/lib.rs | 32 +- pallets/static-price-provider/src/lib.rs | 22 +- pallets/unified-accounts/src/lib.rs | 1 - pallets/unified-accounts/src/migration.rs | 69 - pallets/xc-asset-config/src/lib.rs | 3 - pallets/xc-asset-config/src/migrations.rs | 6 +- precompiles/assets-erc20/src/tests.rs | 4 +- precompiles/sr25519/src/lib.rs | 4 +- precompiles/substrate-ecdsa/src/lib.rs | 4 +- precompiles/unified-accounts/src/mock.rs | 4 +- precompiles/xcm/src/mock.rs | 3 + primitives/src/benchmarks.rs | 20 +- runtime/astar/Cargo.toml | 2 + runtime/astar/src/lib.rs | 229 +- runtime/astar/src/weights/orml_oracle.rs | 20 +- runtime/astar/src/weights/pallet_assets.rs | 152 +- .../src/weights/pallet_dapp_staking_v3.rs | 118 +- runtime/astar/src/weights/pallet_inflation.rs | 34 +- runtime/astar/src/weights/pallet_xcm.rs | 68 +- runtime/astar/src/weights/xcm/fungible.rs | 199 +- runtime/astar/src/weights/xcm/generic.rs | 488 +--- runtime/astar/src/xcm_config.rs | 17 +- runtime/local/src/lib.rs | 121 +- runtime/shibuya/Cargo.toml | 2 + runtime/shibuya/src/lib.rs | 219 +- runtime/shibuya/src/weights/orml_oracle.rs | 20 +- runtime/shibuya/src/weights/pallet_assets.rs | 162 +- .../shibuya/src/weights/pallet_balances.rs | 40 +- .../src/weights/pallet_dapp_staking_v3.rs | 116 +- .../shibuya/src/weights/pallet_inflation.rs | 36 +- runtime/shibuya/src/weights/pallet_xcm.rs | 72 +- runtime/shibuya/src/weights/xcm/fungible.rs | 201 +- runtime/shibuya/src/weights/xcm/generic.rs | 484 +--- runtime/shibuya/src/xcm_config.rs | 16 +- runtime/shiden/Cargo.toml | 2 + runtime/shiden/src/lib.rs | 224 +- runtime/shiden/src/weights/orml_oracle.rs | 20 +- runtime/shiden/src/weights/pallet_assets.rs | 148 +- .../src/weights/pallet_dapp_staking_v3.rs | 116 +- .../shiden/src/weights/pallet_inflation.rs | 32 +- runtime/shiden/src/weights/pallet_xcm.rs | 68 +- runtime/shiden/src/weights/xcm/fungible.rs | 199 +- runtime/shiden/src/weights/xcm/generic.rs | 488 +--- runtime/shiden/src/xcm_config.rs | 14 +- scripts/run_benchmarks.sh | 1 - tests/integration/Cargo.toml | 8 +- tests/integration/src/dapp_staking_v3.rs | 2 +- tests/integration/src/evm_tracing.rs | 35 +- tests/integration/src/lib.rs | 3 + tests/integration/src/setup.rs | 48 +- tests/integration/src/unified_accounts.rs | 2 + tests/integration/src/xcm_api.rs | 190 ++ tests/xcm-simulator/src/mocks/parachain.rs | 22 +- tests/xcm-simulator/src/mocks/relay_chain.rs | 6 +- .../src/tests/fungible_assets.rs | 31 +- tests/xcm-simulator/src/tests/general.rs | 3 +- vendor/primitives/debug/src/lib.rs | 17 +- vendor/rpc-core/debug/Cargo.toml | 2 + vendor/rpc-core/debug/src/lib.rs | 39 +- vendor/rpc/debug/Cargo.toml | 1 + vendor/rpc/debug/src/lib.rs | 325 ++- vendor/rpc/trace/src/lib.rs | 111 +- 85 files changed, 4102 insertions(+), 4475 deletions(-) delete mode 100644 pallets/unified-accounts/src/migration.rs create mode 100644 tests/integration/src/xcm_api.rs diff --git a/Cargo.lock b/Cargo.lock index adbe678b9..ba671faf5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -502,7 +502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", "rayon", ] @@ -663,6 +663,7 @@ dependencies = [ "pallet-transaction-payment-rpc", "parity-scale-codec", "polkadot-cli", + "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", @@ -712,7 +713,6 @@ dependencies = [ "substrate-frame-rpc-system", "substrate-prometheus-endpoint", "tokio", - "try-runtime-cli", "url", ] @@ -745,7 +745,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -847,9 +847,9 @@ dependencies = [ "sp-io", "sp-offchain", "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-session", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -857,6 +857,7 @@ dependencies = [ "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -890,7 +891,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -1231,7 +1232,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "hash-db", "log", @@ -1444,7 +1445,7 @@ dependencies = [ [[package]] name = "bp-xcm-bridge-hub-router" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "scale-info", @@ -1702,6 +1703,19 @@ dependencies = [ "unsigned-varint", ] +[[package]] +name = "cid" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" +dependencies = [ + "core2", + "multibase", + "multihash 0.18.1", + "serde", + "unsigned-varint", +] + [[package]] name = "cipher" version = "0.2.5" @@ -1831,7 +1845,7 @@ dependencies = [ "hmac 0.12.1", "once_cell", "pbkdf2 0.12.2", - "rand", + "rand 0.8.5", "sha2 0.10.8", "thiserror", ] @@ -1862,6 +1876,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "comfy-table" version = "7.1.1" @@ -1876,7 +1900,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" +source = "git+https://github.com/w3f/ring-proof#665f5f51af5734c7b6d90b985dd6861d4c5b4752" dependencies = [ "ark-ec", "ark-ff", @@ -2131,6 +2155,21 @@ dependencies = [ "wasmtime-types", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.4.2" @@ -2235,7 +2274,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "clap", "parity-scale-codec", @@ -2252,7 +2291,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -2275,7 +2314,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "cumulus-client-collator", @@ -2317,7 +2356,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -2346,7 +2385,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-proposer" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "anyhow", "async-trait", @@ -2361,7 +2400,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -2384,7 +2423,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -2407,7 +2446,7 @@ dependencies = [ [[package]] name = "cumulus-client-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2422,8 +2461,8 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", "tracing", ] @@ -2431,7 +2470,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2443,7 +2482,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", - "rand", + "rand 0.8.5", "sc-client-api", "sc-consensus", "sp-consensus", @@ -2455,7 +2494,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -2484,6 +2523,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-io", "sp-runtime", "sp-transaction-pool", ] @@ -2491,7 +2531,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cumulus-pallet-parachain-system", "frame-support", @@ -2503,13 +2543,13 @@ dependencies = [ "sp-application-crypto", "sp-consensus-aura", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "cumulus-pallet-dmp-queue" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -2520,14 +2560,14 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", ] [[package]] name = "cumulus-pallet-parachain-system" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -2547,12 +2587,12 @@ dependencies = [ "polkadot-runtime-parachains", "scale-info", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-inherents", "sp-io", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", "sp-version", "staging-xcm", @@ -2562,7 +2602,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -2573,7 +2613,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2582,14 +2622,14 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", ] [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bounded-collections", "bp-xcm-bridge-hub-router", @@ -2606,7 +2646,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-executor", ] @@ -2614,7 +2654,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-aura" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -2622,13 +2662,13 @@ dependencies = [ "sp-api", "sp-consensus-aura", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "cumulus-primitives-core" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -2637,7 +2677,7 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", "staging-xcm", ] @@ -2645,7 +2685,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2653,37 +2693,39 @@ dependencies = [ "scale-info", "sp-core", "sp-inherents", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime", + "sp-state-machine", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", ] [[package]] name = "cumulus-primitives-proof-size-hostfunction" version = "0.2.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", ] [[package]] name = "cumulus-primitives-timestamp" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cumulus-primitives-core", "futures 0.3.30", "parity-scale-codec", "sp-inherents", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-timestamp", ] [[package]] name = "cumulus-primitives-utility" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2694,7 +2736,7 @@ dependencies = [ "polkadot-runtime-parachains", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -2703,7 +2745,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2727,7 +2769,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2745,7 +2787,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "async-trait", @@ -2787,7 +2829,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2799,7 +2841,7 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-overseer", - "rand", + "rand 0.8.5", "sc-client-api", "sc-rpc-api", "sc-service", @@ -2814,7 +2856,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-version", "thiserror", "tokio", @@ -2826,14 +2868,14 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", "polkadot-primitives", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", ] @@ -2941,7 +2983,7 @@ version = "0.1.0" dependencies = [ "astar-primitives", "sp-api", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -3262,10 +3304,19 @@ dependencies = [ "elliptic-curve", "rfc6979", "serdect", - "signature", + "signature 2.2.0", "spki", ] +[[package]] +name = "ed25519" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +dependencies = [ + "signature 1.6.4", +] + [[package]] name = "ed25519" version = "2.2.3" @@ -3273,7 +3324,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", - "signature", + "signature 2.2.0", +] + +[[package]] +name = "ed25519-dalek" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +dependencies = [ + "curve25519-dalek 3.2.0", + "ed25519 1.5.3", + "rand 0.7.3", + "serde", + "sha2 0.9.9", + "zeroize", ] [[package]] @@ -3283,7 +3348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek 4.1.2", - "ed25519", + "ed25519 2.2.3", "rand_core 0.6.4", "serde", "sha2 0.10.8", @@ -3312,7 +3377,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ "curve25519-dalek 4.1.2", - "ed25519", + "ed25519 2.2.3", "hashbrown 0.14.5", "hex", "rand_core 0.6.4", @@ -3372,7 +3437,7 @@ dependencies = [ "hex", "k256", "log", - "rand", + "rand 0.8.5", "rlp", "serde", "sha3", @@ -3391,6 +3456,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "enumflags2" version = "0.7.9" @@ -3482,7 +3559,7 @@ dependencies = [ "hex", "hmac 0.12.1", "pbkdf2 0.11.0", - "rand", + "rand 0.8.5", "scrypt", "serde", "serde_json", @@ -3659,7 +3736,7 @@ dependencies = [ "num_enum 0.7.2", "once_cell", "open-fastrlp", - "rand", + "rand 0.8.5", "rlp", "serde", "serde_json", @@ -3746,7 +3823,7 @@ dependencies = [ "elliptic-curve", "eth-keystore", "ethers-core", - "rand", + "rand 0.8.5", "sha2 0.10.8", "thiserror", "tracing", @@ -3859,7 +3936,7 @@ dependencies = [ "evm-gasometer", "evm-runtime", "parity-scale-codec", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -3968,7 +4045,7 @@ dependencies = [ [[package]] name = "fc-api" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "async-trait", "fp-storage", @@ -3980,7 +4057,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "async-trait", "fp-consensus", @@ -3996,7 +4073,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "async-trait", "fc-api", @@ -4017,7 +4094,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "fc-db", "fc-storage", @@ -4038,7 +4115,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "ethereum", "ethereum-types", @@ -4058,12 +4135,11 @@ dependencies = [ "pallet-evm", "parity-scale-codec", "prometheus", - "rand", + "rand 0.8.5", "rlp", "sc-client-api", "sc-consensus-aura", "sc-network", - "sc-network-common", "sc-network-sync", "sc-rpc", "sc-service", @@ -4078,12 +4154,12 @@ dependencies = [ "sp-consensus", "sp-consensus-aura", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-inherents", "sp-io", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-timestamp", "substrate-prometheus-endpoint", "thiserror", @@ -4093,7 +4169,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "ethereum", "ethereum-types", @@ -4108,7 +4184,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "ethereum", "ethereum-types", @@ -4117,10 +4193,9 @@ dependencies = [ "parity-scale-codec", "sc-client-api", "sp-api", - "sp-blockchain", "sp-io", "sp-runtime", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -4207,7 +4282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -4244,10 +4319,25 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "fork-tree" version = "12.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", ] @@ -4264,7 +4354,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "hex", "impl-serde", @@ -4276,39 +4366,36 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "ethereum", "parity-scale-codec", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "ethereum", "ethereum-types", "fp-evm", "frame-support", "parity-scale-codec", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "evm", "frame-support", @@ -4318,13 +4405,12 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "ethereum", "ethereum-types", @@ -4335,13 +4421,12 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "frame-support", "parity-scale-codec", @@ -4353,7 +4438,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "parity-scale-codec", "serde", @@ -4368,7 +4453,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-support-procedural", @@ -4384,16 +4469,16 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "static_assertions", ] [[package]] name = "frame-benchmarking-cli" version = "32.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "Inflector", "array-bytes 6.2.3", @@ -4410,9 +4495,10 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "rand", + "rand 0.8.5", "rand_pcg", "sc-block-builder", + "sc-chain-spec", "sc-cli", "sc-client-api", "sc-client-db", @@ -4425,15 +4511,16 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-database", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", - "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "thiserror", "thousands", ] @@ -4441,7 +4528,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -4452,7 +4539,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -4463,13 +4550,13 @@ dependencies = [ "sp-core", "sp-npos-elections", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "frame-executive" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "aquamarine 0.3.3", "frame-support", @@ -4481,8 +4568,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -4500,7 +4587,7 @@ dependencies = [ [[package]] name = "frame-metadata-hash-extension" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "docify", @@ -4512,32 +4599,10 @@ dependencies = [ "sp-runtime", ] -[[package]] -name = "frame-remote-externalities" -version = "0.35.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" -dependencies = [ - "futures 0.3.30", - "indicatif", - "jsonrpsee", - "log", - "parity-scale-codec", - "serde", - "sp-core", - "sp-crypto-hashing", - "sp-io", - "sp-runtime", - "sp-state-machine", - "spinners", - "substrate-rpc-client", - "tokio", - "tokio-retry", -] - [[package]] name = "frame-support" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "aquamarine 0.5.0", "array-bytes 6.2.3", @@ -4560,7 +4625,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-crypto-hashing-proc-macro", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-genesis-builder", "sp-inherents", "sp-io", @@ -4568,8 +4633,8 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-weights", "static_assertions", "tt-call", @@ -4578,11 +4643,11 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse 0.1.5", + "derive-syn-parse 0.2.0", "expander 2.1.0", "frame-support-procedural-tools", "itertools 0.10.5", @@ -4597,7 +4662,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 3.1.0", @@ -4609,7 +4674,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "proc-macro2", "quote", @@ -4619,7 +4684,7 @@ dependencies = [ [[package]] name = "frame-system" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cfg-if", "docify", @@ -4631,7 +4696,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-version", "sp-weights", ] @@ -4639,7 +4704,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -4648,13 +4713,13 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "frame-system-rpc-runtime-api" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "sp-api", @@ -4663,13 +4728,13 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "parity-scale-codec", "sp-api", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -4930,7 +4995,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "rand", + "rand 0.8.5", "rand_core 0.6.4", ] @@ -5004,7 +5069,7 @@ dependencies = [ "parking_lot 0.12.3", "portable-atomic", "quanta", - "rand", + "rand 0.8.5", "smallvec", "spinning_top", ] @@ -5342,6 +5407,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "idna" version = "0.5.0" @@ -5471,19 +5546,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" -[[package]] -name = "indicatif" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - [[package]] name = "inout" version = "0.1.3" @@ -5540,6 +5602,7 @@ dependencies = [ "moonbeam-rpc-primitives-debug", "orml-oracle", "pallet-assets", + "pallet-aura", "pallet-balances", "pallet-collator-selection 3.3.2", "pallet-collective-proxy", @@ -5568,7 +5631,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-trie", + "staging-xcm", "unified-accounts-chain-extension-types", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -5681,7 +5746,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" dependencies = [ "jsonrpsee-core", - "jsonrpsee-http-client", "jsonrpsee-proc-macros", "jsonrpsee-server", "jsonrpsee-types", @@ -5726,7 +5790,7 @@ dependencies = [ "jsonrpsee-types", "parking_lot 0.12.3", "pin-project", - "rand", + "rand 0.8.5", "rustc-hash", "serde", "serde_json", @@ -5736,26 +5800,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-http-client" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5" -dependencies = [ - "async-trait", - "hyper", - "hyper-rustls", - "jsonrpsee-core", - "jsonrpsee-types", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower", - "tracing", - "url", -] - [[package]] name = "jsonrpsee-proc-macros" version = "0.22.5" @@ -5845,7 +5889,7 @@ dependencies = [ "once_cell", "serdect", "sha2 0.10.8", - "signature", + "signature 2.2.0", ] [[package]] @@ -6021,7 +6065,7 @@ dependencies = [ "parking_lot 0.12.3", "pin-project", "quick-protobuf", - "rand", + "rand 0.8.5", "rw-stream-sink", "smallvec", "thiserror", @@ -6040,7 +6084,7 @@ dependencies = [ "log", "parking_lot 0.12.3", "smallvec", - "trust-dns-resolver", + "trust-dns-resolver 0.22.0", ] [[package]] @@ -6072,12 +6116,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", - "ed25519-dalek", + "ed25519-dalek 2.1.1", "log", "multiaddr", "multihash 0.17.0", "quick-protobuf", - "rand", + "rand 0.8.5", "sha2 0.10.8", "thiserror", "zeroize", @@ -6102,7 +6146,7 @@ dependencies = [ "libp2p-swarm", "log", "quick-protobuf", - "rand", + "rand 0.8.5", "sha2 0.10.8", "smallvec", "thiserror", @@ -6124,11 +6168,11 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "rand", + "rand 0.8.5", "smallvec", "socket2 0.4.10", "tokio", - "trust-dns-proto", + "trust-dns-proto 0.22.0", "void", ] @@ -6160,7 +6204,7 @@ dependencies = [ "log", "once_cell", "quick-protobuf", - "rand", + "rand 0.8.5", "sha2 0.10.8", "snow", "static_assertions", @@ -6182,7 +6226,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "rand", + "rand 0.8.5", "void", ] @@ -6202,7 +6246,7 @@ dependencies = [ "log", "parking_lot 0.12.3", "quinn-proto", - "rand", + "rand 0.8.5", "rustls 0.20.9", "thiserror", "tokio", @@ -6220,7 +6264,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm", - "rand", + "rand 0.8.5", "smallvec", ] @@ -6239,7 +6283,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm-derive", "log", - "rand", + "rand 0.8.5", "smallvec", "tokio", "void", @@ -6287,7 +6331,7 @@ dependencies = [ "rustls 0.20.9", "thiserror", "webpki", - "x509-parser", + "x509-parser 0.14.0", "yasna", ] @@ -6375,7 +6419,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand", + "rand 0.8.5", "serde", "sha2 0.9.9", "typenum", @@ -6484,6 +6528,61 @@ dependencies = [ "keystream", ] +[[package]] +name = "litep2p" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f02542ae3a94b4c4ffa37dc56388c923e286afa3bf65452e3984b50b2a2f316" +dependencies = [ + "async-trait", + "bs58 0.4.0", + "bytes", + "cid 0.10.1", + "ed25519-dalek 1.0.1", + "futures 0.3.30", + "futures-timer", + "hex-literal", + "indexmap 2.2.6", + "libc", + "mockall 0.12.1", + "multiaddr", + "multihash 0.17.0", + "network-interface", + "nohash-hasher", + "parking_lot 0.12.3", + "pin-project", + "prost 0.11.9", + "prost-build", + "quinn", + "rand 0.8.5", + "rcgen", + "ring 0.16.20", + "rustls 0.20.9", + "serde", + "sha2 0.10.8", + "simple-dns", + "smallvec", + "snow", + "socket2 0.5.7", + "static_assertions", + "str0m", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tokio-util", + "tracing", + "trust-dns-resolver 0.23.2", + "uint", + "unsigned-varint", + "url", + "webpki", + "x25519-dalek 2.0.1", + "x509-parser 0.15.1", + "yasna", + "zeroize", +] + [[package]] name = "local-runtime" version = "5.42.2" @@ -6564,7 +6663,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-transaction-pool", "sp-version", "substrate-wasm-builder", @@ -6582,9 +6681,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" @@ -6703,27 +6802,12 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "match_cfg" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" -[[package]] -name = "matchers" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata 0.1.10", -] - [[package]] name = "matchers" version = "0.1.0" @@ -6833,7 +6917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ "futures 0.3.30", - "rand", + "rand 0.8.5", "thrift", ] @@ -6886,7 +6970,7 @@ dependencies = [ "lioness", "log", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_distr", "subtle 2.5.0", @@ -6897,7 +6981,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "log", @@ -6916,7 +7000,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -6938,8 +7022,23 @@ dependencies = [ "downcast", "fragile", "lazy_static", - "mockall_derive", - "predicates", + "mockall_derive 0.11.4", + "predicates 2.1.5", + "predicates-tree", +] + +[[package]] +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive 0.12.1", + "predicates 3.1.2", "predicates-tree", ] @@ -6955,6 +7054,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "moonbeam-client-evm-tracing" version = "0.1.0" @@ -6967,7 +7078,7 @@ dependencies = [ "serde", "serde_json", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -6986,7 +7097,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -6996,16 +7107,18 @@ dependencies = [ "ethereum-types", "evm-tracing-events", "parity-scale-codec", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "moonbeam-rpc-core-debug" version = "0.1.0" dependencies = [ + "ethereum", "ethereum-types", + "fc-rpc-core", "futures 0.3.30", "jsonrpsee", "moonbeam-client-evm-tracing", @@ -7059,6 +7172,7 @@ dependencies = [ "fc-consensus", "fc-db", "fc-rpc", + "fc-rpc-core", "fc-storage", "fp-rpc", "futures 0.3.30", @@ -7093,7 +7207,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -7106,7 +7220,7 @@ dependencies = [ "sp-api", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -7137,7 +7251,7 @@ dependencies = [ "sp-blockchain", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-transaction-pool", "substrate-prometheus-endpoint", "tokio", @@ -7163,7 +7277,7 @@ dependencies = [ "sp-blockchain", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -7219,10 +7333,14 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" dependencies = [ + "blake2b_simd", + "blake2s_simd", + "blake3", "core2", "digest 0.10.7", "multihash-derive 0.8.0", "sha2 0.10.8", + "sha3", "unsigned-varint", ] @@ -7348,7 +7466,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" dependencies = [ - "rand", + "rand 0.8.5", ] [[package]] @@ -7423,6 +7541,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "network-interface" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a43439bf756eed340bdf8feba761e2d50c7d47175d87545cd5cbe4a137c4d1" +dependencies = [ + "cc", + "libc", + "thiserror", + "winapi", +] + [[package]] name = "nix" version = "0.24.3" @@ -7643,12 +7773,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - [[package]] name = "object" version = "0.30.4" @@ -7731,6 +7855,32 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "openssl-probe" version = "0.1.5" @@ -7738,19 +7888,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "option-ext" -version = "0.2.0" +name = "openssl-src" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +dependencies = [ + "cc", +] [[package]] -name = "orchestra" -version = "0.3.6" +name = "openssl-sys" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92829eef0328a3d1cd22a02c0e51deb92a5362df3e7d21a4e9bdc38934694e66" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ - "async-trait", - "dyn-clonable", + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orchestra" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92829eef0328a3d1cd22a02c0e51deb92a5362df3e7d21a4e9bdc38934694e66" +dependencies = [ + "async-trait", + "dyn-clonable", "futures 0.3.30", "futures-timer", "orchestra-proc-macro", @@ -7787,8 +7959,8 @@ dependencies = [ [[package]] name = "orml-oracle" -version = "0.9.1" -source = "git+https://github.com/AstarNetwork/open-runtime-module-library?branch=polkadot-v1.9.0#f45d7797a067780e572fd5fe70d6a7fe82b41104" +version = "0.10.0" +source = "git+https://github.com/AstarNetwork/open-runtime-module-library?branch=polkadot-v1.11.0#d3629f99bd7e679bf217a247966df9fcf17fa55d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7801,13 +7973,13 @@ dependencies = [ "sp-application-crypto", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "orml-traits" -version = "0.9.1" -source = "git+https://github.com/AstarNetwork/open-runtime-module-library?branch=polkadot-v1.9.0#f45d7797a067780e572fd5fe70d6a7fe82b41104" +version = "0.10.0" +source = "git+https://github.com/AstarNetwork/open-runtime-module-library?branch=polkadot-v1.11.0#d3629f99bd7e679bf217a247966df9fcf17fa55d" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -7820,14 +7992,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", ] [[package]] name = "orml-utilities" -version = "0.9.1" -source = "git+https://github.com/AstarNetwork/open-runtime-module-library?branch=polkadot-v1.9.0#f45d7797a067780e572fd5fe70d6a7fe82b41104" +version = "0.10.0" +source = "git+https://github.com/AstarNetwork/open-runtime-module-library?branch=polkadot-v1.11.0#d3629f99bd7e679bf217a247966df9fcf17fa55d" dependencies = [ "frame-support", "parity-scale-codec", @@ -7836,27 +8008,27 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "orml-xcm-support" -version = "0.9.1" -source = "git+https://github.com/AstarNetwork/open-runtime-module-library?branch=polkadot-v1.9.0#f45d7797a067780e572fd5fe70d6a7fe82b41104" +version = "0.10.0" +source = "git+https://github.com/AstarNetwork/open-runtime-module-library?branch=polkadot-v1.11.0#d3629f99bd7e679bf217a247966df9fcf17fa55d" dependencies = [ "frame-support", "orml-traits", "parity-scale-codec", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-executor", ] [[package]] name = "orml-xtokens" -version = "0.9.1" -source = "git+https://github.com/AstarNetwork/open-runtime-module-library?branch=polkadot-v1.9.0#f45d7797a067780e572fd5fe70d6a7fe82b41104" +version = "0.10.0" +source = "git+https://github.com/AstarNetwork/open-runtime-module-library?branch=polkadot-v1.11.0#d3629f99bd7e679bf217a247966df9fcf17fa55d" dependencies = [ "frame-support", "frame-system", @@ -7869,7 +8041,7 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-executor", ] @@ -7883,11 +8055,12 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pallet-asset-conversion" version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-api", @@ -7895,13 +8068,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-asset-rate" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -7910,13 +8083,13 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-asset-tx-payment" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -7928,13 +8101,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-assets" -version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +version = "29.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -7944,13 +8117,13 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-aura" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-system", @@ -7961,13 +8134,13 @@ dependencies = [ "sp-application-crypto", "sp-consensus-aura", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-authority-discovery" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-system", @@ -7977,13 +8150,13 @@ dependencies = [ "sp-application-crypto", "sp-authority-discovery", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-authorship" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-system", @@ -7991,13 +8164,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-babe" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -8015,13 +8188,13 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-bags-list" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "aquamarine 0.5.0", "docify", @@ -8036,14 +8209,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-balances" version = "28.0.0" -source = "git+https://github.com/AstarNetwork/polkadot-sdk?branch=astar-release-polkadot-v1.9.0#d5ae3ce0a9a46f7302a408e323e718532c84e243" +source = "git+https://github.com/AstarNetwork/polkadot-sdk?branch=astar-release-polkadot-v1.11.0#81f9c08a3c826cb43d37b105e16568d788005ad8" dependencies = [ "docify", "frame-benchmarking", @@ -8053,13 +8226,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-beefy" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-system", @@ -8073,13 +8246,13 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-beefy-mmr" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "binary-merkle-tree", @@ -8098,13 +8271,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-bounties" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -8116,24 +8289,26 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-broker" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitvec", "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", + "sp-api", "sp-arithmetic", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -8155,7 +8330,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -8174,14 +8349,14 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "unified-accounts-chain-extension-types", ] [[package]] name = "pallet-child-bounties" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -8194,7 +8369,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -8211,7 +8386,7 @@ dependencies = [ "pallet-session", "pallet-timestamp", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "serde", "sp-consensus-aura", @@ -8219,33 +8394,34 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-collator-selection" version = "9.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-authorship", + "pallet-balances", "pallet-session", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "sp-runtime", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-collective" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -8256,7 +8432,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -8276,13 +8452,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-contracts" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitflags 1.3.2", "environmental", @@ -8295,7 +8471,8 @@ dependencies = [ "pallet-contracts-proc-macro", "pallet-contracts-uapi", "parity-scale-codec", - "rand", + "paste", + "rand 0.8.5", "rand_pcg", "scale-info", "serde", @@ -8304,7 +8481,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-builder", "wasm-instrument", @@ -8314,7 +8491,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "18.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "proc-macro2", "quote", @@ -8324,19 +8501,19 @@ dependencies = [ [[package]] name = "pallet-contracts-uapi" version = "5.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitflags 1.3.2", "parity-scale-codec", "paste", - "polkavm-derive 0.5.0", + "polkavm-derive", "scale-info", ] [[package]] name = "pallet-conviction-voting" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "assert_matches", "frame-benchmarking", @@ -8347,7 +8524,7 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -8367,7 +8544,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -8389,13 +8566,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-democracy" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -8407,7 +8584,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -8427,13 +8604,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-election-provider-multi-phase" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8442,21 +8619,21 @@ dependencies = [ "log", "pallet-election-provider-support-benchmarking", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "sp-arithmetic", "sp-core", "sp-io", "sp-npos-elections", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "strum 0.24.1", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "strum 0.26.2", ] [[package]] name = "pallet-election-provider-support-benchmarking" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8464,13 +8641,13 @@ dependencies = [ "parity-scale-codec", "sp-npos-elections", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-elections-phragmen" version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -8483,13 +8660,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "ethereum", "ethereum-types", @@ -8506,7 +8683,6 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] @@ -8531,13 +8707,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "environmental", "evm", @@ -8557,13 +8733,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "pallet-evm-chain-id" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "frame-support", "frame-system", @@ -8594,13 +8769,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "fp-evm", ] @@ -8608,7 +8783,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "fp-evm", "sp-core", @@ -8640,13 +8815,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "fp-evm", "frame-support", @@ -8678,22 +8853,22 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-evm-precompile-ed25519" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ - "ed25519-dalek", + "ed25519-dalek 2.1.1", "fp-evm", ] [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "fp-evm", "num", @@ -8702,7 +8877,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sha3fips" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "fp-evm", "tiny-keccak", @@ -8711,7 +8886,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.9.0#8c94d30f05e2473da2ab2417b615fb9d01d01086" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.11.0#1daafa80fc18800e56a0ac60f02a60353240235c" dependencies = [ "fp-evm", "ripemd", @@ -8739,7 +8914,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -8764,7 +8939,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -8793,7 +8968,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -8826,7 +9001,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -8835,7 +9010,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "docify", "frame-benchmarking", @@ -8848,13 +9023,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-grandpa" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -8871,13 +9046,13 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-identity" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "enumflags2", "frame-benchmarking", @@ -8888,13 +9063,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-im-online" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -8908,13 +9083,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-indices" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -8925,7 +9100,7 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -8944,13 +9119,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-insecure-randomness-collective-flip" version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-system", @@ -8958,13 +9133,13 @@ dependencies = [ "safe-mix", "scale-info", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-membership" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -8975,13 +9150,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-message-queue" version = "31.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "environmental", "frame-benchmarking", @@ -8994,14 +9169,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-weights", ] [[package]] name = "pallet-mmr" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9013,13 +9188,13 @@ dependencies = [ "sp-io", "sp-mmr-primitives", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-multisig" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9029,13 +9204,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-nis" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9045,13 +9220,13 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-nomination-pools" version = "25.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-system", @@ -9063,14 +9238,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-nomination-pools-benchmarking" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -9082,26 +9257,26 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-nomination-pools-runtime-api" version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", "sp-api", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-offences" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-system", @@ -9112,13 +9287,13 @@ dependencies = [ "serde", "sp-runtime", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-offences-benchmarking" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -9136,13 +9311,31 @@ dependencies = [ "scale-info", "sp-runtime", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", +] + +[[package]] +name = "pallet-parameters" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "paste", + "scale-info", + "serde", + "sp-core", + "sp-runtime", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-preimage" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9153,7 +9346,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -9175,13 +9368,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-proxy" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9190,13 +9383,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-ranked-collective" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9209,13 +9402,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-recovery" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9224,13 +9417,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-referenda" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "assert_matches", "frame-benchmarking", @@ -9243,13 +9436,13 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-root-testing" version = "4.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-system", @@ -9258,13 +9451,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-scheduler" version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "docify", "frame-benchmarking", @@ -9275,14 +9468,14 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-weights", ] [[package]] name = "pallet-session" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-system", @@ -9297,14 +9490,14 @@ dependencies = [ "sp-session", "sp-staking", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", ] [[package]] name = "pallet-session-benchmarking" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9312,16 +9505,16 @@ dependencies = [ "pallet-session", "pallet-staking", "parity-scale-codec", - "rand", + "rand 0.8.5", "sp-runtime", "sp-session", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-society" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9333,13 +9526,13 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-staking" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -9356,13 +9549,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-staking-reward-curve" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -9373,7 +9566,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "log", "sp-arithmetic", @@ -9382,7 +9575,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "sp-api", @@ -9392,7 +9585,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9403,7 +9596,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -9423,13 +9616,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-sudo" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "docify", "frame-benchmarking", @@ -9439,13 +9632,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-timestamp" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "docify", "frame-benchmarking", @@ -9457,15 +9650,15 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-timestamp", ] [[package]] name = "pallet-tips" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9478,13 +9671,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-transaction-payment" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-system", @@ -9494,13 +9687,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-transaction-payment-rpc" version = "30.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -9516,7 +9709,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -9528,7 +9721,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "docify", "frame-benchmarking", @@ -9541,7 +9734,7 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -9566,13 +9759,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-utility" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9582,13 +9775,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-vesting" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9597,13 +9790,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "pallet-whitelist" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9612,7 +9805,7 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -9631,14 +9824,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", ] [[package]] name = "pallet-xcm" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bounded-collections", "frame-benchmarking", @@ -9652,16 +9845,17 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", + "xcm-fee-payment-runtime-api", ] [[package]] name = "pallet-xcm-benchmarks" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-benchmarking", "frame-support", @@ -9671,7 +9865,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -9680,7 +9874,7 @@ dependencies = [ [[package]] name = "parachains-common" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-utility", @@ -9701,7 +9895,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-parachain-info", "staging-xcm", "staging-xcm-executor", @@ -9715,7 +9909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9" dependencies = [ "bitcoin_hashes 0.13.0", - "rand", + "rand 0.8.5", "rand_core 0.6.4", "serde", "unicode-normalization", @@ -9736,7 +9930,7 @@ dependencies = [ "lz4", "memmap2 0.5.10", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", "siphasher", "snap", "winapi", @@ -10038,7 +10232,7 @@ checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "polkadot-approval-distribution" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitvec", "futures 0.3.30", @@ -10051,14 +10245,14 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand", + "rand 0.8.5", "tracing-gum", ] [[package]] name = "polkadot-availability-bitfield-distribution" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "always-assert", "futures 0.3.30", @@ -10067,14 +10261,14 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand", + "rand 0.8.5", "tracing-gum", ] [[package]] name = "polkadot-availability-distribution" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "derive_more", "fatality", @@ -10086,7 +10280,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand", + "rand 0.8.5", "schnellru", "sp-core", "sp-keystore", @@ -10097,7 +10291,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "fatality", @@ -10109,7 +10303,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand", + "rand 0.8.5", "sc-network", "schnellru", "thiserror", @@ -10120,7 +10314,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cfg-if", "clap", @@ -10143,13 +10337,12 @@ dependencies = [ "sp-runtime", "substrate-build-script-utils", "thiserror", - "try-runtime-cli", ] [[package]] name = "polkadot-collator-protocol" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitvec", "fatality", @@ -10171,19 +10364,19 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "scale-info", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "polkadot-dispute-distribution" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "derive_more", "fatality", @@ -10208,7 +10401,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -10222,7 +10415,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "futures-timer", @@ -10230,7 +10423,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", "sc-network-common", @@ -10244,7 +10437,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "always-assert", "async-trait", @@ -10267,7 +10460,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "parity-scale-codec", @@ -10285,7 +10478,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitvec", "derive_more", @@ -10301,7 +10494,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", "sc-keystore", @@ -10318,7 +10511,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitvec", "futures 0.3.30", @@ -10340,7 +10533,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitvec", "fatality", @@ -10360,7 +10553,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "polkadot-node-subsystem", @@ -10375,7 +10568,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "futures 0.3.30", @@ -10396,7 +10589,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "polkadot-node-metrics", @@ -10410,7 +10603,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "futures-timer", @@ -10427,7 +10620,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "fatality", "futures 0.3.30", @@ -10446,7 +10639,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "futures 0.3.30", @@ -10463,7 +10656,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-prospective-parachains" version = "6.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitvec", "fatality", @@ -10480,7 +10673,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitvec", "fatality", @@ -10498,7 +10691,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "always-assert", "array-bytes 6.2.3", @@ -10506,8 +10699,6 @@ dependencies = [ "cfg-if", "futures 0.3.30", "futures-timer", - "is_executable", - "libc", "parity-scale-codec", "pin-project", "polkadot-core-primitives", @@ -10517,11 +10708,9 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-parachain-primitives", "polkadot-primitives", - "rand", + "rand 0.8.5", "slotmap", "sp-core", - "sp-maybe-compressed-blob", - "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", "tempfile", "thiserror", "tokio", @@ -10531,7 +10720,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "polkadot-node-primitives", @@ -10547,9 +10736,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-common" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ - "cfg-if", "cpu-time", "futures 0.3.30", "landlock", @@ -10564,9 +10752,9 @@ dependencies = [ "seccompiler", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-io", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "thiserror", "tracing-gum", ] @@ -10574,7 +10762,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "polkadot-node-metrics", @@ -10589,7 +10777,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "lazy_static", "log", @@ -10599,6 +10787,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "sc-network", + "sc-network-types", "sp-core", "thiserror", "tokio", @@ -10607,7 +10796,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bs58 0.5.1", "futures 0.3.30", @@ -10626,7 +10815,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-channel 1.9.0", "async-trait", @@ -10639,10 +10828,12 @@ dependencies = [ "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", - "rand", + "rand 0.8.5", "sc-authority-discovery", "sc-network", - "strum 0.24.1", + "sc-network-types", + "sp-runtime", + "strum 0.26.2", "thiserror", "tracing-gum", ] @@ -10650,7 +10841,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitvec", "bounded-vec", @@ -10673,7 +10864,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -10683,7 +10874,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "bitvec", @@ -10697,6 +10888,7 @@ dependencies = [ "polkadot-statement-table", "sc-client-api", "sc-network", + "sc-network-types", "sc-transaction-pool-api", "smallvec", "sp-api", @@ -10711,7 +10903,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "derive_more", @@ -10733,7 +10925,7 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "prioritized-metered-channel", - "rand", + "rand 0.8.5", "sc-client-api", "schnellru", "sp-application-crypto", @@ -10746,7 +10938,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "futures 0.3.30", @@ -10768,7 +10960,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-primitives" version = "6.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bounded-collections", "derive_more", @@ -10778,14 +10970,14 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-weights", ] [[package]] name = "polkadot-primitives" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitvec", "hex-literal", @@ -10806,13 +10998,13 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "polkadot-rpc" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -10845,7 +11037,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitvec", "frame-benchmarking", @@ -10886,7 +11078,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -10896,20 +11088,20 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bs58 0.5.1", "frame-benchmarking", "parity-scale-codec", "polkadot-primitives", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "polkadot-runtime-parachains" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bitflags 1.3.2", "bitvec", @@ -10934,7 +11126,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-metrics", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", "scale-info", @@ -10949,7 +11141,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-executor", "static_assertions", @@ -10958,7 +11150,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "frame-benchmarking", @@ -10974,7 +11166,6 @@ dependencies = [ "log", "mmr-gadget", "pallet-babe", - "pallet-im-online", "pallet-staking", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -11061,21 +11252,23 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-timestamp", "sp-transaction-pool", "sp-version", "sp-weights", + "staging-xcm", "substrate-prometheus-endpoint", "thiserror", "tracing-gum", "westend-runtime", + "xcm-fee-payment-runtime-api", ] [[package]] name = "polkadot-statement-distribution" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -11098,7 +11291,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -11115,7 +11308,7 @@ dependencies = [ "libc", "log", "polkavm-assembler", - "polkavm-common 0.9.0", + "polkavm-common", "polkavm-linux-raw", ] @@ -11128,12 +11321,6 @@ dependencies = [ "log", ] -[[package]] -name = "polkavm-common" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b4e215c80fe876147f3d58158d5dfeae7dabdd6047e175af77095b78d0035c" - [[package]] name = "polkavm-common" version = "0.9.0" @@ -11143,16 +11330,6 @@ dependencies = [ "log", ] -[[package]] -name = "polkavm-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6380dbe1fb03ecc74ad55d841cfc75480222d153ba69ddcb00977866cbdabdb8" -dependencies = [ - "polkavm-derive-impl 0.5.0", - "syn 2.0.66", -] - [[package]] name = "polkavm-derive" version = "0.9.1" @@ -11162,25 +11339,13 @@ dependencies = [ "polkavm-derive-impl-macro", ] -[[package]] -name = "polkavm-derive-impl" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8211b3365bbafb2fb32057d68b0e1ca55d079f5cf6f9da9b98079b94b3987d" -dependencies = [ - "polkavm-common 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "polkavm-derive-impl" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c" dependencies = [ - "polkavm-common 0.9.0", + "polkavm-common", "proc-macro2", "quote", "syn 2.0.66", @@ -11192,7 +11357,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" dependencies = [ - "polkavm-derive-impl 0.9.0", + "polkavm-derive-impl", "syn 2.0.66", ] @@ -11206,7 +11371,7 @@ dependencies = [ "hashbrown 0.14.5", "log", "object 0.32.2", - "polkavm-common 0.9.0", + "polkavm-common", "regalloc2 0.9.3", "rustc-demangle", ] @@ -11313,7 +11478,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", ] @@ -11330,7 +11495,7 @@ dependencies = [ "proc-macro2", "quote", "sp-core-hashing", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "syn 1.0.109", "trybuild", ] @@ -11349,6 +11514,16 @@ dependencies = [ "regex", ] +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "predicates-core", +] + [[package]] name = "predicates-core" version = "1.0.6" @@ -11534,7 +11709,7 @@ dependencies = [ "bitflags 2.5.0", "lazy_static", "num-traits", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", "regex-syntax 0.8.3", @@ -11681,6 +11856,24 @@ dependencies = [ "pin-project-lite 0.1.12", ] +[[package]] +name = "quinn" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" +dependencies = [ + "bytes", + "pin-project-lite 0.2.14", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls 0.20.9", + "thiserror", + "tokio", + "tracing", + "webpki", +] + [[package]] name = "quinn-proto" version = "0.9.6" @@ -11688,7 +11881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", - "rand", + "rand 0.8.5", "ring 0.16.20", "rustc-hash", "rustls 0.20.9", @@ -11699,6 +11892,19 @@ dependencies = [ "webpki", ] +[[package]] +name = "quinn-udp" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" +dependencies = [ + "libc", + "quinn-proto", + "socket2 0.4.10", + "tracing", + "windows-sys 0.42.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -11714,6 +11920,19 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + [[package]] name = "rand" version = "0.8.5" @@ -11770,7 +11989,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", ] [[package]] @@ -12036,13 +12264,14 @@ dependencies = [ [[package]] name = "ring" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" +source = "git+https://github.com/w3f/ring-proof#665f5f51af5734c7b6d90b985dd6861d4c5b4752" dependencies = [ "ark-ec", "ark-ff", "ark-poly", "ark-serialize", "ark-std", + "arrayvec 0.7.4", "blake2 0.10.6", "common", "fflonk", @@ -12123,9 +12352,10 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "binary-merkle-tree", + "bitvec", "frame-benchmarking", "frame-executive", "frame-metadata-hash-extension", @@ -12151,7 +12381,6 @@ dependencies = [ "pallet-elections-phragmen", "pallet-grandpa", "pallet-identity", - "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-message-queue", @@ -12159,6 +12388,7 @@ dependencies = [ "pallet-multisig", "pallet-nis", "pallet-offences", + "pallet-parameters", "pallet-preimage", "pallet-proxy", "pallet-ranked-collective", @@ -12190,6 +12420,7 @@ dependencies = [ "scale-info", "serde", "serde_derive", + "serde_json", "smallvec", "sp-api", "sp-arithmetic", @@ -12197,6 +12428,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-babe", "sp-consensus-beefy", + "sp-consensus-grandpa", "sp-core", "sp-genesis-builder", "sp-inherents", @@ -12206,8 +12438,8 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-transaction-pool", "sp-version", "staging-xcm", @@ -12215,12 +12447,13 @@ dependencies = [ "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", + "xcm-fee-payment-runtime-api", ] [[package]] name = "rococo-runtime-constants" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "polkadot-primitives", @@ -12543,33 +12776,35 @@ dependencies = [ [[package]] name = "sc-allocator" version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "log", "sp-core", - "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "thiserror", ] [[package]] name = "sc-authority-discovery" version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "futures 0.3.30", "futures-timer", "ip_network", "libp2p", + "linked_hash_set", "log", - "multihash 0.18.1", + "multihash 0.17.0", "multihash-codetable", "parity-scale-codec", "prost 0.12.6", "prost-build", - "rand", + "rand 0.8.5", "sc-client-api", "sc-network", + "sc-network-types", "sp-api", "sp-authority-discovery", "sp-blockchain", @@ -12583,7 +12818,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "futures-timer", @@ -12605,7 +12840,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "sp-api", @@ -12619,8 +12854,8 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "docify", @@ -12641,12 +12876,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "sc-chain-spec-derive" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -12657,7 +12893,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.36.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "chrono", @@ -12670,7 +12906,7 @@ dependencies = [ "names", "parity-bip39", "parity-scale-codec", - "rand", + "rand 0.8.5", "regex", "rpassword", "sc-client-api", @@ -12698,7 +12934,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "fnv", "futures 0.3.30", @@ -12713,11 +12949,11 @@ dependencies = [ "sp-consensus", "sp-core", "sp-database", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-runtime", "sp-state-machine", "sp-statement-store", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", "substrate-prometheus-endpoint", ] @@ -12725,7 +12961,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.35.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "hash-db", "kvdb", @@ -12751,16 +12987,16 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "futures 0.3.30", "futures-timer", - "libp2p-identity", "log", - "mockall", + "mockall 0.11.4", "parking_lot 0.12.3", "sc-client-api", + "sc-network-types", "sc-utils", "serde", "sp-api", @@ -12776,7 +13012,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "futures 0.3.30", @@ -12805,7 +13041,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "fork-tree", @@ -12841,7 +13077,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "jsonrpsee", @@ -12863,7 +13099,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "async-channel 1.9.0", @@ -12878,6 +13114,7 @@ dependencies = [ "sc-network", "sc-network-gossip", "sc-network-sync", + "sc-network-types", "sc-utils", "sp-api", "sp-application-crypto", @@ -12899,7 +13136,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "jsonrpsee", @@ -12918,7 +13155,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "fork-tree", "parity-scale-codec", @@ -12931,7 +13168,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.19.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "ahash 0.8.11", "array-bytes 6.2.3", @@ -12944,7 +13181,7 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -12953,6 +13190,7 @@ dependencies = [ "sc-network-common", "sc-network-gossip", "sc-network-sync", + "sc-network-types", "sc-telemetry", "sc-transaction-pool-api", "sc-utils", @@ -12974,7 +13212,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.19.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "finality-grandpa", "futures 0.3.30", @@ -12994,7 +13232,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.35.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "assert_matches", "async-trait", @@ -13029,7 +13267,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "futures 0.3.30", @@ -13052,7 +13290,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.32.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", @@ -13062,25 +13300,25 @@ dependencies = [ "schnellru", "sp-api", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-io", "sp-panic-handler", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", "sp-version", - "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "tracing", ] [[package]] name = "sc-executor-common" version = "0.29.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "polkavm", "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "thiserror", "wasm-instrument", ] @@ -13088,18 +13326,18 @@ dependencies = [ [[package]] name = "sc-executor-polkavm" version = "0.29.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "log", "polkavm", "sc-executor-common", - "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "sc-executor-wasmtime" version = "0.29.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "anyhow", "cfg-if", @@ -13109,15 +13347,15 @@ dependencies = [ "rustix 0.36.17", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "wasmtime", ] [[package]] name = "sc-informant" version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "ansi_term", "futures 0.3.30", @@ -13134,7 +13372,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "25.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "parking_lot 0.12.3", @@ -13148,7 +13386,7 @@ dependencies = [ [[package]] name = "sc-mixnet" version = "0.4.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 4.2.0", "arrayvec 0.7.4", @@ -13156,7 +13394,6 @@ dependencies = [ "bytes", "futures 0.3.30", "futures-timer", - "libp2p-identity", "log", "mixnet", "multiaddr", @@ -13164,6 +13401,7 @@ dependencies = [ "parking_lot 0.12.3", "sc-client-api", "sc-network", + "sc-network-types", "sc-transaction-pool-api", "sp-api", "sp-consensus", @@ -13177,13 +13415,14 @@ dependencies = [ [[package]] name = "sc-network" version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "async-channel 1.9.0", "async-trait", "asynchronous-codec", "bytes", + "cid 0.9.0", "either", "fnv", "futures 0.3.30", @@ -13191,16 +13430,22 @@ dependencies = [ "ip_network", "libp2p", "linked_hash_set", + "litep2p", "log", - "mockall", + "mockall 0.11.4", + "once_cell", "parity-scale-codec", "parking_lot 0.12.3", "partial_sort", "pin-project", - "rand", + "prost 0.11.9", + "prost-build", + "rand 0.8.5", "sc-client-api", "sc-network-common", + "sc-network-types", "sc-utils", + "schnellru", "serde", "serde_json", "smallvec", @@ -13213,34 +13458,15 @@ dependencies = [ "tokio", "tokio-stream", "unsigned-varint", + "void", "wasm-timer", "zeroize", ] -[[package]] -name = "sc-network-bitswap" -version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" -dependencies = [ - "async-channel 1.9.0", - "cid", - "futures 0.3.30", - "libp2p-identity", - "log", - "prost 0.12.6", - "prost-build", - "sc-client-api", - "sc-network", - "sp-blockchain", - "sp-runtime", - "thiserror", - "unsigned-varint", -] - [[package]] name = "sc-network-common" version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -13249,6 +13475,7 @@ dependencies = [ "parity-scale-codec", "prost-build", "sc-consensus", + "sc-network-types", "sp-consensus", "sp-consensus-grandpa", "sp-runtime", @@ -13257,7 +13484,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "ahash 0.8.11", "futures 0.3.30", @@ -13267,6 +13494,7 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-sync", + "sc-network-types", "schnellru", "sp-runtime", "substrate-prometheus-endpoint", @@ -13276,18 +13504,18 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "async-channel 1.9.0", "futures 0.3.30", - "libp2p-identity", "log", "parity-scale-codec", "prost 0.12.6", "prost-build", "sc-client-api", "sc-network", + "sc-network-types", "sp-blockchain", "sp-core", "sp-runtime", @@ -13297,7 +13525,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "async-channel 1.9.0", @@ -13307,7 +13535,7 @@ dependencies = [ "futures-timer", "libp2p", "log", - "mockall", + "mockall 0.11.4", "parity-scale-codec", "prost 0.12.6", "prost-build", @@ -13315,6 +13543,7 @@ dependencies = [ "sc-consensus", "sc-network", "sc-network-common", + "sc-network-types", "sc-utils", "schnellru", "smallvec", @@ -13333,7 +13562,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "futures 0.3.30", @@ -13343,16 +13572,31 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-sync", + "sc-network-types", "sc-utils", "sp-consensus", "sp-runtime", "substrate-prometheus-endpoint", ] +[[package]] +name = "sc-network-types" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" +dependencies = [ + "bs58 0.4.0", + "libp2p-identity", + "litep2p", + "multiaddr", + "multihash 0.17.0", + "rand 0.8.5", + "thiserror", +] + [[package]] name = "sc-offchain" version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "bytes", @@ -13367,15 +13611,16 @@ dependencies = [ "once_cell", "parity-scale-codec", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", "sc-client-api", "sc-network", "sc-network-common", + "sc-network-types", "sc-transaction-pool-api", "sc-utils", "sp-api", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-keystore", "sp-offchain", "sp-runtime", @@ -13386,7 +13631,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.17.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -13395,7 +13640,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "jsonrpsee", @@ -13427,7 +13672,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -13447,7 +13692,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "governor", @@ -13465,7 +13710,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "futures 0.3.30", @@ -13475,12 +13720,13 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", "sc-chain-spec", "sc-client-api", "sc-rpc", "sc-transaction-pool-api", "sc-utils", + "schnellru", "serde", "sp-api", "sp-blockchain", @@ -13496,7 +13742,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.35.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "directories", @@ -13508,7 +13754,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "pin-project", - "rand", + "rand 0.8.5", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -13517,11 +13763,11 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", - "sc-network-bitswap", "sc-network-common", "sc-network-light", "sc-network-sync", "sc-network-transactions", + "sc-network-types", "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", @@ -13538,12 +13784,12 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", @@ -13560,7 +13806,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.30.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "log", "parity-scale-codec", @@ -13571,7 +13817,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.16.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "clap", "fs4", @@ -13584,7 +13830,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -13603,13 +13849,13 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "derive_more", "futures 0.3.30", "libc", "log", - "rand", + "rand 0.8.5", "rand_pcg", "regex", "sc-telemetry", @@ -13618,13 +13864,13 @@ dependencies = [ "sp-core", "sp-crypto-hashing", "sp-io", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "sc-telemetry" version = "15.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "chrono", "futures 0.3.30", @@ -13632,7 +13878,8 @@ dependencies = [ "log", "parking_lot 0.12.3", "pin-project", - "rand", + "rand 0.8.5", + "sc-network", "sc-utils", "serde", "serde_json", @@ -13643,7 +13890,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "ansi_term", "chrono", @@ -13663,17 +13910,17 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "thiserror", "tracing", "tracing-log 0.1.4", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] name = "sc-tracing-proc-macro" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -13684,7 +13931,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "futures 0.3.30", @@ -13702,7 +13949,7 @@ dependencies = [ "sp-core", "sp-crypto-hashing", "sp-runtime", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -13711,7 +13958,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "futures 0.3.30", @@ -13727,7 +13974,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-channel 1.9.0", "futures 0.3.30", @@ -13883,6 +14130,21 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "sctp-proto" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6220f78bb44c15f326b0596113305f6101097a18755d53727a575c97e09fb24" +dependencies = [ + "bytes", + "crc", + "fxhash", + "log", + "rand 0.8.5", + "slab", + "thiserror", +] + [[package]] name = "sec1" version = "0.7.3" @@ -14004,9 +14266,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -14022,9 +14284,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -14086,6 +14348,18 @@ dependencies = [ "opaque-debug 0.3.1", ] +[[package]] +name = "sha-1" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", + "sha1-asm", +] + [[package]] name = "sha1" version = "0.10.6" @@ -14097,6 +14371,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha1-asm" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "286acebaf8b67c1130aedffad26f594eff0c1292389158135327d2e23aed582b" +dependencies = [ + "cc", +] + [[package]] name = "sha2" version = "0.9.9" @@ -14247,9 +14530,9 @@ dependencies = [ "sp-io", "sp-offchain", "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-session", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -14257,6 +14540,7 @@ dependencies = [ "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -14356,9 +14640,9 @@ dependencies = [ "sp-io", "sp-offchain", "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-session", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -14366,6 +14650,7 @@ dependencies = [ "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -14383,6 +14668,12 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + [[package]] name = "signature" version = "2.2.0" @@ -14426,6 +14717,15 @@ dependencies = [ "similar", ] +[[package]] +name = "simple-dns" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cae9a3fcdadafb6d97f4c0e007e4247b114ee0f119f650c3cbf3a8b3a1479694" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "simple-mermaid" version = "0.1.1" @@ -14480,13 +14780,13 @@ dependencies = [ [[package]] name = "slot-range-helper" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "enumn", "parity-scale-codec", "paste", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -14557,7 +14857,7 @@ dependencies = [ "pbkdf2 0.12.2", "pin-project", "poly1305", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "ruzstd", "schnorrkel 0.10.2", @@ -14600,7 +14900,7 @@ dependencies = [ "no-std-net", "parking_lot 0.12.3", "pin-project", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "serde", "serde_json", @@ -14667,14 +14967,14 @@ dependencies = [ "http", "httparse", "log", - "rand", - "sha-1", + "rand 0.8.5", + "sha-1 0.9.8", ] [[package]] name = "sp-api" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "hash-db", "log", @@ -14682,12 +14982,12 @@ dependencies = [ "scale-info", "sp-api-proc-macro", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-metadata-ir", "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", "sp-version", "thiserror", @@ -14696,7 +14996,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "15.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "Inflector", "blake2 0.10.6", @@ -14710,27 +15010,28 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "30.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "scale-info", "serde", "sp-core", "sp-io", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "sp-arithmetic" version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ + "docify", "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "static_assertions", ] @@ -14755,31 +15056,29 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "sp-block-builder" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "sp-api", "sp-inherents", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "sp-blockchain" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "futures 0.3.30", "log", @@ -14797,7 +15096,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.32.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "futures 0.3.30", @@ -14812,7 +15111,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.32.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "parity-scale-codec", @@ -14822,14 +15121,13 @@ dependencies = [ "sp-consensus-slots", "sp-inherents", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", "sp-timestamp", ] [[package]] name = "sp-consensus-babe" version = "0.32.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "parity-scale-codec", @@ -14841,14 +15139,13 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", "sp-timestamp", ] [[package]] name = "sp-consensus-beefy" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "lazy_static", "parity-scale-codec", @@ -14862,14 +15159,13 @@ dependencies = [ "sp-keystore", "sp-mmr-primitives", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "strum 0.24.1", + "strum 0.26.2", ] [[package]] name = "sp-consensus-grandpa" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "finality-grandpa", "log", @@ -14881,25 +15177,23 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "sp-consensus-slots" version = "0.32.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", "sp-timestamp", ] [[package]] name = "sp-core" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "bandersnatch_vrfs", @@ -14923,18 +15217,18 @@ dependencies = [ "parking_lot 0.12.3", "paste", "primitive-types", - "rand", + "rand 0.8.5", "scale-info", "schnorrkel 0.11.4", "secp256k1", "secrecy", "serde", "sp-crypto-hashing", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "ss58-registry", "substrate-bip39", "thiserror", @@ -14946,7 +15240,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "15.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "sp-crypto-hashing", ] @@ -14954,7 +15248,7 @@ dependencies = [ [[package]] name = "sp-crypto-ec-utils" version = "0.10.0" -source = "git+https://github.com/paritytech/polkadot-sdk#5fb4c40a3ea24ae3ab2bdfefb3f3a40badc2a583" +source = "git+https://github.com/paritytech/polkadot-sdk#776e95748901b50ff2833a7d27ea83fd91fbf9d1" dependencies = [ "ark-bls12-377", "ark-bls12-377-ext", @@ -14973,8 +15267,8 @@ dependencies = [ [[package]] name = "sp-crypto-hashing" -version = "0.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "blake2b_simd", "byteorder", @@ -14986,8 +15280,8 @@ dependencies = [ [[package]] name = "sp-crypto-hashing-proc-macro" -version = "0.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "quote", "sp-crypto-hashing", @@ -14997,7 +15291,7 @@ dependencies = [ [[package]] name = "sp-database" version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "kvdb", "parking_lot 0.12.3", @@ -15006,7 +15300,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "proc-macro2", "quote", @@ -15016,7 +15310,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#5fb4c40a3ea24ae3ab2bdfefb3f3a40badc2a583" +source = "git+https://github.com/paritytech/polkadot-sdk#776e95748901b50ff2833a7d27ea83fd91fbf9d1" dependencies = [ "proc-macro2", "quote", @@ -15026,18 +15320,17 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.25.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "sp-externalities" version = "0.25.0" -source = "git+https://github.com/paritytech/polkadot-sdk#5fb4c40a3ea24ae3ab2bdfefb3f3a40badc2a583" +source = "git+https://github.com/paritytech/polkadot-sdk#776e95748901b50ff2833a7d27ea83fd91fbf9d1" dependencies = [ "environmental", "parity-scale-codec", @@ -15046,50 +15339,50 @@ dependencies = [ [[package]] name = "sp-genesis-builder" -version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +version = "0.8.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ + "parity-scale-codec", + "scale-info", "serde_json", "sp-api", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "sp-inherents" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", "thiserror", ] [[package]] name = "sp-io" version = "30.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bytes", - "ed25519-dalek", + "ed25519-dalek 2.1.1", "libsecp256k1", "log", "parity-scale-codec", - "polkavm-derive 0.9.1", + "polkavm-derive", "rustversion", "secp256k1", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-keystore", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-trie", "tracing", "tracing-core", @@ -15098,28 +15391,28 @@ dependencies = [ [[package]] name = "sp-keyring" version = "31.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "sp-core", "sp-runtime", - "strum 0.24.1", + "strum 0.26.2", ] [[package]] name = "sp-keystore" version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "sp-maybe-compressed-blob" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "thiserror", "zstd 0.12.4", @@ -15128,30 +15421,28 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "sp-mixnet" version = "0.4.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "sp-mmr-primitives" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -15160,16 +15451,15 @@ dependencies = [ "serde", "sp-api", "sp-core", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", "thiserror", ] [[package]] name = "sp-npos-elections" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "scale-info", @@ -15177,13 +15467,12 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "sp-offchain" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "sp-api", "sp-core", @@ -15193,7 +15482,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "backtrace", "lazy_static", @@ -15203,7 +15492,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "rustc-hash", "serde", @@ -15213,7 +15502,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "31.0.1" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "docify", "either", @@ -15222,7 +15511,7 @@ dependencies = [ "log", "parity-scale-codec", "paste", - "rand", + "rand 0.8.5", "scale-info", "serde", "simple-mermaid", @@ -15230,38 +15519,38 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-io", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-weights", ] [[package]] name = "sp-runtime-interface" version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "polkavm-derive 0.9.1", + "polkavm-derive", "primitive-types", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "static_assertions", ] [[package]] name = "sp-runtime-interface" version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#5fb4c40a3ea24ae3ab2bdfefb3f3a40badc2a583" +source = "git+https://github.com/paritytech/polkadot-sdk#776e95748901b50ff2833a7d27ea83fd91fbf9d1" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "polkavm-derive 0.9.1", + "polkavm-derive", "primitive-types", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk)", "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk)", @@ -15275,7 +15564,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "Inflector", "expander 2.1.0", @@ -15288,7 +15577,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#5fb4c40a3ea24ae3ab2bdfefb3f3a40badc2a583" +source = "git+https://github.com/paritytech/polkadot-sdk#776e95748901b50ff2833a7d27ea83fd91fbf9d1" dependencies = [ "Inflector", "expander 2.1.0", @@ -15301,7 +15590,7 @@ dependencies = [ [[package]] name = "sp-session" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "scale-info", @@ -15310,13 +15599,12 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "sp-staking" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -15324,24 +15612,22 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] [[package]] name = "sp-state-machine" version = "0.35.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "hash-db", "log", "parity-scale-codec", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", "smallvec", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-panic-handler", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", "sp-trie", "thiserror", "tracing", @@ -15351,24 +15637,23 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "aes-gcm", "curve25519-dalek 4.1.2", - "ed25519-dalek", + "ed25519-dalek 2.1.1", "hkdf", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "sha2 0.10.8", "sp-api", "sp-application-crypto", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "thiserror", "x25519-dalek 2.0.1", ] @@ -15376,30 +15661,29 @@ dependencies = [ [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#5fb4c40a3ea24ae3ab2bdfefb3f3a40badc2a583" +source = "git+https://github.com/paritytech/polkadot-sdk#776e95748901b50ff2833a7d27ea83fd91fbf9d1" [[package]] name = "sp-storage" version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "sp-storage" version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#5fb4c40a3ea24ae3ab2bdfefb3f3a40badc2a583" +source = "git+https://github.com/paritytech/polkadot-sdk#776e95748901b50ff2833a7d27ea83fd91fbf9d1" dependencies = [ "impl-serde", "parity-scale-codec", @@ -15411,43 +15695,41 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", "thiserror", ] [[package]] name = "sp-tracing" version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", "tracing", "tracing-core", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] name = "sp-tracing" version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#5fb4c40a3ea24ae3ab2bdfefb3f3a40badc2a583" +source = "git+https://github.com/paritytech/polkadot-sdk#776e95748901b50ff2833a7d27ea83fd91fbf9d1" dependencies = [ "parity-scale-codec", "tracing", "tracing-core", - "tracing-subscriber 0.3.18", + "tracing-subscriber", ] [[package]] name = "sp-transaction-pool" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "sp-api", "sp-runtime", @@ -15456,7 +15738,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "async-trait", "parity-scale-codec", @@ -15464,14 +15746,13 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", "sp-trie", ] [[package]] name = "sp-trie" version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "ahash 0.8.11", "hash-db", @@ -15480,12 +15761,11 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", "scale-info", "schnellru", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "thiserror", "tracing", "trie-db", @@ -15495,7 +15775,7 @@ dependencies = [ [[package]] name = "sp-version" version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "impl-serde", "parity-scale-codec", @@ -15504,7 +15784,7 @@ dependencies = [ "serde", "sp-crypto-hashing-proc-macro", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-version-proc-macro", "thiserror", ] @@ -15512,7 +15792,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -15523,20 +15803,19 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", "wasmtime", ] [[package]] name = "sp-wasm-interface" version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#5fb4c40a3ea24ae3ab2bdfefb3f3a40badc2a583" +source = "git+https://github.com/paritytech/polkadot-sdk#776e95748901b50ff2833a7d27ea83fd91fbf9d1" dependencies = [ "impl-trait-for-tuples", "log", @@ -15546,7 +15825,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -15554,8 +15833,7 @@ dependencies = [ "serde", "smallvec", "sp-arithmetic", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] @@ -15570,17 +15848,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[package]] -name = "spinners" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0ef947f358b9c238923f764c72a4a9d42f2d637c46e059dbd319d6e7cfb4f82" -dependencies = [ - "lazy_static", - "maplit", - "strum 0.24.1", -] - [[package]] name = "spinning_top" version = "0.3.0" @@ -15624,7 +15891,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staging-parachain-info" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -15632,13 +15899,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] [[package]] name = "staging-xcm" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "bounded-collections", @@ -15656,7 +15923,7 @@ dependencies = [ [[package]] name = "staging-xcm-builder" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "frame-system", @@ -15669,7 +15936,7 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-weights", "staging-xcm", "staging-xcm-executor", @@ -15678,7 +15945,7 @@ dependencies = [ [[package]] name = "staging-xcm-executor" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "environmental", "frame-benchmarking", @@ -15691,7 +15958,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-weights", "staging-xcm", ] @@ -15730,6 +15997,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "str0m" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6706347e49b13373f7ddfafad47df7583ed52083d6fc8a594eb2c80497ef959d" +dependencies = [ + "combine", + "crc", + "fastrand 2.1.0", + "hmac 0.12.1", + "once_cell", + "openssl", + "openssl-sys", + "sctp-proto", + "serde", + "sha-1 0.10.1", + "thiserror", + "tracing", +] + [[package]] name = "strobe-rs" version = "0.8.1" @@ -15754,9 +16041,6 @@ name = "strum" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros 0.24.3", -] [[package]] name = "strum" @@ -15796,7 +16080,7 @@ dependencies = [ [[package]] name = "substrate-bip39" version = "0.4.7" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "hmac 0.12.1", "pbkdf2 0.12.2", @@ -15814,19 +16098,19 @@ dependencies = [ "byteorder", "crunchy", "lazy_static", - "rand", + "rand 0.8.5", "rustc-hex", ] [[package]] name = "substrate-build-script-utils" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" [[package]] name = "substrate-frame-rpc-system" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.30", @@ -15845,7 +16129,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.17.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "hyper", "log", @@ -15854,23 +16138,10 @@ dependencies = [ "tokio", ] -[[package]] -name = "substrate-rpc-client" -version = "0.33.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" -dependencies = [ - "async-trait", - "jsonrpsee", - "log", - "sc-rpc-api", - "serde", - "sp-runtime", -] - [[package]] name = "substrate-state-trie-migration-rpc" version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -15887,7 +16158,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "array-bytes 6.2.3", "build-helper", @@ -15903,9 +16174,9 @@ dependencies = [ "sp-core", "sp-io", "sp-maybe-compressed-blob", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-version", - "strum 0.24.1", + "strum 0.26.2", "tempfile", "toml 0.8.14", "walkdir", @@ -16224,17 +16495,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "tokio-retry" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" -dependencies = [ - "pin-project", - "rand", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -16268,6 +16528,21 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "tokio-tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +dependencies = [ + "futures-util", + "log", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", + "tungstenite", +] + [[package]] name = "tokio-util" version = "0.7.11" @@ -16438,7 +16713,7 @@ dependencies = [ [[package]] name = "tracing-gum" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "coarsetime", "polkadot-primitives", @@ -16449,7 +16724,7 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "expander 2.1.0", "proc-macro-crate 3.1.0", @@ -16480,52 +16755,21 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "ansi_term", - "chrono", - "lazy_static", - "matchers 0.0.1", - "parking_lot 0.11.2", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log 0.1.4", - "tracing-serde", -] - [[package]] name = "tracing-subscriber" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers 0.1.0", + "matchers", "nu-ansi-term", "once_cell", + "parking_lot 0.12.3", "regex", "sharded-slab", "smallvec", "thread_local", + "time", "tracing", "tracing-core", "tracing-log 0.2.0", @@ -16533,12 +16777,11 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.28.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" +checksum = "0c992b4f40c234a074d48a757efeabb1a6be88af84c0c23f7ca158950cb0ae7f" dependencies = [ "hash-db", - "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", @@ -16562,14 +16805,14 @@ dependencies = [ "async-trait", "cfg-if", "data-encoding", - "enum-as-inner", + "enum-as-inner 0.5.1", "futures-channel", "futures-io", "futures-util", "idna 0.2.3", "ipnet", "lazy_static", - "rand", + "rand 0.8.5", "smallvec", "socket2 0.4.10", "thiserror", @@ -16579,6 +16822,31 @@ dependencies = [ "url", ] +[[package]] +name = "trust-dns-proto" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner 0.6.0", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + [[package]] name = "trust-dns-resolver" version = "0.22.0" @@ -16596,7 +16864,28 @@ dependencies = [ "thiserror", "tokio", "tracing", - "trust-dns-proto", + "trust-dns-proto 0.22.0", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot 0.12.3", + "rand 0.8.5", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto 0.23.2", ] [[package]] @@ -16605,42 +16894,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "try-runtime-cli" -version = "0.38.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" -dependencies = [ - "async-trait", - "clap", - "frame-remote-externalities", - "frame-try-runtime", - "hex", - "log", - "parity-scale-codec", - "sc-cli", - "sc-executor", - "serde", - "serde_json", - "sp-api", - "sp-consensus-aura", - "sp-consensus-babe", - "sp-core", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-rpc", - "sp-runtime", - "sp-state-machine", - "sp-timestamp", - "sp-transaction-storage-proof", - "sp-version", - "sp-weights", - "substrate-rpc-client", - "zstd 0.12.4", -] - [[package]] name = "trybuild" version = "1.0.96" @@ -16661,6 +16914,26 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand 0.8.5", + "rustls 0.21.12", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "twox-hash" version = "1.6.3" @@ -16669,7 +16942,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand", + "rand 0.8.5", "static_assertions", ] @@ -16773,6 +17046,7 @@ dependencies = [ "bytes", "futures-io", "futures-util", + "tokio-util", ] [[package]] @@ -16798,6 +17072,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf8parse" version = "0.2.1" @@ -16853,7 +17133,7 @@ dependencies = [ "arrayref", "constcat", "digest 0.10.7", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", "sha2 0.10.8", @@ -17263,7 +17543,7 @@ dependencies = [ "memfd", "memoffset", "paste", - "rand", + "rand 0.8.5", "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", @@ -17315,7 +17595,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "binary-merkle-tree", "bitvec", @@ -17347,7 +17627,6 @@ dependencies = [ "pallet-fast-unstake", "pallet-grandpa", "pallet-identity", - "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-message-queue", @@ -17408,8 +17687,8 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "sp-transaction-pool", "sp-version", "staging-xcm", @@ -17417,12 +17696,13 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] name = "westend-runtime-constants" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "polkadot-primitives", @@ -17522,6 +17802,21 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -17824,10 +18119,42 @@ dependencies = [ "time", ] +[[package]] +name = "x509-parser" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +dependencies = [ + "asn1-rs", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "xcm-fee-payment-runtime-api" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" +dependencies = [ + "frame-support", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-runtime", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-weights", + "staging-xcm", +] + [[package]] name = "xcm-procedural" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "Inflector", "proc-macro2", @@ -17838,7 +18165,7 @@ dependencies = [ [[package]] name = "xcm-simulator" version = "7.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#feeec7b9030027847ff21da18bf0bb9df6b15dd9" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" dependencies = [ "frame-support", "parity-scale-codec", @@ -17847,7 +18174,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-runtime-parachains", "sp-io", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -17888,8 +18215,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -17924,7 +18251,7 @@ dependencies = [ "log", "nohash-hasher", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index 396a02fcb..ff5958fb2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ repository = "https://github.com/AstarNetwork/Astar" [patch."https://github.com/paritytech/polkadot-sdk"] # Remove this after uplifting to polkadot-sdk version `v1.12.0` or higher. -pallet-balances = { git = "https://github.com/AstarNetwork/polkadot-sdk", branch = "astar-release-polkadot-v1.9.0" } +pallet-balances = { git = "https://github.com/AstarNetwork/polkadot-sdk", branch = "astar-release-polkadot-v1.11.0" } [workspace.dependencies] # General deps @@ -92,96 +92,95 @@ ethers = { version = "2.0.9", default_features = false } # Substrate # (wasm) -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-core-hashing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-core-hashing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } # (native) -sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -try-runtime-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } # Substrate pallets # (wasm) -pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-contracts-uapi = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false, features = ["historical"] } -pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-contracts-uapi = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false, features = ["historical"] } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } # EVM & Ethereum # (wasm) @@ -194,90 +193,91 @@ ethereum = { version = "0.15.0", default-features = false } # Frontier # (wasm) -fp-rpc = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } -fp-self-contained = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false, features = ["serde"] } -pallet-ethereum = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false, features = ["forbid-evm-reentrancy"] } -pallet-evm = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false, features = ["forbid-evm-reentrancy"] } -pallet-evm-precompile-blake2 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } -pallet-evm-precompile-bn128 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } -pallet-evm-precompile-dispatch = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } -pallet-evm-precompile-ed25519 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } -pallet-evm-precompile-modexp = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } -pallet-evm-precompile-sha3fips = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } -pallet-evm-precompile-simple = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } -pallet-base-fee = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } -pallet-evm-chain-id = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } -fp-evm = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } -fp-ethereum = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", default-features = false } +fp-rpc = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } +fp-self-contained = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false, features = ["serde"] } +pallet-ethereum = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false, features = ["forbid-evm-reentrancy"] } +pallet-evm = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false, features = ["forbid-evm-reentrancy"] } +pallet-evm-precompile-blake2 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } +pallet-evm-precompile-bn128 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } +pallet-evm-precompile-dispatch = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } +pallet-evm-precompile-ed25519 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } +pallet-evm-precompile-modexp = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } +pallet-evm-precompile-sha3fips = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } +pallet-evm-precompile-simple = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } +pallet-base-fee = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } +pallet-evm-chain-id = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } +fp-evm = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } +fp-ethereum = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", default-features = false } # (native) -fc-consensus = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0" } -fc-db = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0" } -fc-api = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0" } -fc-mapping-sync = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0" } -fc-rpc = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0", features = ["rpc-binary-search-estimate", "txpool"] } -fc-rpc-core = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0" } -fp-consensus = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0" } -fp-storage = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0" } -fc-storage = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.9.0" } +fc-consensus = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0" } +fc-db = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0" } +fc-api = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0" } +fc-mapping-sync = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0" } +fc-rpc = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0", features = ["rpc-binary-search-estimate", "txpool"] } +fc-rpc-core = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0" } +fp-consensus = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0" } +fp-storage = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0" } +fc-storage = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.11.0" } # Cumulus # (wasm) -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -cumulus-primitives-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -parachains-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +cumulus-primitives-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +parachains-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } # (native) -cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } +cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } # Polkadot # (wasm) -polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } # XCM # (wasm) -cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } -xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } +xcm-fee-payment-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } # (native) -polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } # ORML # (wasm) -orml-xtokens = { git = "https://github.com/AstarNetwork/open-runtime-module-library", branch = "polkadot-v1.9.0", default-features = false } -orml-traits = { git = "https://github.com/AstarNetwork/open-runtime-module-library", branch = "polkadot-v1.9.0", default-features = false } -orml-xcm-support = { git = "https://github.com/AstarNetwork/open-runtime-module-library", branch = "polkadot-v1.9.0", default-features = false } -orml-oracle = { git = "https://github.com/AstarNetwork/open-runtime-module-library", branch = "polkadot-v1.9.0", default-features = false } +orml-xtokens = { git = "https://github.com/AstarNetwork/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false } +orml-traits = { git = "https://github.com/AstarNetwork/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false } +orml-xcm-support = { git = "https://github.com/AstarNetwork/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false } +orml-oracle = { git = "https://github.com/AstarNetwork/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false } # Astar pallets & modules # (wasm) @@ -339,5 +339,5 @@ moonbeam-rpc-core-trace = { path = "./vendor/rpc-core/trace" } moonbeam-rpc-core-debug = { path = "./vendor/rpc-core/debug" } # Build deps -substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } -substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0" } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } +substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" } diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml index 3669fa198..430825da8 100644 --- a/bin/collator/Cargo.toml +++ b/bin/collator/Cargo.toml @@ -128,6 +128,7 @@ cumulus-test-relay-sproof-builder = { workspace = true } # polkadot dependencies polkadot-cli = { workspace = true, optional = true } +polkadot-core-primitives = { workspace = true } polkadot-parachain = { workspace = true, features = ["std"] } polkadot-primitives = { workspace = true, features = ["std"] } polkadot-service = { workspace = true } @@ -139,7 +140,6 @@ polkadot-runtime-common = { workspace = true, features = ["std"], optional = tru # try-runtime frame-try-runtime = { workspace = true, features = ["std"], optional = true } -try-runtime-cli = { workspace = true, optional = true } # evm-tracing moonbeam-rpc-primitives-debug = { workspace = true, features = ["std"], optional = true } @@ -182,10 +182,8 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "cumulus-primitives-core/runtime-benchmarks", ] -cli = ["try-runtime-cli"] try-runtime = [ "local-runtime/try-runtime", - "try-runtime-cli/try-runtime", "astar-primitives/try-runtime", "astar-runtime/try-runtime", "frame-system/try-runtime", diff --git a/bin/collator/src/benchmarking.rs b/bin/collator/src/benchmarking.rs index f818040c0..e3c3891c1 100644 --- a/bin/collator/src/benchmarking.rs +++ b/bin/collator/src/benchmarking.rs @@ -16,13 +16,13 @@ // You should have received a copy of the GNU General Public License // along with Astar. If not, see . +use crate::parachain::service::ParachainExecutor; use astar_primitives::{AccountId, Balance, Block}; use cumulus_primitives_core::PersistedValidationData; use cumulus_primitives_parachain_inherent::{ParachainInherentData, INHERENT_IDENTIFIER}; use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder; use parity_scale_codec::Encode; use polkadot_runtime_common::BlockHashCount; -use sc_executor::NativeElseWasmExecutor; use sc_service::TFullClient; use sp_api::ConstructRuntimeApi; use sp_core::{Pair, H256}; @@ -33,41 +33,35 @@ use std::sync::Arc; /// Generates `System::Remark` extrinsics for the benchmarks. /// /// Note: Should only be used for benchmarking. -pub struct RemarkBuilder +pub struct RemarkBuilder where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - Executor: sc_executor::NativeExecutionDispatch + 'static, { - client: Arc>>, + client: Arc>, } -impl RemarkBuilder +impl RemarkBuilder where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - Executor: sc_executor::NativeExecutionDispatch + 'static, { /// Creates a new [`Self`] from the given client. - pub fn new( - client: Arc>>, - ) -> Self { + pub fn new(client: Arc>) -> Self { Self { client } } } -impl frame_benchmarking_cli::ExtrinsicBuilder - for RemarkBuilder +impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - Executor: sc_executor::NativeExecutionDispatch + 'static, { fn pallet(&self) -> &str { "system" @@ -100,30 +94,28 @@ where /// Generates `Balances::TransferKeepAlive` extrinsics for the benchmarks. /// /// Note: Should only be used for benchmarking. -pub struct TransferKeepAliveBuilder +pub struct TransferKeepAliveBuilder where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - Executor: sc_executor::NativeExecutionDispatch + 'static, { - client: Arc>>, + client: Arc>, dest: AccountId, value: Balance, } -impl TransferKeepAliveBuilder +impl TransferKeepAliveBuilder where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - Executor: sc_executor::NativeExecutionDispatch + 'static, { /// Creates a new [`Self`] from the given client. pub fn new( - client: Arc>>, + client: Arc>, dest: AccountId, value: Balance, ) -> Self { @@ -135,14 +127,12 @@ where } } -impl frame_benchmarking_cli::ExtrinsicBuilder - for TransferKeepAliveBuilder +impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - Executor: sc_executor::NativeExecutionDispatch + 'static, { fn pallet(&self) -> &str { "balances" @@ -192,14 +182,13 @@ trait BenchmarkCallSigner { ) -> OpaqueExtrinsic; } -impl BenchmarkCallSigner - for TFullClient> +impl BenchmarkCallSigner + for TFullClient where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - Executor: sc_executor::NativeExecutionDispatch + 'static, { fn sign_call( &self, @@ -251,14 +240,13 @@ where } } -impl BenchmarkCallSigner - for TFullClient> +impl BenchmarkCallSigner + for TFullClient where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - Executor: sc_executor::NativeExecutionDispatch + 'static, { fn sign_call( &self, @@ -310,14 +298,13 @@ where } } -impl BenchmarkCallSigner - for TFullClient> +impl BenchmarkCallSigner + for TFullClient where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - Executor: sc_executor::NativeExecutionDispatch + 'static, { fn sign_call( &self, @@ -369,14 +356,13 @@ where } } -impl BenchmarkCallSigner - for TFullClient> +impl BenchmarkCallSigner + for TFullClient where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - Executor: sc_executor::NativeExecutionDispatch + 'static, { fn sign_call( &self, @@ -434,14 +420,12 @@ pub trait ExistentialDepositProvider { fn existential_deposit(&self) -> Balance; } -impl ExistentialDepositProvider - for TFullClient> +impl ExistentialDepositProvider for TFullClient where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - Executor: sc_executor::NativeExecutionDispatch + 'static, { fn existential_deposit(&self) -> Balance { with_runtime! { diff --git a/bin/collator/src/cli.rs b/bin/collator/src/cli.rs index 50b318c93..f0c03f2d7 100644 --- a/bin/collator/src/cli.rs +++ b/bin/collator/src/cli.rs @@ -113,10 +113,6 @@ pub enum Subcommand { #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] #[clap(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), - - /// Try some command against runtime state. - /// No moved to separte cli and just a placeholder command here - TryRuntime, } #[derive(Debug)] diff --git a/bin/collator/src/command.rs b/bin/collator/src/command.rs index ebda5c802..13f7ff2d3 100644 --- a/bin/collator/src/command.rs +++ b/bin/collator/src/command.rs @@ -21,8 +21,8 @@ use crate::{ cli::{Cli, RelayChainCli, Subcommand}, local::{self, development_config}, parachain::{ - self, astar, chain_spec, service::AdditionalConfig, shibuya, shiden, start_astar_node, - start_shibuya_node, start_shiden_node, + self, chain_spec, service::AdditionalConfig, start_astar_node, start_shibuya_node, + start_shiden_node, }, }; use cumulus_primitives_core::ParaId; @@ -205,7 +205,7 @@ pub fn run() -> Result<()> { task_manager, import_queue, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -218,7 +218,7 @@ pub fn run() -> Result<()> { task_manager, import_queue, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue_fallback, )?; @@ -231,7 +231,7 @@ pub fn run() -> Result<()> { task_manager, import_queue, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -247,7 +247,7 @@ pub fn run() -> Result<()> { client, task_manager, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -259,7 +259,7 @@ pub fn run() -> Result<()> { client, task_manager, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue_fallback, )?; @@ -271,7 +271,7 @@ pub fn run() -> Result<()> { client, task_manager, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -287,7 +287,7 @@ pub fn run() -> Result<()> { client, task_manager, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -299,7 +299,7 @@ pub fn run() -> Result<()> { client, task_manager, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue_fallback, )?; @@ -311,7 +311,7 @@ pub fn run() -> Result<()> { client, task_manager, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -328,7 +328,7 @@ pub fn run() -> Result<()> { task_manager, import_queue, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -341,7 +341,7 @@ pub fn run() -> Result<()> { task_manager, import_queue, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue_fallback, )?; @@ -354,7 +354,7 @@ pub fn run() -> Result<()> { task_manager, import_queue, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -390,7 +390,7 @@ pub fn run() -> Result<()> { task_manager, backend, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -407,7 +407,7 @@ pub fn run() -> Result<()> { task_manager, backend, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue_fallback, )?; @@ -424,7 +424,7 @@ pub fn run() -> Result<()> { task_manager, backend, .. - } = parachain::new_partial::( + } = parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -441,7 +441,7 @@ pub fn run() -> Result<()> { if runner.config().chain_spec.is_astar() { runner.sync_run(|config| { let PartialComponents { client, .. } = - parachain::new_partial::( + parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -450,7 +450,7 @@ pub fn run() -> Result<()> { } else if runner.config().chain_spec.is_shiden() { runner.sync_run(|config| { let PartialComponents { client, .. } = - parachain::new_partial::( + parachain::new_partial::( &config, parachain::build_import_queue_fallback, )?; @@ -459,7 +459,7 @@ pub fn run() -> Result<()> { } else { runner.sync_run(|config| { let PartialComponents { client, .. } = - parachain::new_partial::( + parachain::new_partial::( &config, parachain::build_import_queue, )?; @@ -492,26 +492,26 @@ pub fn run() -> Result<()> { BenchmarkCmd::Pallet(cmd) => { if chain_spec.is_astar() { runner.sync_run(|config| { - cmd.run::, parachain::HostFunctions>( - config, + cmd.run_with_spec::, parachain::HostFunctions>( + Some(config.chain_spec), ) }) } else if chain_spec.is_shiden() { runner.sync_run(|config| { - cmd.run::, parachain::HostFunctions>( - config, + cmd.run_with_spec::, parachain::HostFunctions>( + Some(config.chain_spec), ) }) } else if chain_spec.is_shibuya() { runner.sync_run(|config| { - cmd.run::, parachain::HostFunctions>( - config, + cmd.run_with_spec::, parachain::HostFunctions>( + Some(config.chain_spec), ) }) } else { runner.sync_run(|config| { - cmd.run::, local::HostFunctions>( - config, + cmd.run_with_spec::, local::HostFunctions>( + Some(config.chain_spec), ) }) } @@ -519,30 +519,25 @@ pub fn run() -> Result<()> { BenchmarkCmd::Block(cmd) => { if chain_spec.is_astar() { runner.sync_run(|config| { - let params = - parachain::new_partial::( - &config, - parachain::build_import_queue, - )?; + let params = parachain::new_partial::( + &config, + parachain::build_import_queue, + )?; cmd.run(params.client) }) } else if chain_spec.is_shiden() { runner.sync_run(|config| { - let params = - parachain::new_partial::( - &config, - parachain::build_import_queue_fallback, - )?; + let params = parachain::new_partial::( + &config, + parachain::build_import_queue_fallback, + )?; cmd.run(params.client) }) } else if chain_spec.is_shibuya() { runner.sync_run(|config| { - let params = parachain::new_partial::< - shibuya::RuntimeApi, - shibuya::Executor, - _, - >( - &config, parachain::build_import_queue + let params = parachain::new_partial::( + &config, + parachain::build_import_queue, )?; cmd.run(params.client) }) @@ -556,11 +551,10 @@ pub fn run() -> Result<()> { BenchmarkCmd::Storage(cmd) => { if chain_spec.is_astar() { runner.sync_run(|config| { - let params = - parachain::new_partial::( - &config, - parachain::build_import_queue, - )?; + let params = parachain::new_partial::( + &config, + parachain::build_import_queue, + )?; let db = params.backend.expose_db(); let storage = params.backend.expose_storage(); @@ -568,11 +562,10 @@ pub fn run() -> Result<()> { }) } else if chain_spec.is_shiden() { runner.sync_run(|config| { - let params = - parachain::new_partial::( - &config, - parachain::build_import_queue_fallback, - )?; + let params = parachain::new_partial::( + &config, + parachain::build_import_queue_fallback, + )?; let db = params.backend.expose_db(); let storage = params.backend.expose_storage(); @@ -580,12 +573,9 @@ pub fn run() -> Result<()> { }) } else if chain_spec.is_shibuya() { runner.sync_run(|config| { - let params = parachain::new_partial::< - shibuya::RuntimeApi, - shibuya::Executor, - _, - >( - &config, parachain::build_import_queue + let params = parachain::new_partial::( + &config, + parachain::build_import_queue, )?; let db = params.backend.expose_db(); let storage = params.backend.expose_storage(); @@ -605,11 +595,10 @@ pub fn run() -> Result<()> { BenchmarkCmd::Overhead(cmd) => { if chain_spec.is_astar() { runner.sync_run(|config| { - let params = - parachain::new_partial::( - &config, - parachain::build_import_queue, - )?; + let params = parachain::new_partial::( + &config, + parachain::build_import_queue, + )?; let ext_builder = RemarkBuilder::new(params.client.clone()); let inherent_data = para_benchmark_inherent_data() .map_err(|e| format!("generating inherent data: {:?}", e))?; @@ -624,11 +613,10 @@ pub fn run() -> Result<()> { }) } else if chain_spec.is_shiden() { runner.sync_run(|config| { - let params = - parachain::new_partial::( - &config, - parachain::build_import_queue_fallback, - )?; + let params = parachain::new_partial::( + &config, + parachain::build_import_queue_fallback, + )?; let ext_builder = RemarkBuilder::new(params.client.clone()); let inherent_data = para_benchmark_inherent_data() @@ -644,12 +632,9 @@ pub fn run() -> Result<()> { }) } else if chain_spec.is_shibuya() { runner.sync_run(|config| { - let params = parachain::new_partial::< - shibuya::RuntimeApi, - shibuya::Executor, - _, - >( - &config, parachain::build_import_queue + let params = parachain::new_partial::( + &config, + parachain::build_import_queue, )?; let ext_builder = RemarkBuilder::new(params.client.clone()); @@ -684,11 +669,10 @@ pub fn run() -> Result<()> { BenchmarkCmd::Extrinsic(cmd) => { if chain_spec.is_astar() { runner.sync_run(|config| { - let params = - parachain::new_partial::( - &config, - parachain::build_import_queue, - )?; + let params = parachain::new_partial::( + &config, + parachain::build_import_queue, + )?; let remark_builder = RemarkBuilder::new(params.client.clone()); let tka_builder = TransferKeepAliveBuilder::new( params.client.clone(), @@ -706,11 +690,10 @@ pub fn run() -> Result<()> { }) } else if chain_spec.is_shiden() { runner.sync_run(|config| { - let params = - parachain::new_partial::( - &config, - parachain::build_import_queue_fallback, - )?; + let params = parachain::new_partial::( + &config, + parachain::build_import_queue_fallback, + )?; let remark_builder = RemarkBuilder::new(params.client.clone()); let tka_builder = TransferKeepAliveBuilder::new( params.client.clone(), @@ -728,12 +711,9 @@ pub fn run() -> Result<()> { }) } else if chain_spec.is_shibuya() { runner.sync_run(|config| { - let params = parachain::new_partial::< - shibuya::RuntimeApi, - shibuya::Executor, - _, - >( - &config, parachain::build_import_queue + let params = parachain::new_partial::( + &config, + parachain::build_import_queue, )?; let remark_builder = RemarkBuilder::new(params.client.clone()); let tka_builder = TransferKeepAliveBuilder::new( @@ -775,11 +755,6 @@ pub fn run() -> Result<()> { } } } - Some(Subcommand::TryRuntime) => Err("The `try-runtime` subcommand has been migrated to a \ - standalone CLI (https://github.com/paritytech/try-runtime-cli). It is no longer \ - being maintained here and will be removed entirely some time after January 2024. \ - Please remove this subcommand from your runtime and use the standalone CLI." - .into()), None => { let runner = cli.create_runner(&cli.run.normalize())?; let collator_options = cli.run.collator_options(); @@ -798,7 +773,7 @@ pub fn run() -> Result<()> { runner.run_node_until_exit(|config| async move { if config.chain_spec.is_dev() { - return local::start_node(config, #[cfg(feature = "evm-tracing")] evm_tracing_config).map_err(Into::into); + return local::start_node::>(config, #[cfg(feature = "evm-tracing")] evm_tracing_config).map_err(Into::into); } let polkadot_cli = RelayChainCli::new( diff --git a/bin/collator/src/local/mod.rs b/bin/collator/src/local/mod.rs index 164a544fb..859723fd1 100644 --- a/bin/collator/src/local/mod.rs +++ b/bin/collator/src/local/mod.rs @@ -25,4 +25,4 @@ mod service; mod chain_spec; pub use chain_spec::*; -pub use service::{new_partial, start_node, Executor, HostFunctions, RuntimeApi}; +pub use service::{new_partial, start_node, HostFunctions, RuntimeApi}; diff --git a/bin/collator/src/local/service.rs b/bin/collator/src/local/service.rs index 3ab546eb7..e444eb7f9 100644 --- a/bin/collator/src/local/service.rs +++ b/bin/collator/src/local/service.rs @@ -20,13 +20,16 @@ use fc_consensus::FrontierBlockImport; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; +use fc_storage::StorageOverrideHandler; use futures::{FutureExt, StreamExt}; use sc_client_api::{Backend, BlockBackend, BlockchainEvents}; use sc_consensus_grandpa::SharedVoterState; -use sc_executor::NativeElseWasmExecutor; +use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY}; +use sc_network::NetworkBackend; use sc_service::{error::Error as ServiceError, Configuration, TaskManager}; use sc_telemetry::{Telemetry, TelemetryWorker}; use sc_transaction_pool_api::OffchainTransactionPoolFactory; +use sp_runtime::traits::Block as BlockT; use std::{collections::BTreeMap, sync::Arc, time::Duration}; #[cfg(not(feature = "manual-seal"))] @@ -43,40 +46,20 @@ use astar_primitives::*; /// imported and generated. const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512; -/// Extra host functions -#[cfg(feature = "runtime-benchmarks")] -pub type HostFunctions = ( - // benchmarking host functions - frame_benchmarking::benchmarking::HostFunctions, - // evm tracing host functions - moonbeam_primitives_ext::moonbeam_ext::HostFunctions, - cumulus_client_service::storage_proof_size::HostFunctions, -); - -/// Extra host functions -#[cfg(not(feature = "runtime-benchmarks"))] +/// Parachain host functions +#[cfg(feature = "evm-tracing")] pub type HostFunctions = ( - // evm tracing host functions + cumulus_client_service::ParachainHostFunctions, moonbeam_primitives_ext::moonbeam_ext::HostFunctions, - cumulus_client_service::storage_proof_size::HostFunctions, ); -/// Local runtime native executor. -pub struct Executor; - -impl sc_executor::NativeExecutionDispatch for Executor { - type ExtendHostFunctions = HostFunctions; - - fn dispatch(method: &str, data: &[u8]) -> Option> { - local_runtime::api::dispatch(method, data) - } +/// Parachain host functions +#[cfg(not(feature = "evm-tracing"))] +pub type HostFunctions = (cumulus_client_service::ParachainHostFunctions,); - fn native_version() -> sc_executor::NativeVersion { - local_runtime::native_version() - } -} +type ParachainExecutor = WasmExecutor; -type FullClient = sc_service::TFullClient>; +type FullClient = sc_service::TFullClient; type FullBackend = sc_service::TFullBackend; type FullSelectChain = sc_consensus::LongestChain; @@ -103,7 +86,7 @@ pub fn new_partial( >, sc_consensus_grandpa::LinkHalf, Option, - Arc>, + Arc>, ), >, ServiceError, @@ -119,7 +102,19 @@ pub fn new_partial( }) .transpose()?; - let executor = sc_service::new_native_or_wasm_executor(&config); + let heap_pages = config + .default_heap_pages + .map_or(DEFAULT_HEAP_ALLOC_STRATEGY, |h| HeapAllocStrategy::Static { + extra_pages: h as _, + }); + + let executor = ParachainExecutor::builder() + .with_execution_method(config.wasm_method) + .with_onchain_heap_alloc_strategy(heap_pages) + .with_offchain_heap_alloc_strategy(heap_pages) + .with_max_runtime_instances(config.max_runtime_instances) + .with_runtime_cache_size(config.runtime_cache_size) + .build(); let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts_record_import::( @@ -205,10 +200,13 @@ pub fn new_partial( } /// Builds a new service. -pub fn start_node( +pub fn start_node( config: Configuration, #[cfg(feature = "evm-tracing")] evm_tracing_config: crate::evm_tracing_types::EvmTracingConfig, -) -> Result { +) -> Result +where + N: NetworkBackend::Hash>, +{ let sc_service::PartialComponents { client, backend, @@ -228,10 +226,20 @@ pub fn start_node( .expect("Genesis block exists; qed"), &config.chain_spec, ); - let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network); + let mut net_config = + sc_network::config::FullNetworkConfiguration::<_, _, N>::new(&config.network); + + let metrics = N::register_notification_metrics( + config.prometheus_config.as_ref().map(|cfg| &cfg.registry), + ); + let peer_store_handle = net_config.peer_store_handle(); let (grandpa_protocol_config, grandpa_notification_service) = - sc_consensus_grandpa::grandpa_peers_set_config(protocol_name.clone()); + sc_consensus_grandpa::grandpa_peers_set_config::<_, N>( + protocol_name.clone(), + metrics.clone(), + Arc::clone(&peer_store_handle), + ); net_config.add_notification_protocol(grandpa_protocol_config); let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = @@ -245,6 +253,7 @@ pub fn start_node( block_announce_validator_builder: None, warp_sync_params: None, block_relay: None, + metrics, })?; if config.offchain_worker.enabled { @@ -258,7 +267,7 @@ pub fn start_node( transaction_pool: Some(OffchainTransactionPoolFactory::new( transaction_pool.clone(), )), - network_provider: network.clone(), + network_provider: Arc::new(network.clone()), is_validator: config.role.is_authority(), enable_http_requests: true, custom_extensions: move |_| vec![], @@ -270,7 +279,7 @@ pub fn start_node( let filter_pool: FilterPool = Arc::new(std::sync::Mutex::new(BTreeMap::new())); let fee_history_cache: FeeHistoryCache = Arc::new(std::sync::Mutex::new(BTreeMap::new())); - let overrides = fc_storage::overrides_handle(client.clone()); + let storage_override = Arc::new(StorageOverrideHandler::new(client.clone())); // Sinks for pubsub notifications. // Everytime a new subscription is created, a new mpsc channel is added to the sink pool. @@ -296,7 +305,7 @@ pub fn start_node( substrate_backend: backend.clone(), frontier_backend: frontier_backend.clone(), filter_pool: Some(filter_pool.clone()), - overrides: overrides.clone(), + storage_override: storage_override.clone(), }, ) } else { @@ -316,7 +325,7 @@ pub fn start_node( Duration::new(6, 0), client.clone(), backend.clone(), - overrides.clone(), + storage_override.clone(), frontier_backend.clone(), 3, 0, @@ -346,7 +355,7 @@ pub fn start_node( Some("frontier"), fc_rpc::EthTask::fee_history_task( client.clone(), - overrides.clone(), + storage_override.clone(), fee_history_cache.clone(), FEE_HISTORY_LIMIT, ), @@ -365,7 +374,7 @@ pub fn start_node( let block_data_cache = Arc::new(fc_rpc::EthBlockDataCacheTask::new( task_manager.spawn_handle(), - overrides.clone(), + storage_override.clone(), 50, 50, prometheus_registry.clone(), @@ -396,7 +405,7 @@ pub fn start_node( fee_history_limit: FEE_HISTORY_LIMIT, fee_history_cache: fee_history_cache.clone(), block_data_cache: block_data_cache.clone(), - overrides: overrides.clone(), + storage_override: storage_override.clone(), enable_evm_rpc: true, // enable EVM RPC for dev node by default #[cfg(feature = "manual-seal")] command_sink: Some(command_sink.clone()), diff --git a/bin/collator/src/parachain/mod.rs b/bin/collator/src/parachain/mod.rs index 101be8279..b93711ae2 100644 --- a/bin/collator/src/parachain/mod.rs +++ b/bin/collator/src/parachain/mod.rs @@ -28,8 +28,8 @@ pub mod service; pub mod chain_spec; pub use service::{ - astar, build_import_queue, build_import_queue_fallback, new_partial, shibuya, shiden, - start_astar_node, start_shibuya_node, start_shiden_node, HostFunctions, + build_import_queue, build_import_queue_fallback, new_partial, start_astar_node, + start_shibuya_node, start_shiden_node, HostFunctions, }; pub(crate) use shell_upgrade::{ diff --git a/bin/collator/src/parachain/service.rs b/bin/collator/src/parachain/service.rs index 122826d9e..7c60d8c94 100644 --- a/bin/collator/src/parachain/service.rs +++ b/bin/collator/src/parachain/service.rs @@ -37,11 +37,12 @@ use cumulus_relay_chain_interface::{RelayChainInterface, RelayChainResult}; use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node_with_rpc; use fc_consensus::FrontierBlockImport; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; +use fc_storage::StorageOverrideHandler; use futures::StreamExt; use sc_client_api::BlockchainEvents; use sc_consensus::{import_queue::BasicQueue, ImportQueue}; -use sc_executor::NativeElseWasmExecutor; -use sc_network::NetworkBlock; +use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY}; +use sc_network::{NetworkBackend, NetworkBlock}; use sc_network_sync::SyncingService; use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; @@ -50,8 +51,10 @@ use sp_consensus_aura::{ sr25519::AuthorityId as AuraId, sr25519::AuthorityPair as AuraPair, AuraApi, }; use sp_keystore::KeystorePtr; -use sp_runtime::traits::BlakeTwo256; -use sp_runtime::Percent; +use sp_runtime::{ + traits::{BlakeTwo256, Block as BlockT}, + Percent, +}; use std::{collections::BTreeMap, sync::Arc, time::Duration}; use substrate_prometheus_endpoint::Registry; @@ -63,117 +66,53 @@ use crate::{ rpc::tracing, }; -/// Extra host functions -#[cfg(feature = "runtime-benchmarks")] -pub type HostFunctions = ( - frame_benchmarking::benchmarking::HostFunctions, - moonbeam_primitives_ext::moonbeam_ext::HostFunctions, - cumulus_client_service::storage_proof_size::HostFunctions, -); - -/// Extra host functions -#[cfg(not(feature = "runtime-benchmarks"))] +/// Parachain host functions +#[cfg(feature = "evm-tracing")] pub type HostFunctions = ( + cumulus_client_service::ParachainHostFunctions, moonbeam_primitives_ext::moonbeam_ext::HostFunctions, - cumulus_client_service::storage_proof_size::HostFunctions, ); -/// Astar network runtime executor. -pub mod astar { - use super::HostFunctions; - pub use astar_runtime::RuntimeApi; - - /// Shibuya runtime executor. - pub struct Executor; - impl sc_executor::NativeExecutionDispatch for Executor { - type ExtendHostFunctions = HostFunctions; - - fn dispatch(method: &str, data: &[u8]) -> Option> { - astar_runtime::api::dispatch(method, data) - } - - fn native_version() -> sc_executor::NativeVersion { - astar_runtime::native_version() - } - } -} - -/// Shiden network runtime executor. -pub mod shiden { - use super::HostFunctions; - pub use shiden_runtime::RuntimeApi; - - /// Shiden runtime executor. - pub struct Executor; - impl sc_executor::NativeExecutionDispatch for Executor { - type ExtendHostFunctions = HostFunctions; - - fn dispatch(method: &str, data: &[u8]) -> Option> { - shiden_runtime::api::dispatch(method, data) - } - - fn native_version() -> sc_executor::NativeVersion { - shiden_runtime::native_version() - } - } -} - -/// Shibuya network runtime executor. -pub mod shibuya { - use super::HostFunctions; - pub use shibuya_runtime::RuntimeApi; - - /// Shibuya runtime executor. - pub struct Executor; - impl sc_executor::NativeExecutionDispatch for Executor { - type ExtendHostFunctions = HostFunctions; +/// Parachain host functions +#[cfg(not(feature = "evm-tracing"))] +pub type HostFunctions = (cumulus_client_service::ParachainHostFunctions,); - fn dispatch(method: &str, data: &[u8]) -> Option> { - shibuya_runtime::api::dispatch(method, data) - } - - fn native_version() -> sc_executor::NativeVersion { - shibuya_runtime::native_version() - } - } -} +/// Parachain executor +pub type ParachainExecutor = WasmExecutor; /// Starts a `ServiceBuilder` for a full service. /// /// Use this macro if you don't actually need the full service, but just the builder in order to /// be able to perform chain operations. -pub fn new_partial( +pub fn new_partial( config: &Configuration, build_import_queue: BIQ, ) -> Result< PartialComponents< - TFullClient>, + TFullClient, TFullBackend, (), sc_consensus::DefaultImportQueue, - sc_transaction_pool::FullPool< - Block, - TFullClient>, - >, + sc_transaction_pool::FullPool>, ( ParachainBlockImport< Block, FrontierBlockImport< Block, - Arc>>, - TFullClient>, + Arc>, + TFullClient, >, TFullBackend, >, Option, Option, - Arc>, + Arc>>, ), >, sc_service::Error, > where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, @@ -186,15 +125,14 @@ where + fp_rpc::EthereumRuntimeRPCApi, sc_client_api::StateBackendFor, Block>: sc_client_api::backend::StateBackend, - Executor: sc_executor::NativeExecutionDispatch + 'static, BIQ: FnOnce( - Arc>>, + Arc>, ParachainBlockImport< Block, FrontierBlockImport< Block, - Arc>>, - TFullClient>, + Arc>, + TFullClient, >, TFullBackend, >, @@ -214,7 +152,19 @@ where }) .transpose()?; - let executor = sc_service::new_native_or_wasm_executor(&config); + let heap_pages = config + .default_heap_pages + .map_or(DEFAULT_HEAP_ALLOC_STRATEGY, |h| HeapAllocStrategy::Static { + extra_pages: h as _, + }); + + let executor = ParachainExecutor::builder() + .with_execution_method(config.wasm_method) + .with_onchain_heap_alloc_strategy(heap_pages) + .with_offchain_heap_alloc_strategy(heap_pages) + .with_max_runtime_instances(config.max_runtime_instances) + .with_runtime_cache_size(config.runtime_cache_size) + .build(); let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts_record_import::( @@ -306,7 +256,7 @@ async fn build_relay_chain_interface( /// This is the actual implementation that is abstract over the executor and the runtime api. #[cfg(not(feature = "evm-tracing"))] #[sc_tracing::logging::prefix_logs_with("Parachain")] -async fn start_node_impl( +async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, collator_options: CollatorOptions, @@ -316,10 +266,10 @@ async fn start_node_impl( start_consensus: SC, ) -> sc_service::error::Result<( TaskManager, - Arc>>, + Arc>, )> where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, @@ -337,15 +287,14 @@ where + AuraApi, sc_client_api::StateBackendFor, Block>: sc_client_api::backend::StateBackend, - Executor: sc_executor::NativeExecutionDispatch + 'static, BIQ: FnOnce( - Arc>>, + Arc>, ParachainBlockImport< Block, FrontierBlockImport< Block, - Arc>>, - TFullClient>, + Arc>, + TFullClient, >, TFullBackend, >, @@ -354,14 +303,14 @@ where &TaskManager, ) -> sc_consensus::DefaultImportQueue, SC: FnOnce( - Arc>>, + Arc>, Arc>, ParachainBlockImport< Block, FrontierBlockImport< Block, - Arc>>, - TFullClient>, + Arc>, + TFullClient, >, TFullBackend, >, @@ -369,25 +318,22 @@ where Option, &TaskManager, Arc, - Arc< - sc_transaction_pool::FullPool< - Block, - TFullClient>, - >, - >, + Arc>>, Arc>, KeystorePtr, ParaId, CollatorPair, AdditionalConfig, ) -> Result<(), sc_service::Error>, + N: NetworkBackend::Hash>, { let parachain_config = prepare_node_config(parachain_config); - let params = new_partial::(¶chain_config, build_import_queue)?; + let params = new_partial::(¶chain_config, build_import_queue)?; let (parachain_block_import, mut telemetry, telemetry_worker_handle, frontier_backend) = params.other; - let net_config = sc_network::config::FullNetworkConfiguration::new(¶chain_config.network); + let net_config = + sc_network::config::FullNetworkConfiguration::<_, _, N>::new(¶chain_config.network); let client = params.client.clone(); let backend = params.backend.clone(); @@ -424,7 +370,7 @@ where let filter_pool: FilterPool = Arc::new(std::sync::Mutex::new(BTreeMap::new())); let fee_history_cache: FeeHistoryCache = Arc::new(std::sync::Mutex::new(BTreeMap::new())); - let overrides = fc_storage::overrides_handle(client.clone()); + let storage_override = Arc::new(StorageOverrideHandler::new(client.clone())); // Sinks for pubsub notifications. // Everytime a new subscription is created, a new mpsc channel is added to the sink pool. @@ -445,7 +391,7 @@ where Duration::new(6, 0), client.clone(), backend.clone(), - overrides.clone(), + storage_override.clone(), frontier_backend.clone(), 3, 0, @@ -475,7 +421,7 @@ where Some("frontier"), fc_rpc::EthTask::fee_history_task( client.clone(), - overrides.clone(), + storage_override.clone(), fee_history_cache.clone(), FEE_HISTORY_LIMIT, ), @@ -483,7 +429,7 @@ where let block_data_cache = Arc::new(fc_rpc::EthBlockDataCacheTask::new( task_manager.spawn_handle(), - overrides.clone(), + storage_override.clone(), 50, 50, prometheus_registry.clone(), @@ -510,7 +456,7 @@ where fee_history_limit: FEE_HISTORY_LIMIT, fee_history_cache: fee_history_cache.clone(), block_data_cache: block_data_cache.clone(), - overrides: overrides.clone(), + storage_override: storage_override.clone(), enable_evm_rpc: additional_config.enable_evm_rpc, #[cfg(feature = "manual-seal")] command_sink: None, @@ -629,7 +575,7 @@ pub struct AdditionalConfig { /// This is the actual implementation that is abstract over the executor and the runtime api. #[cfg(feature = "evm-tracing")] #[sc_tracing::logging::prefix_logs_with("Parachain")] -async fn start_node_impl( +async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, collator_options: CollatorOptions, @@ -639,10 +585,10 @@ async fn start_node_impl( start_consensus: SC, ) -> sc_service::error::Result<( TaskManager, - Arc>>, + Arc>, )> where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, @@ -662,15 +608,14 @@ where + AuraApi, sc_client_api::StateBackendFor, Block>: sc_client_api::backend::StateBackend, - Executor: sc_executor::NativeExecutionDispatch + 'static, BIQ: FnOnce( - Arc>>, + Arc>, ParachainBlockImport< Block, FrontierBlockImport< Block, - Arc>>, - TFullClient>, + Arc>, + TFullClient, >, TFullBackend, >, @@ -679,14 +624,14 @@ where &TaskManager, ) -> sc_consensus::DefaultImportQueue, SC: FnOnce( - Arc>>, + Arc>, Arc>, ParachainBlockImport< Block, FrontierBlockImport< Block, - Arc>>, - TFullClient>, + Arc>, + TFullClient, >, TFullBackend, >, @@ -694,25 +639,22 @@ where Option, &TaskManager, Arc, - Arc< - sc_transaction_pool::FullPool< - Block, - TFullClient>, - >, - >, + Arc>>, Arc>, KeystorePtr, ParaId, CollatorPair, AdditionalConfig, ) -> Result<(), sc_service::Error>, + N: NetworkBackend::Hash>, { let parachain_config = prepare_node_config(parachain_config); - let params = new_partial::(¶chain_config, build_import_queue)?; + let params = new_partial::(¶chain_config, build_import_queue)?; let (parachain_block_import, mut telemetry, telemetry_worker_handle, frontier_backend) = params.other; - let net_config = sc_network::config::FullNetworkConfiguration::new(¶chain_config.network); + let net_config = + sc_network::config::FullNetworkConfiguration::<_, _, N>::new(¶chain_config.network); let client = params.client.clone(); let backend = params.backend.clone(); @@ -749,7 +691,7 @@ where let filter_pool: FilterPool = Arc::new(std::sync::Mutex::new(BTreeMap::new())); let fee_history_cache: FeeHistoryCache = Arc::new(std::sync::Mutex::new(BTreeMap::new())); - let overrides = fc_storage::overrides_handle(client.clone()); + let storage_override = Arc::new(StorageOverrideHandler::new(client.clone())); // Sinks for pubsub notifications. // Everytime a new subscription is created, a new mpsc channel is added to the sink pool. @@ -772,7 +714,7 @@ where substrate_backend: backend.clone(), frontier_backend: frontier_backend.clone(), filter_pool: Some(filter_pool.clone()), - overrides: overrides.clone(), + storage_override: storage_override.clone(), }, ) } else { @@ -792,7 +734,7 @@ where Duration::new(6, 0), client.clone(), backend.clone(), - overrides.clone(), + storage_override.clone(), frontier_backend.clone(), 3, 0, @@ -822,7 +764,7 @@ where Some("frontier"), fc_rpc::EthTask::fee_history_task( client.clone(), - overrides.clone(), + storage_override.clone(), fee_history_cache.clone(), FEE_HISTORY_LIMIT, ), @@ -830,7 +772,7 @@ where let block_data_cache = Arc::new(fc_rpc::EthBlockDataCacheTask::new( task_manager.spawn_handle(), - overrides.clone(), + storage_override.clone(), 50, 50, prometheus_registry.clone(), @@ -862,7 +804,7 @@ where fee_history_limit: FEE_HISTORY_LIMIT, fee_history_cache: fee_history_cache.clone(), block_data_cache: block_data_cache.clone(), - overrides: overrides.clone(), + storage_override: storage_override.clone(), enable_evm_rpc: additional_config.enable_evm_rpc, #[cfg(feature = "manual-seal")] command_sink: None, @@ -963,14 +905,14 @@ where /// Build aura import queue with fallback to relay-chain verifier. /// Starts with relay-chain verifier until aura becomes available. -pub fn build_import_queue_fallback( - client: Arc>>, +pub fn build_import_queue_fallback( + client: Arc>, block_import: ParachainBlockImport< Block, FrontierBlockImport< Block, - Arc>>, - TFullClient>, + Arc>, + TFullClient, >, TFullBackend, >, @@ -979,7 +921,7 @@ pub fn build_import_queue_fallback( task_manager: &TaskManager, ) -> sc_consensus::DefaultImportQueue where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, @@ -993,7 +935,6 @@ where + AuraApi, sc_client_api::StateBackendFor, Block>: sc_client_api::StateBackend, - Executor: sc_executor::NativeExecutionDispatch + 'static, { let verifier_client = client.clone(); @@ -1039,14 +980,14 @@ where } /// Build aura only import queue. -pub fn build_import_queue( - client: Arc>>, +pub fn build_import_queue( + client: Arc>, block_import: ParachainBlockImport< Block, FrontierBlockImport< Block, - Arc>>, - TFullClient>, + Arc>, + TFullClient, >, TFullBackend, >, @@ -1055,7 +996,7 @@ pub fn build_import_queue( task_manager: &TaskManager, ) -> sc_consensus::DefaultImportQueue where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, @@ -1069,11 +1010,8 @@ where + AuraApi, sc_client_api::StateBackendFor, Block>: sc_client_api::StateBackend, - Executor: sc_executor::NativeExecutionDispatch + 'static, { let cidp_client = client.clone(); - let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client) - .expect("AuraApi slot_duration failed!"); cumulus_client_consensus_aura::equivocation_import_queue::fully_verifying_import_queue::< AuraPair, @@ -1100,7 +1038,6 @@ where Ok((slot, timestamp)) } }, - slot_duration, &task_manager.spawn_essential_handle(), config.prometheus_registry(), telemetry_handle, @@ -1108,15 +1045,15 @@ where } /// Start collating with the `shell` runtime while waiting for an upgrade to an Aura compatible runtime. -fn start_aura_consensus_fallback( - client: Arc>>, +fn start_aura_consensus_fallback( + client: Arc>, backend: Arc>, parachain_block_import: ParachainBlockImport< Block, FrontierBlockImport< Block, - Arc>>, - TFullClient>, + Arc>, + TFullClient, >, TFullBackend, >, @@ -1125,10 +1062,7 @@ fn start_aura_consensus_fallback( task_manager: &TaskManager, relay_chain_interface: Arc, transaction_pool: Arc< - sc_transaction_pool::FullPool< - Block, - TFullClient>, - >, + sc_transaction_pool::FullPool>, >, sync_oracle: Arc>, keystore: KeystorePtr, @@ -1137,7 +1071,7 @@ fn start_aura_consensus_fallback( additional_config: AdditionalConfig, ) -> Result<(), sc_service::Error> where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, @@ -1153,7 +1087,6 @@ where + cumulus_primitives_core::CollectCollationInfo, sc_client_api::StateBackendFor, Block>: sc_client_api::StateBackend, - Executor: sc_executor::NativeExecutionDispatch + 'static, { let mut proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( task_manager.spawn_handle(), @@ -1178,7 +1111,6 @@ where let collation_future = Box::pin(async move { use parity_scale_codec::Decode; use sp_api::ApiExt; - use sp_runtime::traits::Block as BlockT; let client = client_.clone(); @@ -1261,15 +1193,15 @@ where Ok(()) } -fn start_aura_consensus( - client: Arc>>, +fn start_aura_consensus( + client: Arc>, backend: Arc>, parachain_block_import: ParachainBlockImport< Block, FrontierBlockImport< Block, - Arc>>, - TFullClient>, + Arc>, + TFullClient, >, TFullBackend, >, @@ -1278,10 +1210,7 @@ fn start_aura_consensus( task_manager: &TaskManager, relay_chain_interface: Arc, transaction_pool: Arc< - sc_transaction_pool::FullPool< - Block, - TFullClient>, - >, + sc_transaction_pool::FullPool>, >, sync_oracle: Arc>, keystore: KeystorePtr, @@ -1290,7 +1219,7 @@ fn start_aura_consensus( additional_config: AdditionalConfig, ) -> Result<(), sc_service::Error> where - RuntimeApi: ConstructRuntimeApi>> + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, @@ -1306,7 +1235,6 @@ where + cumulus_primitives_core::CollectCollationInfo, sc_client_api::StateBackendFor, Block>: sc_client_api::StateBackend, - Executor: sc_executor::NativeExecutionDispatch + 'static, { let mut proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( task_manager.spawn_handle(), @@ -1377,9 +1305,9 @@ pub async fn start_astar_node( additional_config: AdditionalConfig, ) -> sc_service::error::Result<( TaskManager, - Arc>>, + Arc>, )> { - start_node_impl::( + start_node_impl::>( parachain_config, polkadot_config, collator_options, @@ -1400,9 +1328,9 @@ pub async fn start_shiden_node( additional_config: AdditionalConfig, ) -> sc_service::error::Result<( TaskManager, - Arc>>, + Arc>, )> { - start_node_impl::( + start_node_impl::>( parachain_config, polkadot_config, collator_options, @@ -1423,9 +1351,9 @@ pub async fn start_shibuya_node( additional_config: AdditionalConfig, ) -> sc_service::error::Result<( TaskManager, - Arc>>, + Arc>, )> { - start_node_impl::( + start_node_impl::>( parachain_config, polkadot_config, collator_options, diff --git a/bin/collator/src/rpc.rs b/bin/collator/src/rpc.rs index 05fe03673..dde4630bb 100644 --- a/bin/collator/src/rpc.rs +++ b/bin/collator/src/rpc.rs @@ -20,16 +20,17 @@ use fc_rpc::{ Eth, EthApiServer, EthBlockDataCacheTask, EthFilter, EthFilterApiServer, EthPubSub, - EthPubSubApiServer, Net, NetApiServer, OverrideHandle, Web3, Web3ApiServer, + EthPubSubApiServer, Net, NetApiServer, Web3, Web3ApiServer, }; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; +use fc_storage::StorageOverride; use jsonrpsee::RpcModule; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; use sc_client_api::{ AuxStore, Backend, BlockchainEvents, StateBackend, StorageProvider, UsageProvider, }; -use sc_network::NetworkService; +use sc_network::service::traits::NetworkService; use sc_network_sync::SyncingService; use sc_rpc::dev::DevApiServer; pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor}; @@ -71,14 +72,14 @@ pub struct EvmTracingConfig { pub fn open_frontier_backend( client: Arc, config: &sc_service::Configuration, -) -> Result>, String> +) -> Result>, String> where C: sp_blockchain::HeaderBackend, { let config_dir = config.base_path.config_dir(config.chain_spec.id()); let path = config_dir.join("frontier").join("db"); - Ok(Arc::new(fc_db::kv::Backend::::new( + Ok(Arc::new(fc_db::kv::Backend::::new( client, &fc_db::kv::DatabaseSettings { source: fc_db::DatabaseSource::RocksDb { @@ -113,7 +114,7 @@ pub struct FullDeps { /// Graph pool instance. pub graph: Arc>, /// Network service - pub network: Arc>, + pub network: Arc, /// Chain syncing service pub sync: Arc>, /// Whether to deny unsafe calls @@ -128,8 +129,8 @@ pub struct FullDeps { pub fee_history_limit: u64, /// Fee history cache. pub fee_history_cache: FeeHistoryCache, - /// Ethereum data access overrides. - pub overrides: Arc>, + /// Ethereum data access storage_override. + pub storage_override: Arc>, /// Cache for Ethereum block data. pub block_data_cache: Arc>, /// Enable EVM RPC servers @@ -292,7 +293,7 @@ where filter_pool, fee_history_limit, fee_history_cache, - overrides, + storage_override, block_data_cache, enable_evm_rpc, #[cfg(feature = "manual-seal")] @@ -323,7 +324,7 @@ where no_tx_converter, sync.clone(), Default::default(), - overrides.clone(), + storage_override.clone(), frontier_backend.clone(), is_authority, block_data_cache.clone(), @@ -366,7 +367,7 @@ where client.clone(), sync, subscription_task_executor, - overrides, + storage_override, pubsub_notification_sinks, ) .into_rpc(), diff --git a/bin/collator/src/rpc/tracing.rs b/bin/collator/src/rpc/tracing.rs index 9abe124cd..94375a0b9 100644 --- a/bin/collator/src/rpc/tracing.rs +++ b/bin/collator/src/rpc/tracing.rs @@ -19,8 +19,8 @@ ///! EVM tracing RPC support. use crate::evm_tracing_types::{EthApi as EthApiCmd, EvmTracingConfig}; -use fc_rpc::OverrideHandle; use fc_rpc_core::types::FilterPool; +use fc_storage::StorageOverride; use fp_rpc::EthereumRuntimeRPCApi; use moonbeam_rpc_debug::{DebugHandler, DebugRequester}; use moonbeam_rpc_trace::{CacheRequester as TraceFilterCacheRequester, CacheTask}; @@ -49,7 +49,7 @@ pub struct SpawnTasksParams<'a, B: BlockT, C, BE> { pub substrate_backend: Arc, pub frontier_backend: Arc + Send + Sync>, pub filter_pool: Option, - pub overrides: Arc>, + pub storage_override: Arc>, } /// Spawn the tasks that are required to run a EVM tracing. @@ -80,7 +80,7 @@ where Arc::clone(¶ms.substrate_backend), core::time::Duration::from_secs(rpc_config.ethapi_trace_cache_duration), Arc::clone(&permit_pool), - Arc::clone(¶ms.overrides), + Arc::clone(¶ms.storage_override), prometheus, ); (Some(trace_filter_task), Some(trace_filter_requester)) @@ -94,7 +94,7 @@ where Arc::clone(¶ms.substrate_backend), Arc::clone(¶ms.frontier_backend), Arc::clone(&permit_pool), - Arc::clone(¶ms.overrides), + Arc::clone(¶ms.storage_override), rpc_config.tracing_raw_max_memory_usage, ); (Some(debug_task), Some(debug_requester)) diff --git a/pallets/astar-xcm-benchmarks/src/generic/benchmarking.rs b/pallets/astar-xcm-benchmarks/src/generic/benchmarking.rs index c9bc83e9f..b3c85590f 100644 --- a/pallets/astar-xcm-benchmarks/src/generic/benchmarking.rs +++ b/pallets/astar-xcm-benchmarks/src/generic/benchmarking.rs @@ -28,10 +28,10 @@ use xcm::latest::prelude::*; mod benchmarks { use super::*; - /// We need re-write buy_execution benchmark becuase our runtime + /// We need re-write buy_execution benchmark because our runtime /// needs 1 additional DB read (XcAssetConfig) for fetching unit per sec /// for a fungible asset. The upstream benchmark use native assets thus - /// won't accout for it. + /// won't account for it. #[benchmark] fn buy_execution() -> Result<(), BenchmarkError> { let holding = T::worst_case_holding(0).into(); @@ -43,9 +43,9 @@ mod benchmarks { let fee_asset = Location::parent(); let instruction = Instruction::>::BuyExecution { - fees: (fee_asset, u128::MAX).into(), // should be something inside of holding - // this should not be Unlimited, as xcm-executor will skip buying the - // exceution altogether. + // Should be something inside of holding register. + fees: (fee_asset, 1_000_000_000_000_000_000u128).into(), + // This should not be `Unlimited`, as xcm-executor will skip buying the execution altogether. weight_limit: WeightLimit::Limited(Weight::from_parts(1u64, 1024)), }; diff --git a/pallets/astar-xcm-benchmarks/src/mock.rs b/pallets/astar-xcm-benchmarks/src/mock.rs index edac5db0e..5ee684b48 100644 --- a/pallets/astar-xcm-benchmarks/src/mock.rs +++ b/pallets/astar-xcm-benchmarks/src/mock.rs @@ -251,6 +251,9 @@ impl xcm_executor::Config for XcmConfig { type SafeCallFilter = Everything; type Aliasers = Nothing; type TransactionalProcessor = (); + type HrmpNewChannelOpenRequestHandler = (); + type HrmpChannelAcceptedHandler = (); + type HrmpChannelClosingHandler = (); } impl pallet_xcm_benchmarks::Config for Test { diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml index ef1ab6a42..4ce5f5532 100644 --- a/pallets/collator-selection/Cargo.toml +++ b/pallets/collator-selection/Cargo.toml @@ -1,7 +1,7 @@ [package] +name = "pallet-collator-selection" description = "Simple staking pallet with a fixed stake." license = "Apache-2.0" -name = "pallet-collator-selection" readme = "README.md" version = "3.3.2" authors.workspace = true diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index c160a3dee..ad181c9d0 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -188,12 +188,10 @@ pub mod pallet { /// The invulnerable, fixed collators. #[pallet::storage] - #[pallet::getter(fn invulnerables)] pub type Invulnerables = StorageValue<_, Vec, ValueQuery>; /// The (community, limited) collation candidates. #[pallet::storage] - #[pallet::getter(fn candidates)] pub type Candidates = StorageValue<_, Vec>>, ValueQuery>; @@ -204,7 +202,6 @@ pub mod pallet { /// Last block authored by collator. #[pallet::storage] - #[pallet::getter(fn last_authored_block)] pub type LastAuthoredBlock = StorageMap<_, Twox64Concat, T::AccountId, BlockNumberFor, ValueQuery>; @@ -212,19 +209,16 @@ pub mod pallet { /// /// This should ideally always be less than [`Config::MaxCandidates`] for weights to be correct. #[pallet::storage] - #[pallet::getter(fn desired_candidates)] pub type DesiredCandidates = StorageValue<_, u32, ValueQuery>; /// Fixed amount to deposit to become a collator. /// /// When a collator calls `leave_intent` they immediately receive the deposit back. #[pallet::storage] - #[pallet::getter(fn candidacy_bond)] pub type CandidacyBond = StorageValue<_, BalanceOf, ValueQuery>; /// Destination account for slashed amount. #[pallet::storage] - #[pallet::getter(fn slash_destination)] pub type SlashDestination = StorageValue<_, ::AccountId>; #[pallet::genesis_config] @@ -387,11 +381,11 @@ pub mod pallet { // ensure we are below limit. let length = >::decode_len().unwrap_or_default(); ensure!( - (length as u32) < Self::desired_candidates(), + (length as u32) < DesiredCandidates::::get(), Error::::TooManyCandidates ); ensure!( - !Self::invulnerables().contains(&who), + !Invulnerables::::get().contains(&who), Error::::AlreadyInvulnerable ); ensure!( @@ -419,7 +413,7 @@ pub mod pallet { Ok(()) })?; - let deposit = Self::candidacy_bond(); + let deposit = CandidacyBond::::get(); // First authored block is current block plus kick threshold to handle session delay let incoming = CandidateInfo { who: who.clone(), @@ -456,7 +450,7 @@ pub mod pallet { pub fn leave_intent(origin: OriginFor) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; ensure!( - Self::candidates().len() as u32 > T::MinCandidates::get(), + Candidates::::get().len() as u32 > T::MinCandidates::get(), Error::::TooFewCandidates ); let current_count = Self::try_remove_candidate(&who)?; @@ -522,7 +516,7 @@ pub mod pallet { let (imbalance, _) = T::Currency::slash_reserved(who, slash); T::Currency::unreserve(who, remain); - if let Some(dest) = Self::slash_destination() { + if let Some(dest) = SlashDestination::::get() { T::Currency::resolve_creating(&dest, imbalance); } @@ -537,7 +531,7 @@ pub mod pallet { /// /// This is done on the fly, as frequent as we are told to do so, as the session manager. pub fn assemble_collators(candidates: Vec) -> Vec { - let mut collators = Self::invulnerables(); + let mut collators = Invulnerables::::get(); collators.extend(candidates.into_iter()); collators } @@ -546,14 +540,14 @@ pub mod pallet { pub fn kick_stale_candidates() -> (u32, u32) { let now = frame_system::Pallet::::block_number(); let kick_threshold = T::KickThreshold::get(); - let count = Self::candidates().len() as u32; + let count = Candidates::::get().len() as u32; for (who, last_authored) in LastAuthoredBlock::::iter() { if now.saturating_sub(last_authored) < kick_threshold { continue; } // still candidate, kick and slash if Self::is_account_candidate(&who) { - if Self::candidates().len() > T::MinCandidates::get() as usize { + if Candidates::::get().len() > T::MinCandidates::get() as usize { // no error, who is a candidate let _ = Self::try_remove_candidate(&who); Self::slash_non_candidate(&who); @@ -563,12 +557,15 @@ pub mod pallet { Self::slash_non_candidate(&who); } } - (count, count.saturating_sub(Self::candidates().len() as u32)) + ( + count, + count.saturating_sub(Candidates::::get().len() as u32), + ) } /// Check whether an account is a candidate. pub fn is_account_candidate(account: &T::AccountId) -> bool { - Self::candidates().iter().any(|c| &c.who == account) + Candidates::::get().iter().any(|c| &c.who == account) } } @@ -611,7 +608,7 @@ pub mod pallet { DispatchClass::Mandatory, ); - let active_candidates = Self::candidates() + let active_candidates = Candidates::::get() .into_iter() .map(|x| x.who) .collect::>(); diff --git a/pallets/collator-selection/src/mock.rs b/pallets/collator-selection/src/mock.rs index 2ae4fe909..0e158999f 100644 --- a/pallets/collator-selection/src/mock.rs +++ b/pallets/collator-selection/src/mock.rs @@ -135,6 +135,7 @@ impl pallet_aura::Config for Test { type MaxAuthorities = MaxAuthorities; type DisabledValidators = (); type AllowMultipleBlocksPerSlot = ConstBool; + type SlotDuration = pallet_aura::MinimumPeriodTimesTwo; } sp_runtime::impl_opaque_keys! { diff --git a/pallets/collator-selection/src/tests.rs b/pallets/collator-selection/src/tests.rs index 099c46a1f..fe064c2e3 100644 --- a/pallets/collator-selection/src/tests.rs +++ b/pallets/collator-selection/src/tests.rs @@ -16,7 +16,10 @@ // limitations under the License. use crate as collator_selection; -use crate::{mock::*, CandidateInfo, Error, LastAuthoredBlock, NonCandidates}; +use crate::{ + mock::*, CandidacyBond, CandidateInfo, Candidates, DesiredCandidates, Error, Invulnerables, + LastAuthoredBlock, NonCandidates, +}; use frame_support::{ assert_noop, assert_ok, traits::{Currency, OnInitialize}, @@ -27,11 +30,11 @@ use sp_runtime::{traits::BadOrigin, BuildStorage}; #[test] fn basic_setup_works() { new_test_ext().execute_with(|| { - assert_eq!(CollatorSelection::desired_candidates(), 2); - assert_eq!(CollatorSelection::candidacy_bond(), 10); + assert_eq!(DesiredCandidates::::get(), 2); + assert_eq!(CandidacyBond::::get(), 10); - assert!(CollatorSelection::candidates().is_empty()); - assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]); + assert!(Candidates::::get().is_empty()); + assert_eq!(Invulnerables::::get(), vec![1, 2]); }); } @@ -43,7 +46,7 @@ fn it_should_set_invulnerables() { RuntimeOrigin::signed(RootAccount::get()), new_set.clone() )); - assert_eq!(CollatorSelection::invulnerables(), new_set); + assert_eq!(Invulnerables::::get(), new_set); // cannot set with non-root. assert_noop!( @@ -67,14 +70,14 @@ fn it_should_set_invulnerables() { fn set_desired_candidates_works() { new_test_ext().execute_with(|| { // given - assert_eq!(CollatorSelection::desired_candidates(), 2); + assert_eq!(DesiredCandidates::::get(), 2); // can set assert_ok!(CollatorSelection::set_desired_candidates( RuntimeOrigin::signed(RootAccount::get()), 7 )); - assert_eq!(CollatorSelection::desired_candidates(), 7); + assert_eq!(DesiredCandidates::::get(), 7); // rejects bad origin assert_noop!( @@ -88,14 +91,14 @@ fn set_desired_candidates_works() { fn set_candidacy_bond() { new_test_ext().execute_with(|| { // given - assert_eq!(CollatorSelection::candidacy_bond(), 10); + assert_eq!(CandidacyBond::::get(), 10); // can set assert_ok!(CollatorSelection::set_candidacy_bond( RuntimeOrigin::signed(RootAccount::get()), 7 )); - assert_eq!(CollatorSelection::candidacy_bond(), 7); + assert_eq!(CandidacyBond::::get(), 7); // rejects bad origin. assert_noop!( @@ -151,7 +154,7 @@ fn cannot_unregister_candidate_if_too_few() { #[test] fn cannot_register_as_candidate_if_invulnerable() { new_test_ext().execute_with(|| { - assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]); + assert_eq!(Invulnerables::::get(), vec![1, 2]); // can't 1 because it is invulnerable. assert_noop!( @@ -183,8 +186,8 @@ fn cannot_register_dupe_candidate() { who: 3, deposit: 10, }; - assert_eq!(CollatorSelection::candidates(), vec![addition]); - assert_eq!(CollatorSelection::last_authored_block(3), 10); + assert_eq!(Candidates::::get(), vec![addition]); + assert_eq!(LastAuthoredBlock::::get(3), 10); assert_eq!(Balances::free_balance(3), 90); // but no more @@ -228,10 +231,10 @@ fn cannot_register_candidate_if_externally_blacklisted() { fn register_as_candidate_works() { new_test_ext().execute_with(|| { // given - assert_eq!(CollatorSelection::desired_candidates(), 2); - assert_eq!(CollatorSelection::candidacy_bond(), 10); - assert_eq!(CollatorSelection::candidates(), Vec::new()); - assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]); + assert_eq!(DesiredCandidates::::get(), 2); + assert_eq!(CandidacyBond::::get(), 10); + assert_eq!(Candidates::::get(), Vec::new()); + assert_eq!(Invulnerables::::get(), vec![1, 2]); // take two endowed, non-invulnerables accounts. assert_eq!(Balances::free_balance(&3), 100); @@ -247,7 +250,7 @@ fn register_as_candidate_works() { assert_eq!(Balances::free_balance(&3), 90); assert_eq!(Balances::free_balance(&4), 90); - assert_eq!(CollatorSelection::candidates().len(), 2); + assert_eq!(Candidates::::get().len(), 2); }); } @@ -277,7 +280,7 @@ fn leave_intent() { assert_ok!(CollatorSelection::leave_intent(RuntimeOrigin::signed(3))); assert_eq!(Balances::free_balance(3), 90); assert_eq!(Balances::reserved_balance(3), 10); - assert_eq!(CollatorSelection::last_authored_block(3), 10); + assert_eq!(LastAuthoredBlock::::get(3), 10); // 10 unbonding from session 1 assert_eq!(NonCandidates::::get(3), (1, 10)); }); @@ -375,8 +378,8 @@ fn authorship_event_handler() { deposit: 10, }; - assert_eq!(CollatorSelection::candidates(), vec![collator]); - assert_eq!(CollatorSelection::last_authored_block(4), 0); + assert_eq!(Candidates::::get(), vec![collator]); + assert_eq!(LastAuthoredBlock::::get(4), 0); // half of the pot goes to the collator who's the author (4 in tests). assert_eq!(Balances::free_balance(4), 140); @@ -405,8 +408,8 @@ fn fees_edgecases() { deposit: 10, }; - assert_eq!(CollatorSelection::candidates(), vec![collator]); - assert_eq!(CollatorSelection::last_authored_block(4), 0); + assert_eq!(Candidates::::get(), vec![collator]); + assert_eq!(LastAuthoredBlock::::get(4), 0); // Nothing received assert_eq!(Balances::free_balance(4), 90); // all fee stays @@ -435,7 +438,7 @@ fn session_management_works() { // session won't see this. assert_eq!(SessionCollators::get(), vec![1, 2]); // but we have a new candidate. - assert_eq!(CollatorSelection::candidates().len(), 1); + assert_eq!(Candidates::::get().len(), 1); initialize_to_block(10); assert_eq!(SessionChangeBlock::get(), 10); @@ -466,11 +469,11 @@ fn kick_and_slash_mechanism() { RuntimeOrigin::signed(4) )); initialize_to_block(10); - assert_eq!(CollatorSelection::candidates().len(), 2); + assert_eq!(Candidates::::get().len(), 2); initialize_to_block(20); assert_eq!(SessionChangeBlock::get(), 20); // 4 authored this block, gets to stay. 3 was kicked - assert_eq!(CollatorSelection::candidates().len(), 1); + assert_eq!(Candidates::::get().len(), 1); // 3 will be kicked after 1 session delay assert_eq!(SessionCollators::get(), vec![1, 2, 3, 4]); assert_eq!(NextSessionCollators::get(), vec![1, 2, 4]); @@ -478,8 +481,8 @@ fn kick_and_slash_mechanism() { who: 4, deposit: 10, }; - assert_eq!(CollatorSelection::candidates(), vec![collator]); - assert_eq!(CollatorSelection::last_authored_block(4), 20); + assert_eq!(Candidates::::get(), vec![collator]); + assert_eq!(LastAuthoredBlock::::get(4), 20); initialize_to_block(30); // 3 gets kicked after 1 session delay assert_eq!(SessionCollators::get(), vec![1, 2, 4]); @@ -501,8 +504,8 @@ fn slash_mechanism_for_unbonding_candidates() { assert_ok!(CollatorSelection::register_as_candidate( RuntimeOrigin::signed(4) )); - assert_eq!(CollatorSelection::last_authored_block(3), 10); - assert_eq!(CollatorSelection::last_authored_block(4), 10); + assert_eq!(LastAuthoredBlock::::get(3), 10); + assert_eq!(LastAuthoredBlock::::get(4), 10); initialize_to_block(10); // gets included into next session, expected to build blocks @@ -518,10 +521,10 @@ fn slash_mechanism_for_unbonding_candidates() { ); // new session, candidate gets slashed initialize_to_block(20); - assert_eq!(CollatorSelection::candidates().len(), 1); + assert_eq!(Candidates::::get().len(), 1); assert_eq!(SessionChangeBlock::get(), 20); assert_eq!(LastAuthoredBlock::::contains_key(3), false); - assert_eq!(CollatorSelection::last_authored_block(4), 20); + assert_eq!(LastAuthoredBlock::::get(4), 20); // slashed, remaining bond was refunded assert_noop!( @@ -546,21 +549,21 @@ fn should_not_kick_mechanism_too_few() { RuntimeOrigin::signed(5) )); initialize_to_block(10); - assert_eq!(CollatorSelection::candidates().len(), 2); + assert_eq!(Candidates::::get().len(), 2); initialize_to_block(20); assert_eq!(SessionChangeBlock::get(), 20); // 4 authored this block, 3 gets to stay too few, 5 was kicked - assert_eq!(CollatorSelection::candidates().len(), 1); + assert_eq!(Candidates::::get().len(), 1); // 5 will be kicked for next session assert_eq!(NextSessionCollators::get(), vec![1, 2, 3]); assert_eq!( - CollatorSelection::candidates(), + Candidates::::get(), vec![CandidateInfo { who: 3, deposit: 10, }] ); - assert_eq!(CollatorSelection::last_authored_block(4), 20); + assert_eq!(LastAuthoredBlock::::get(4), 20); // kicked collator gets funds back (but slashed) assert_eq!(Balances::free_balance(5), 99); initialize_to_block(30); diff --git a/pallets/dapp-staking-migration/src/lib.rs b/pallets/dapp-staking-migration/src/lib.rs index f800756a0..3c8db1030 100644 --- a/pallets/dapp-staking-migration/src/lib.rs +++ b/pallets/dapp-staking-migration/src/lib.rs @@ -328,7 +328,7 @@ pub mod pallet { } pub struct SingularStakingInfoTranslationUpgrade(PhantomData); - impl frame_support::traits::OnRuntimeUpgrade + impl frame_support::traits::UncheckedOnRuntimeUpgrade for SingularStakingInfoTranslationUpgrade { fn on_runtime_upgrade() -> Weight { diff --git a/pallets/dapp-staking-v3/src/migration.rs b/pallets/dapp-staking-v3/src/migration.rs index 6918d848f..bf741ea18 100644 --- a/pallets/dapp-staking-v3/src/migration.rs +++ b/pallets/dapp-staking-v3/src/migration.rs @@ -17,10 +17,7 @@ // along with Astar. If not, see . use super::*; -use frame_support::{ - storage_alias, - traits::{GetStorageVersion, OnRuntimeUpgrade}, -}; +use frame_support::{storage_alias, traits::UncheckedOnRuntimeUpgrade}; #[cfg(feature = "try-runtime")] use sp_std::vec::Vec; @@ -61,7 +58,7 @@ mod v8 { pub struct VersionMigrateV7ToV8(PhantomData<(T, TierThresholds)>); - impl> OnRuntimeUpgrade + impl> UncheckedOnRuntimeUpgrade for VersionMigrateV7ToV8 { fn on_runtime_upgrade() -> Weight { @@ -272,7 +269,7 @@ mod v7 { pub struct VersionMigrateV6ToV7(PhantomData); - impl OnRuntimeUpgrade for VersionMigrateV6ToV7 { + impl UncheckedOnRuntimeUpgrade for VersionMigrateV6ToV7 { fn on_runtime_upgrade() -> Weight { let current = Pallet::::in_code_storage_version(); diff --git a/pallets/inflation/src/benchmarking.rs b/pallets/inflation/src/benchmarking.rs index 4d617f84d..c4e665dc8 100644 --- a/pallets/inflation/src/benchmarking.rs +++ b/pallets/inflation/src/benchmarking.rs @@ -19,6 +19,7 @@ use super::*; use frame_benchmarking::v2::*; +use frame_support::traits::tokens::Precision; use frame_system::{Pallet as System, RawOrigin}; use sp_std::prelude::*; @@ -65,7 +66,12 @@ fn initial_config() { // Create some issuance so it's not zero let dummy_account = whitelisted_caller(); - T::Currency::make_free_balance_be(&dummy_account, 1_000_000_000_000_000_000_000); + let _debt = T::Currency::deposit( + &dummy_account, + 1_000_000_000_000_000_000_000, + Precision::Exact, + ) + .expect("Must succeed for benchmarking"); } #[benchmarks] diff --git a/pallets/inflation/src/lib.rs b/pallets/inflation/src/lib.rs index edadca142..72a745c87 100644 --- a/pallets/inflation/src/lib.rs +++ b/pallets/inflation/src/lib.rs @@ -106,7 +106,10 @@ use astar_primitives::{ }; use frame_support::{ pallet_prelude::*, - traits::{Currency, GetStorageVersion, OnRuntimeUpgrade}, + traits::{ + fungible::{Balanced, Credit, Inspect}, + tokens::Precision, + }, DefaultNoBound, }; use frame_system::{ensure_root, pallet_prelude::*}; @@ -140,19 +143,15 @@ pub mod pallet { pub struct Pallet(PhantomData); // Negative imbalance type of this pallet. - pub(crate) type NegativeImbalanceOf = <::Currency as Currency< - ::AccountId, - >>::NegativeImbalance; + pub(crate) type CreditOf = + Credit<::AccountId, ::Currency>; #[pallet::config] pub trait Config: frame_system::Config { - /// The currency trait. - /// This has been soft-deprecated but it still needs to be used here in order to access `NegativeImbalance` - /// which is defined in the currency trait. - type Currency: Currency; + type Currency: Balanced; /// Handler for 'per-block' payouts. - type PayoutPerBlock: PayoutPerBlock>; + type PayoutPerBlock: PayoutPerBlock>; /// Cycle ('year') configuration - covers periods, subperiods, eras & blocks. type CycleConfiguration: CycleConfiguration; @@ -455,9 +454,11 @@ pub mod pallet { // This can fail only if the amount is below existential deposit & the account doesn't exist, // or if the account has no provider references. + // Another possibility is overflow, but if that happens, we already have a huge problem. + // // In both cases, the reward is lost but this can be ignored since it's extremely unlikely // to appear and doesn't bring any real harm. - let _ = T::Currency::deposit_creating(account, reward); + let _ = T::Currency::deposit(account, reward, Precision::Exact); Ok(()) } } @@ -621,44 +622,3 @@ pub trait PayoutPerBlock { /// Payout reward to the collator responsible for producing the block. fn collators(reward: Imbalance); } - -/// `OnRuntimeUpgrade` logic for integrating this pallet into the live network. -#[cfg(feature = "try-runtime")] -use sp_std::vec::Vec; -pub struct PalletInflationInitConfig(PhantomData<(T, P, Weight)>); -impl> OnRuntimeUpgrade - for PalletInflationInitConfig -{ - fn on_runtime_upgrade() -> Weight { - if Pallet::::on_chain_storage_version() >= STORAGE_VERSION { - return T::DbWeight::get().reads(1); - } - - // 1. Get & set inflation parameters - let (inflation_params, next_era, extra_weight) = P::get(); - InflationParams::::put(inflation_params.clone()); - - // 2. Calculation inflation config, set it & deposit event - let config = Pallet::::recalculate_inflation(next_era); - ActiveInflationConfig::::put(config.clone()); - - Pallet::::deposit_event(Event::::NewInflationConfiguration { config }); - - // 3. Set version - STORAGE_VERSION.put::>(); - - log::info!("Inflation pallet storage initialized."); - - T::WeightInfo::recalculation() - .saturating_add(T::DbWeight::get().reads_writes(1, 2)) - .saturating_add(extra_weight) - } - - #[cfg(feature = "try-runtime")] - fn post_upgrade(_state: Vec) -> Result<(), sp_runtime::TryRuntimeError> { - assert_eq!(Pallet::::on_chain_storage_version(), STORAGE_VERSION); - assert!(InflationParams::::get().is_valid()); - - Ok(()) - } -} diff --git a/pallets/inflation/src/mock.rs b/pallets/inflation/src/mock.rs index b686d8083..db8c76ede 100644 --- a/pallets/inflation/src/mock.rs +++ b/pallets/inflation/src/mock.rs @@ -17,14 +17,13 @@ // along with Astar. If not, see . use crate::{ - self as pallet_inflation, ActiveInflationConfig, CycleConfiguration, InflationParameters, - InflationParams, NegativeImbalanceOf, PayoutPerBlock, + self as pallet_inflation, ActiveInflationConfig, CreditOf, CycleConfiguration, + InflationParameters, InflationParams, PayoutPerBlock, }; use frame_support::{ construct_runtime, parameter_types, - traits::Currency, - traits::{ConstU128, ConstU32, Hooks}, + traits::{fungible::Balanced, ConstU128, ConstU32, Hooks}, weights::Weight, PalletId, }; @@ -110,13 +109,15 @@ pub(crate) const TREASURY_POT: PalletId = PalletId(*b"moktrsry"); pub(crate) const COLLATOR_POT: PalletId = PalletId(*b"mokcolat"); pub struct DummyPayoutPerBlock; -impl PayoutPerBlock> for DummyPayoutPerBlock { - fn treasury(reward: NegativeImbalanceOf) { - Balances::resolve_creating(&TREASURY_POT.into_account_truncating(), reward); +impl PayoutPerBlock> for DummyPayoutPerBlock { + fn treasury(reward: CreditOf) { + Balances::resolve(&TREASURY_POT.into_account_truncating(), reward) + .expect("Must succeed for test."); } - fn collators(reward: NegativeImbalanceOf) { - Balances::resolve_creating(&COLLATOR_POT.into_account_truncating(), reward); + fn collators(reward: CreditOf) { + Balances::resolve(&COLLATOR_POT.into_account_truncating(), reward) + .expect("Must succeed for test."); } } diff --git a/pallets/price-aggregator/src/lib.rs b/pallets/price-aggregator/src/lib.rs index 681198d1b..4c4b85a93 100644 --- a/pallets/price-aggregator/src/lib.rs +++ b/pallets/price-aggregator/src/lib.rs @@ -48,7 +48,7 @@ #![cfg_attr(not(feature = "std"), no_std)] -use frame_support::{pallet_prelude::*, traits::OnRuntimeUpgrade, DefaultNoBound}; +use frame_support::{pallet_prelude::*, DefaultNoBound}; use frame_system::pallet_prelude::*; pub use pallet::*; use sp_arithmetic::{ @@ -474,33 +474,3 @@ pub mod pallet { } } } - -/// Used to update static price due to storage schema change. -pub struct PriceAggregatorInitializer(PhantomData<(T, P)>); -impl> OnRuntimeUpgrade for PriceAggregatorInitializer { - fn on_runtime_upgrade() -> Weight { - if Pallet::::on_chain_storage_version() > 0 { - return Weight::zero(); - } - - // 1. Prepare price aggregator storage. - let now = frame_system::Pallet::::block_number(); - let limit_block = now.saturating_add(T::AggregationDuration::get().saturated_into()); - IntermediateValueAggregator::::put(ValueAggregator::new(limit_block.saturated_into())); - - // 2. Put the initial value into the circular buffer so it's not empty. - use sp_arithmetic::FixedPointNumber; - let init_price = P::get().max(FixedU128::from_rational(1, FixedU128::DIV.into())); - log::info!( - "Pushing initial price value into moving average buffer: {}", - init_price - ); - ValuesCircularBuffer::::mutate(|buffer| buffer.add(init_price)); - - // 3. Set the initial storage version. - STORAGE_VERSION.put::>(); - - // Reading block number is 'free' in the terms of weight. - T::DbWeight::get().writes(3) - } -} diff --git a/pallets/static-price-provider/src/lib.rs b/pallets/static-price-provider/src/lib.rs index e72acd72d..067b7dcab 100644 --- a/pallets/static-price-provider/src/lib.rs +++ b/pallets/static-price-provider/src/lib.rs @@ -30,10 +30,10 @@ #![cfg_attr(not(feature = "std"), no_std)] -use frame_support::{pallet_prelude::*, traits::OnRuntimeUpgrade}; +use frame_support::pallet_prelude::*; use frame_system::{ensure_root, pallet_prelude::*}; pub use pallet::*; -use sp_arithmetic::{fixed_point::FixedU128, traits::Zero, FixedPointNumber}; +use sp_arithmetic::{fixed_point::FixedU128, traits::Zero}; use sp_std::marker::PhantomData; use astar_primitives::oracle::PriceProvider; @@ -113,21 +113,3 @@ pub mod pallet { } } } - -/// Used to update static price due to storage schema change. -pub struct ActivePriceUpdate(PhantomData<(T, P)>); -impl> OnRuntimeUpgrade for ActivePriceUpdate { - fn on_runtime_upgrade() -> Weight { - if Pallet::::on_chain_storage_version() != 1 { - return T::DbWeight::get().reads(1); - } - - let init_price = P::get().max(FixedU128::from_rational(1, FixedU128::DIV.into())); - log::info!("Setting initial active price to {}", init_price); - ActivePrice::::put(init_price); - - StorageVersion::new(2).put::>(); - - T::DbWeight::get().reads_writes(1, 2) - } -} diff --git a/pallets/unified-accounts/src/lib.rs b/pallets/unified-accounts/src/lib.rs index 4b7294605..455025c15 100644 --- a/pallets/unified-accounts/src/lib.rs +++ b/pallets/unified-accounts/src/lib.rs @@ -88,7 +88,6 @@ use sp_std::marker::PhantomData; pub use pallet::*; -pub mod migration; pub mod weights; pub use weights::WeightInfo; diff --git a/pallets/unified-accounts/src/migration.rs b/pallets/unified-accounts/src/migration.rs deleted file mode 100644 index 7fd0eba19..000000000 --- a/pallets/unified-accounts/src/migration.rs +++ /dev/null @@ -1,69 +0,0 @@ -// This file is part of Astar. - -// Copyright (C) Stake Technologies Pte.Ltd. -// SPDX-License-Identifier: GPL-3.0-or-later - -// Astar is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Astar is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Astar. If not, see . - -use super::{Config, Pallet, Weight}; -use astar_primitives::evm::EvmAddress; -use frame_support::{ - pallet_prelude::OptionQuery, - storage_alias, - traits::{Get, OnRuntimeUpgrade}, - Blake2_128Concat, -}; - -#[storage_alias] -type EvmToNative = StorageMap< - Pallet, - Blake2_128Concat, - ::AccountId, - EvmAddress, - OptionQuery, ->; - -#[storage_alias] -type NativeToEvm = StorageMap< - Pallet, - Blake2_128Concat, - EvmAddress, - ::AccountId, - OptionQuery, ->; - -/// Remove all corrupted mappings. -pub struct ClearCorruptedUnifiedMappings(core::marker::PhantomData); -impl OnRuntimeUpgrade for ClearCorruptedUnifiedMappings { - fn on_runtime_upgrade() -> Weight { - let healthy_count = crate::EvmToNative::::iter().count() as u64 * 2; - log::info!("Total healthy entries: {healthy_count}"); - - let mut count = 0; - // translate will fail to decode valid entries and therefore will skip it, - // so this will remove only corrupt entries - EvmToNative::::translate(|key, value: EvmAddress| { - log::debug!("Remove corrupt key: {key:?} with value: {value:?}"); - count += 1; - None - }); - NativeToEvm::::translate(|key, value: T::AccountId| { - log::debug!("Remove corrupt key: {key:?} with value: {value:?}"); - count += 1; - None - }); - log::info!("Removed {count} corrupt entries"); - T::DbWeight::get().reads_writes(healthy_count + count, count) - } -} diff --git a/pallets/xc-asset-config/src/lib.rs b/pallets/xc-asset-config/src/lib.rs index 96dcd04ef..b788a4ef4 100644 --- a/pallets/xc-asset-config/src/lib.rs +++ b/pallets/xc-asset-config/src/lib.rs @@ -174,7 +174,6 @@ pub mod pallet { /// Can be used when receiving transaction specifying an asset directly, /// like transferring an asset from this chain to another. #[pallet::storage] - #[pallet::getter(fn asset_id_to_location)] pub type AssetIdToLocation = StorageMap<_, Twox64Concat, T::AssetId, VersionedLocation>; @@ -182,7 +181,6 @@ pub mod pallet { /// Can be used when receiving a multilocation XCM message to retrieve /// the corresponding asset in which tokens should me minted. #[pallet::storage] - #[pallet::getter(fn asset_location_to_id)] pub type AssetLocationToId = StorageMap<_, Twox64Concat, VersionedLocation, T::AssetId>; @@ -191,7 +189,6 @@ pub mod pallet { /// /// Not all asset types are supported for payment. If value exists here, it means it is supported. #[pallet::storage] - #[pallet::getter(fn asset_location_units_per_second)] pub type AssetLocationUnitsPerSecond = StorageMap<_, Twox64Concat, VersionedLocation, u128>; diff --git a/pallets/xc-asset-config/src/migrations.rs b/pallets/xc-asset-config/src/migrations.rs index b2e18ef4d..824257da8 100644 --- a/pallets/xc-asset-config/src/migrations.rs +++ b/pallets/xc-asset-config/src/migrations.rs @@ -19,7 +19,7 @@ use super::*; use frame_support::{ pallet_prelude::*, - traits::{Get, OnRuntimeUpgrade}, + traits::{Get, UncheckedOnRuntimeUpgrade}, }; use sp_std::{marker::PhantomData, vec::Vec}; use xcm::{IntoVersion, VersionedLocation}; @@ -40,7 +40,7 @@ pub mod versioned { } pub struct MigrationXcmV3(PhantomData); -impl OnRuntimeUpgrade for MigrationXcmV3 { +impl UncheckedOnRuntimeUpgrade for MigrationXcmV3 { fn on_runtime_upgrade() -> Weight { let version = Pallet::::on_chain_storage_version(); let mut consumed_weight = Weight::zero(); @@ -140,7 +140,7 @@ impl OnRuntimeUpgrade for MigrationXcmV3 { } pub struct MigrationXcmV4(PhantomData); -impl OnRuntimeUpgrade for MigrationXcmV4 { +impl UncheckedOnRuntimeUpgrade for MigrationXcmV4 { #[allow(deprecated)] fn on_runtime_upgrade() -> Weight { let mut consumed_weight = Weight::zero(); diff --git a/precompiles/assets-erc20/src/tests.rs b/precompiles/assets-erc20/src/tests.rs index 09fe0d15d..2bc5230c6 100644 --- a/precompiles/assets-erc20/src/tests.rs +++ b/precompiles/assets-erc20/src/tests.rs @@ -258,7 +258,7 @@ fn mint_is_ok() { value: mint_amount.into(), }, ) - .expect_cost(27261756) // 1 weight => 1 gas in mock + .expect_cost(23274756) // 1 weight => 1 gas in mock .expect_log(log3( LocalAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -347,7 +347,7 @@ fn burn_is_ok() { value: burn_amount.into(), }, ) - .expect_cost(34475756) // 1 weight => 1 gas in mock + .expect_cost(31801756) .expect_log(log3( LocalAssetId(0u128), SELECTOR_LOG_TRANSFER, diff --git a/precompiles/sr25519/src/lib.rs b/precompiles/sr25519/src/lib.rs index 20ca7d918..9d7dae81f 100644 --- a/precompiles/sr25519/src/lib.rs +++ b/precompiles/sr25519/src/lib.rs @@ -19,8 +19,8 @@ #![cfg_attr(not(feature = "std"), no_std)] use fp_evm::PrecompileHandle; -use sp_core::ConstU32; use sp_core::{crypto::UncheckedFrom, sr25519, H256}; +use sp_core::{ByteArray, ConstU32}; use sp_std::marker::PhantomData; use precompile_utils::prelude::*; @@ -49,7 +49,7 @@ impl Sr25519Precompile { // Parse pub key let public = sr25519::Public::unchecked_from(public); // Parse signature - let signature = if let Some(sig) = sr25519::Signature::from_slice(&signature.as_bytes()) { + let signature = if let Ok(sig) = sr25519::Signature::from_slice(&signature.as_bytes()) { sig } else { // Return `false` if signature length is wrong diff --git a/precompiles/substrate-ecdsa/src/lib.rs b/precompiles/substrate-ecdsa/src/lib.rs index 5a6becc72..fbb94b852 100644 --- a/precompiles/substrate-ecdsa/src/lib.rs +++ b/precompiles/substrate-ecdsa/src/lib.rs @@ -19,7 +19,7 @@ #![cfg_attr(not(feature = "std"), no_std)] use fp_evm::PrecompileHandle; -use sp_core::{ecdsa, ConstU32}; +use sp_core::{ecdsa, ByteArray, ConstU32}; use sp_std::marker::PhantomData; use sp_std::prelude::*; @@ -64,7 +64,7 @@ impl SubstrateEcdsaPrecompile { // Parse signature let signature_opt = ecdsa::Signature::from_slice(&signature_bytes[..]); - let signature = if let Some(sig) = signature_opt { + let signature = if let Ok(sig) = signature_opt { sig } else { // Return `false` if signature length is wrong diff --git a/precompiles/unified-accounts/src/mock.rs b/precompiles/unified-accounts/src/mock.rs index f3be51403..db8f6f0d1 100644 --- a/precompiles/unified-accounts/src/mock.rs +++ b/precompiles/unified-accounts/src/mock.rs @@ -20,9 +20,7 @@ use super::*; use fp_evm::{IsPrecompileResult, Precompile}; use frame_support::{construct_runtime, parameter_types, traits::ConstU64, weights::Weight}; -pub use pallet_evm::{ - AddressMapping, EnsureAddressNever, EnsureAddressRoot, PrecompileResult, PrecompileSet, -}; +pub use pallet_evm::{EnsureAddressNever, EnsureAddressRoot, PrecompileResult, PrecompileSet}; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; diff --git a/precompiles/xcm/src/mock.rs b/precompiles/xcm/src/mock.rs index f73630d5f..71653195e 100644 --- a/precompiles/xcm/src/mock.rs +++ b/precompiles/xcm/src/mock.rs @@ -457,6 +457,9 @@ impl xcm_executor::Config for XcmConfig { type SafeCallFilter = Everything; type Aliasers = Nothing; type TransactionalProcessor = (); + type HrmpNewChannelOpenRequestHandler = (); + type HrmpChannelAcceptedHandler = (); + type HrmpChannelClosingHandler = (); } parameter_types! { diff --git a/primitives/src/benchmarks.rs b/primitives/src/benchmarks.rs index c144d8a8c..9209c4d97 100644 --- a/primitives/src/benchmarks.rs +++ b/primitives/src/benchmarks.rs @@ -46,9 +46,10 @@ where /// Get the worst case holding for xcm benchmarks /// Scenario: Max allowed fungible assets (pallet_assets) pub fn worst_case_holding() -> Assets { - let fungibles = MAX_ASSETS - 1; - let fungibles_amount: u128 = 100_000; - let assets = (0..fungibles) + // Max number of assets - relay asset & native asset + let fungibles = MAX_ASSETS - 2; + let fungibles_amount: u128 = 1_000_000_000_000_000_000_000_000; + let assets = (1..=fungibles) .map(|i| Asset { id: AssetId(GeneralIndex(i as u128).into()), fun: Fungible(fungibles_amount * i as u128), @@ -56,7 +57,7 @@ where // adding relay asset as it is used in buy execution benchmarks .chain(core::iter::once(Asset { id: AssetId(Location::parent()), - fun: Fungible(u128::MAX), + fun: Fungible(fungibles_amount), })) .collect::>(); @@ -96,6 +97,15 @@ where } } - assets.into() + // Expand with native asset + assets + .into_iter() + .chain(core::iter::once(Asset { + id: AssetId(Location::here()), + fun: Fungible(fungibles_amount), + })) + .rev() + .collect::>() + .into() } } diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml index 5c3df5d91..757ffcc90 100644 --- a/runtime/astar/Cargo.toml +++ b/runtime/astar/Cargo.toml @@ -90,6 +90,7 @@ polkadot-runtime-common = { workspace = true } xcm = { workspace = true } xcm-builder = { workspace = true } xcm-executor = { workspace = true } +xcm-fee-payment-runtime-api = { workspace = true } # orml dependencies orml-oracle = { workspace = true } @@ -170,6 +171,7 @@ std = [ "pallet-proxy/std", "pallet-dapp-staking-v3/std", "pallet-dapp-staking-migration/std", + "xcm-fee-payment-runtime-api/std", "dapp-staking-v3-runtime-api/std", "pallet-inflation/std", "pallet-evm-precompile-dapp-staking-v3/std", diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index 5d7136f82..511211b00 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -26,18 +26,19 @@ use cumulus_primitives_core::AggregateMessageOrigin; use frame_support::{ construct_runtime, dispatch::DispatchClass, - genesis_builder_helper::{build_config, create_default_config}, + genesis_builder_helper::{build_state, get_preset}, parameter_types, traits::{ - AsEnsureOriginWithArg, ConstBool, ConstU32, Contains, Currency, FindAuthor, Get, Imbalance, + fungible::{Balanced, Credit}, + AsEnsureOriginWithArg, ConstBool, ConstU32, ConstU64, Contains, FindAuthor, Get, Imbalance, InstanceFilter, Nothing, OnFinalize, OnUnbalanced, Randomness, WithdrawReasons, }, weights::{ constants::{ BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, }, - ConstantMultiplier, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, - WeightToFeePolynomial, + ConstantMultiplier, Weight, WeightToFee as WeightToFeeT, WeightToFeeCoefficient, + WeightToFeeCoefficients, WeightToFeePolynomial, }, ConsensusEngineId, PalletId, }; @@ -67,6 +68,11 @@ use sp_runtime::{ ApplyExtrinsicResult, FixedPointNumber, FixedU128, Perbill, Permill, Perquintill, RuntimeDebug, }; use sp_std::{collections::btree_map::BTreeMap, prelude::*}; +use xcm::{ + v4::{AssetId as XcmAssetId, Location as XcmLocation}, + IntoVersion, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm, +}; +use xcm_fee_payment_runtime_api::Error as XcmPaymentApiError; use astar_primitives::{ dapp_staking::{ @@ -131,6 +137,7 @@ pub const fn contracts_deposit(items: u32, bytes: u32) -> Balance { /// Change this to adjust the block time. pub const MILLISECS_PER_BLOCK: u64 = 12000; pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK; + // Time is measured by number of blocks. pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber); pub const HOURS: BlockNumber = MINUTES * 60; @@ -411,12 +418,12 @@ impl pallet_dapp_staking_v3::Config for Runtime { } pub struct InflationPayoutPerBlock; -impl pallet_inflation::PayoutPerBlock for InflationPayoutPerBlock { - fn treasury(reward: NegativeImbalance) { - Balances::resolve_creating(&TreasuryPalletId::get().into_account_truncating(), reward); +impl pallet_inflation::PayoutPerBlock> for InflationPayoutPerBlock { + fn treasury(reward: Credit) { + let _ = Balances::resolve(&TreasuryPalletId::get().into_account_truncating(), reward); } - fn collators(reward: NegativeImbalance) { + fn collators(reward: Credit) { ToStakingPot::on_unbalanced(reward); } } @@ -489,6 +496,7 @@ impl pallet_aura::Config for Runtime { type DisabledValidators = (); type MaxAuthorities = ConstU32<250>; type AllowMultipleBlocksPerSlot = ConstBool; + type SlotDuration = ConstU64; } impl cumulus_pallet_aura_ext::Config for Runtime {} @@ -556,13 +564,11 @@ parameter_types! { pub TreasuryAccountId: AccountId = TreasuryPalletId::get().into_account_truncating(); } -type NegativeImbalance = >::NegativeImbalance; - pub struct ToStakingPot; -impl OnUnbalanced for ToStakingPot { - fn on_nonzero_unbalanced(amount: NegativeImbalance) { +impl OnUnbalanced> for ToStakingPot { + fn on_nonzero_unbalanced(amount: Credit) { let staking_pot = PotId::get().into_account_truncating(); - Balances::resolve_creating(&staking_pot, amount); + let _ = Balances::resolve(&staking_pot, amount); } } @@ -712,7 +718,7 @@ impl pallet_contracts::Config for Runtime { type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; type Debug = (); type Environment = (); - type Migrations = (); + type Migrations = (pallet_contracts::migration::v16::Migration,); type Xcm = (); type UploadOrigin = EnsureSigned<::AccountId>; type InstantiateOrigin = EnsureSigned<::AccountId>; @@ -759,7 +765,7 @@ impl WeightToFeePolynomial for WeightToFee { /// /// Similar to standard `WeightToFee` handler, but force uses the minimum multiplier. pub struct XcmWeightToFee; -impl frame_support::weights::WeightToFee for XcmWeightToFee { +impl WeightToFeeT for XcmWeightToFee { type Balance = Balance; fn weight_to_fee(n: &Weight) -> Self::Balance { @@ -768,27 +774,27 @@ impl frame_support::weights::WeightToFee for XcmWeightToFee { } pub struct DealWithFees; -impl OnUnbalanced for DealWithFees { - fn on_unbalanceds(mut fees_then_tips: impl Iterator) { +impl OnUnbalanced> for DealWithFees { + fn on_unbalanceds(mut fees_then_tips: impl Iterator>) { if let Some(fees) = fees_then_tips.next() { - // Burn 80% of fees, rest goes to collators, including 100% of the tips. - let (to_burn, mut collators) = fees.ration(80, 20); + // Burn 80% of fees, rest goes to collator, including 100% of the tips. + let (to_burn, mut collator) = fees.ration(80, 20); if let Some(tips) = fees_then_tips.next() { - tips.merge_into(&mut collators); + tips.merge_into(&mut collator); } - // burn part of fees + // burn part of the fees drop(to_burn); - // pay fees to collators - >::on_unbalanced(collators); + // pay fees to collator + >::on_unbalanced(collator); } } } impl pallet_transaction_payment::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; + type OnChargeTransaction = pallet_transaction_payment::FungibleAdapter; type WeightToFee = WeightToFee; type OperationalFeeMultiplier = OperationalFeeMultiplier; type FeeMultiplierUpdate = TargetedFeeAdjustment< @@ -844,7 +850,8 @@ impl> FindAuthor for FindAuthorTruncated { I: 'a + IntoIterator, { if let Some(author_index) = F::find_author(digests) { - let authority_id = Aura::authorities()[author_index as usize].clone(); + let authority_id = + pallet_aura::Authorities::::get()[author_index as usize].clone(); return Some(H160::from_slice(&authority_id.encode()[4..24])); } @@ -888,7 +895,7 @@ impl pallet_evm::Config for Runtime { type PrecompilesType = Precompiles; type PrecompilesValue = PrecompilesValue; type ChainId = ChainId; - type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter; + type OnChargeTransaction = pallet_evm::EVMFungibleAdapter; type BlockGasLimit = BlockGasLimit; type Timestamp = Timestamp; type OnCreate = (); @@ -947,6 +954,7 @@ impl pallet_message_queue::Config for Runtime { type HeapSize = ConstU32<{ 128 * 1048 }>; type MaxStale = ConstU32<8>; type ServiceWeight = MessageQueueServiceWeight; + type IdleMaxServiceWeight = MessageQueueServiceWeight; } /// The type used to represent the kinds of proxying allowed. @@ -1017,7 +1025,6 @@ impl InstanceFilter for ProxyType { | RuntimeCall::XcmpQueue(..) | RuntimeCall::PolkadotXcm(..) | RuntimeCall::CumulusXcm(..) - | RuntimeCall::DmpQueue(..) | RuntimeCall::XcAssetConfig(..) // Skip entire EVM pallet // Skip entire Ethereum pallet @@ -1218,7 +1225,6 @@ construct_runtime!( XcmpQueue: cumulus_pallet_xcmp_queue = 50, PolkadotXcm: pallet_xcm = 51, CumulusXcm: cumulus_pallet_xcm = 52, - DmpQueue: cumulus_pallet_dmp_queue = 53, XcAssetConfig: pallet_xc_asset_config = 54, XTokens: orml_xtokens = 55, MessageQueue: pallet_message_queue = 56, @@ -1289,17 +1295,23 @@ parameter_types! { ]; } +parameter_types! { + pub const DmpQueuePalletName: &'static str = "DmpQueue"; +} + /// All migrations that will run on the next runtime upgrade. /// /// Once done, migrations should be removed from the tuple. pub type Migrations = ( // permanent migration, do not remove pallet_xcm::migration::MigrateToLatestXcmVersion, - // XCM V3 -> V4 - pallet_xc_asset_config::migrations::versioned::V2ToV3, - pallet_identity::migration::versioned::V0ToV1, // dapp-staking dyn tier threshold migrations pallet_dapp_staking_v3::migration::versioned_migrations::V7ToV8, + frame_support::migrations::RemovePallet< + DmpQueuePalletName, + ::DbWeight, + >, + pallet_contracts::Migration, ); type EventRecord = frame_system::EventRecord< @@ -1424,7 +1436,7 @@ impl_runtime_apis! { } fn authorities() -> Vec { - Aura::authorities().into_inner() + pallet_aura::Authorities::::get().into_inner() } } @@ -1874,14 +1886,76 @@ impl_runtime_apis! { } } + impl xcm_fee_payment_runtime_api::XcmPaymentApi for Runtime { + fn query_acceptable_payment_assets(xcm_version: xcm::Version) -> Result, XcmPaymentApiError> { + if !matches!(xcm_version, xcm::v3::VERSION | xcm::v4::VERSION) { + return Err(XcmPaymentApiError::UnhandledXcmVersion); + } + + // Native asset is always supported + let native_asset_location: XcmLocation = XcmLocation::try_from(xcm_config::AstarLocation::get()) + .map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + + Ok([VersionedAssetId::V4(native_asset_location.into())] + .into_iter() + // Acquire foreign assets which have 'units per second' configured + .chain( + pallet_xc_asset_config::AssetLocationUnitsPerSecond::::iter_keys().filter_map(|asset_location| { + + match XcmLocation::try_from(asset_location) { + Ok(asset) => Some(VersionedAssetId::V4(asset.into())), + Err(_) => None, + } + }) + ).filter_map(|asset| asset.into_version(xcm_version).ok()).collect()) + } + + fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { + let native_asset_location = XcmLocation::try_from(xcm_config::AstarLocation::get()) + .map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + let native_asset = VersionedAssetId::V4(native_asset_location.into()); + + let asset = asset + .into_version(xcm::v4::VERSION) + .map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + + if native_asset == asset { + Ok(XcmWeightToFee::weight_to_fee(&weight)) + } else { + let asset_id: XcmAssetId = asset.try_into().map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + let versioned_location = VersionedLocation::V4(asset_id.0); + + match pallet_xc_asset_config::AssetLocationUnitsPerSecond::::get(versioned_location) { + Some(units_per_sec) => { + Ok(units_per_sec.saturating_mul(weight.ref_time() as u128) + / (WEIGHT_REF_TIME_PER_SECOND as u128)) + } + None => Err(XcmPaymentApiError::AssetNotFound), + } + } + } + + fn query_xcm_weight(message: VersionedXcm<()>) -> Result { + PolkadotXcm::query_xcm_weight(message) + } + + fn query_delivery_fees(destination: VersionedLocation, message: VersionedXcm<()>) -> Result { + PolkadotXcm::query_delivery_fees(destination, message) + } + } impl sp_genesis_builder::GenesisBuilder for Runtime { - fn create_default_config() -> Vec { - create_default_config::() + + fn build_state(config: Vec) -> sp_genesis_builder::Result { + build_state::(config) + } + + fn get_preset(id: &Option) -> Option> { + get_preset::(id, |_| None) } - fn build_config(config: Vec) -> sp_genesis_builder::Result { - build_config::(config) + fn preset_names() -> Vec { + vec![] } } @@ -1990,6 +2064,7 @@ impl_runtime_apis! { // destination location to be used in benchmarks fn valid_destination() -> Result { + assert_ok!(PolkadotXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(Location::parent()), xcm::v4::VERSION)); Ok(Location::parent()) } fn worst_case_holding(_depositable_count: u32) -> Assets { @@ -2014,11 +2089,13 @@ impl_runtime_apis! { } fn transact_origin_and_runtime_call() -> Result<(Location, RuntimeCall), BenchmarkError> { + assert_ok!(PolkadotXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(Location::parent()), xcm::v4::VERSION)); Ok((Location::parent(), frame_system::Call::remark_with_event { remark: vec![] }.into())) } fn subscribe_origin() -> Result { + assert_ok!(PolkadotXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(Location::parent()), xcm::v4::VERSION)); Ok(Location::parent()) } fn claimable_asset() @@ -2041,7 +2118,7 @@ impl_runtime_apis! { Err(BenchmarkError::Skip) } fn fee_asset() -> Result { - Ok((AssetId(Here.into()), 100).into()) + Ok((AssetId(Here.into()), 1_000_000_000_000_000_000u128).into()) } } @@ -2174,6 +2251,84 @@ impl_runtime_apis! { Ok(()) } + + fn trace_call( + header: &::Header, + from: H160, + to: H160, + data: Vec, + value: U256, + gas_limit: U256, + max_fee_per_gas: Option, + max_priority_fee_per_gas: Option, + nonce: Option, + access_list: Option)>>, + ) -> Result<(), sp_runtime::DispatchError> { + use moonbeam_evm_tracer::tracer::EvmTracer; + + // Initialize block: calls the "on_initialize" hook on every pallet + // in AllPalletsWithSystem. + Executive::initialize_block(header); + + EvmTracer::new().trace(|| { + let is_transactional = false; + let validate = true; + let without_base_extrinsic_weight = true; + + + // Estimated encoded transaction size must be based on the heaviest transaction + // type (EIP1559Transaction) to be compatible with all transaction types. + let mut estimated_transaction_len = data.len() + + // pallet ethereum index: 1 + // transact call index: 1 + // Transaction enum variant: 1 + // chain_id 8 bytes + // nonce: 32 + // max_priority_fee_per_gas: 32 + // max_fee_per_gas: 32 + // gas_limit: 32 + // action: 21 (enum varianrt + call address) + // value: 32 + // access_list: 1 (empty vec size) + // 65 bytes signature + 258; + + if access_list.is_some() { + estimated_transaction_len += access_list.encoded_size(); + } + + let gas_limit = gas_limit.min(u64::MAX.into()).low_u64(); + + let (weight_limit, proof_size_base_cost) = + match ::GasWeightMapping::gas_to_weight( + gas_limit, + without_base_extrinsic_weight + ) { + weight_limit if weight_limit.proof_size() > 0 => { + (Some(weight_limit), Some(estimated_transaction_len as u64)) + } + _ => (None, None), + }; + + let _ = ::Runner::call( + from, + to, + data, + value, + gas_limit, + max_fee_per_gas, + max_priority_fee_per_gas, + nonce, + access_list.unwrap_or_default(), + is_transactional, + validate, + weight_limit, + proof_size_base_cost, + ::config(), + ); + }); + Ok(()) + } } #[cfg(feature = "evm-tracing")] diff --git a/runtime/astar/src/weights/orml_oracle.rs b/runtime/astar/src/weights/orml_oracle.rs index 4e77452bc..96c84b9a8 100644 --- a/runtime/astar/src/weights/orml_oracle.rs +++ b/runtime/astar/src/weights/orml_oracle.rs @@ -59,17 +59,19 @@ impl orml_oracle::WeightInfo for SubstrateWeight { /// Proof: `Oracle::RawValues` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`) /// Storage: `Oracle::Values` (r:1 w:0) /// Proof: `Oracle::Values` (`max_values`: None, `max_size`: Some(33), added: 2508, mode: `MaxEncodedLen`) - /// The range of component `x` is `[1, 2]`. + /// The range of component `x` is `[0, 2]`. fn feed_values(x: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `280` // Estimated: `8634` - // Minimum execution time: 24_261_000 picoseconds. - Weight::from_parts(16_983_859, 8634) - // Standard Error: 56_112 - .saturating_add(Weight::from_parts(8_197_820, 0).saturating_mul(x.into())) - .saturating_add(T::DbWeight::get().reads(7_u64)) - .saturating_add(T::DbWeight::get().writes(2_u64)) + // Minimum execution time: 14_011_000 picoseconds. + Weight::from_parts(14_697_887, 8634) + // Standard Error: 30_083 + .saturating_add(Weight::from_parts(10_246_544, 0).saturating_mul(x.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(x.into()))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(x.into()))) } /// Storage: `Oracle::HasDispatched` (r:0 w:1) /// Proof: `Oracle::HasDispatched` (`max_values`: Some(1), `max_size`: Some(257), added: 752, mode: `MaxEncodedLen`) @@ -77,8 +79,8 @@ impl orml_oracle::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 981_000 picoseconds. - Weight::from_parts(1_018_000, 0) + // Minimum execution time: 885_000 picoseconds. + Weight::from_parts(966_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/runtime/astar/src/weights/pallet_assets.rs b/runtime/astar/src/weights/pallet_assets.rs index 903a7405d..ca675bd13 100644 --- a/runtime/astar/src/weights/pallet_assets.rs +++ b/runtime/astar/src/weights/pallet_assets.rs @@ -59,8 +59,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `729` // Estimated: `4194` - // Minimum execution time: 30_820_000 picoseconds. - Weight::from_parts(31_266_000, 4194) + // Minimum execution time: 31_624_000 picoseconds. + Weight::from_parts(32_046_000, 4194) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -72,8 +72,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `589` // Estimated: `4054` - // Minimum execution time: 18_408_000 picoseconds. - Weight::from_parts(18_936_000, 4054) + // Minimum execution time: 18_770_000 picoseconds. + Weight::from_parts(19_195_000, 4054) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -83,8 +83,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `360` // Estimated: `3687` - // Minimum execution time: 13_139_000 picoseconds. - Weight::from_parts(13_583_000, 3687) + // Minimum execution time: 13_244_000 picoseconds. + Weight::from_parts(13_497_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -99,10 +99,10 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `360 + c * (208 ±0)` // Estimated: `3687 + c * (2621 ±0)` - // Minimum execution time: 14_156_000 picoseconds. - Weight::from_parts(14_265_000, 3687) - // Standard Error: 5_925 - .saturating_add(Weight::from_parts(10_519_274, 0).saturating_mul(c.into())) + // Minimum execution time: 14_585_000 picoseconds. + Weight::from_parts(14_733_000, 3687) + // Standard Error: 6_063 + .saturating_add(Weight::from_parts(11_161_705, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -118,10 +118,10 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `509 + a * (86 ±0)` // Estimated: `3687 + a * (2635 ±0)` - // Minimum execution time: 17_702_000 picoseconds. - Weight::from_parts(17_928_000, 3687) - // Standard Error: 5_166 - .saturating_add(Weight::from_parts(11_136_424, 0).saturating_mul(a.into())) + // Minimum execution time: 17_353_000 picoseconds. + Weight::from_parts(17_528_000, 3687) + // Standard Error: 5_076 + .saturating_add(Weight::from_parts(11_635_204, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -138,8 +138,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 13_067_000 picoseconds. - Weight::from_parts(13_283_000, 3687) + // Minimum execution time: 12_759_000 picoseconds. + Weight::from_parts(13_097_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -151,8 +151,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 19_438_000 picoseconds. - Weight::from_parts(19_946_000, 3687) + // Minimum execution time: 19_437_000 picoseconds. + Weight::from_parts(19_855_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -164,8 +164,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `446` // Estimated: `3687` - // Minimum execution time: 27_127_000 picoseconds. - Weight::from_parts(27_594_000, 3687) + // Minimum execution time: 27_830_000 picoseconds. + Weight::from_parts(28_339_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -179,8 +179,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `518` // Estimated: `6232` - // Minimum execution time: 36_614_000 picoseconds. - Weight::from_parts(37_265_000, 6232) + // Minimum execution time: 38_208_000 picoseconds. + Weight::from_parts(38_736_000, 6232) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -194,8 +194,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `518` // Estimated: `6232` - // Minimum execution time: 33_003_000 picoseconds. - Weight::from_parts(33_656_000, 6232) + // Minimum execution time: 34_682_000 picoseconds. + Weight::from_parts(35_495_000, 6232) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -209,8 +209,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `518` // Estimated: `6232` - // Minimum execution time: 36_882_000 picoseconds. - Weight::from_parts(37_310_000, 6232) + // Minimum execution time: 38_048_000 picoseconds. + Weight::from_parts(38_914_000, 6232) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -222,8 +222,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `446` // Estimated: `3687` - // Minimum execution time: 16_186_000 picoseconds. - Weight::from_parts(16_530_000, 3687) + // Minimum execution time: 16_519_000 picoseconds. + Weight::from_parts(16_877_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -235,8 +235,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `446` // Estimated: `3687` - // Minimum execution time: 15_778_000 picoseconds. - Weight::from_parts(16_166_000, 3687) + // Minimum execution time: 16_428_000 picoseconds. + Weight::from_parts(16_733_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -246,8 +246,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `360` // Estimated: `3687` - // Minimum execution time: 12_299_000 picoseconds. - Weight::from_parts(12_676_000, 3687) + // Minimum execution time: 12_865_000 picoseconds. + Weight::from_parts(13_176_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -257,8 +257,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `360` // Estimated: `3687` - // Minimum execution time: 12_458_000 picoseconds. - Weight::from_parts(12_750_000, 3687) + // Minimum execution time: 12_509_000 picoseconds. + Weight::from_parts(12_949_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -270,8 +270,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 11_755_000 picoseconds. - Weight::from_parts(11_974_000, 3687) + // Minimum execution time: 11_782_000 picoseconds. + Weight::from_parts(11_965_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -281,8 +281,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 10_615_000 picoseconds. - Weight::from_parts(10_896_000, 3687) + // Minimum execution time: 10_650_000 picoseconds. + Weight::from_parts(10_957_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -292,16 +292,14 @@ impl pallet_assets::WeightInfo for SubstrateWeight { /// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(152), added: 2627, mode: `MaxEncodedLen`) /// The range of component `n` is `[0, 50]`. /// The range of component `s` is `[0, 50]`. - fn set_metadata(n: u32, s: u32, ) -> Weight { + fn set_metadata(n: u32, _s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 24_208_000 picoseconds. - Weight::from_parts(25_055_139, 3687) - // Standard Error: 587 - .saturating_add(Weight::from_parts(1_853, 0).saturating_mul(n.into())) - // Standard Error: 587 - .saturating_add(Weight::from_parts(1_126, 0).saturating_mul(s.into())) + // Minimum execution time: 24_904_000 picoseconds. + Weight::from_parts(25_756_770, 3687) + // Standard Error: 701 + .saturating_add(Weight::from_parts(3_256, 0).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -313,8 +311,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `502` // Estimated: `3687` - // Minimum execution time: 24_941_000 picoseconds. - Weight::from_parts(25_526_000, 3687) + // Minimum execution time: 25_836_000 picoseconds. + Weight::from_parts(26_118_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -328,12 +326,12 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `165` // Estimated: `3687` - // Minimum execution time: 10_839_000 picoseconds. - Weight::from_parts(11_355_717, 3687) - // Standard Error: 324 - .saturating_add(Weight::from_parts(1_760, 0).saturating_mul(n.into())) - // Standard Error: 324 - .saturating_add(Weight::from_parts(1_475, 0).saturating_mul(s.into())) + // Minimum execution time: 10_927_000 picoseconds. + Weight::from_parts(11_298_133, 3687) + // Standard Error: 303 + .saturating_add(Weight::from_parts(1_844, 0).saturating_mul(n.into())) + // Standard Error: 303 + .saturating_add(Weight::from_parts(1_980, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -345,8 +343,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `502` // Estimated: `3687` - // Minimum execution time: 24_852_000 picoseconds. - Weight::from_parts(25_223_000, 3687) + // Minimum execution time: 25_199_000 picoseconds. + Weight::from_parts(25_453_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -356,8 +354,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 9_959_000 picoseconds. - Weight::from_parts(10_217_000, 3687) + // Minimum execution time: 10_028_000 picoseconds. + Weight::from_parts(10_283_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -369,8 +367,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `360` // Estimated: `3687` - // Minimum execution time: 27_092_000 picoseconds. - Weight::from_parts(27_567_000, 3687) + // Minimum execution time: 27_684_000 picoseconds. + Weight::from_parts(27_995_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -386,8 +384,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `751` // Estimated: `6232` - // Minimum execution time: 53_099_000 picoseconds. - Weight::from_parts(53_854_000, 6232) + // Minimum execution time: 55_282_000 picoseconds. + Weight::from_parts(55_753_000, 6232) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -399,8 +397,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `542` // Estimated: `3687` - // Minimum execution time: 29_908_000 picoseconds. - Weight::from_parts(30_459_000, 3687) + // Minimum execution time: 30_083_000 picoseconds. + Weight::from_parts(30_645_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -412,8 +410,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `542` // Estimated: `3687` - // Minimum execution time: 30_029_000 picoseconds. - Weight::from_parts(30_591_000, 3687) + // Minimum execution time: 30_810_000 picoseconds. + Weight::from_parts(31_201_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -423,8 +421,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 11_029_000 picoseconds. - Weight::from_parts(11_391_000, 3687) + // Minimum execution time: 11_125_000 picoseconds. + Weight::from_parts(11_410_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -438,8 +436,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `500` // Estimated: `3687` - // Minimum execution time: 29_158_000 picoseconds. - Weight::from_parts(29_535_000, 3687) + // Minimum execution time: 29_181_000 picoseconds. + Weight::from_parts(29_666_000, 3687) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -451,8 +449,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 26_748_000 picoseconds. - Weight::from_parts(27_261_000, 3687) + // Minimum execution time: 27_314_000 picoseconds. + Weight::from_parts(27_744_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -466,8 +464,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `638` // Estimated: `3687` - // Minimum execution time: 28_074_000 picoseconds. - Weight::from_parts(28_547_000, 3687) + // Minimum execution time: 28_459_000 picoseconds. + Weight::from_parts(28_738_000, 3687) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -479,8 +477,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `497` // Estimated: `3687` - // Minimum execution time: 26_127_000 picoseconds. - Weight::from_parts(26_675_000, 3687) + // Minimum execution time: 26_600_000 picoseconds. + Weight::from_parts(26_760_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -492,8 +490,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `446` // Estimated: `3687` - // Minimum execution time: 16_270_000 picoseconds. - Weight::from_parts(16_634_000, 3687) + // Minimum execution time: 16_350_000 picoseconds. + Weight::from_parts(16_575_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/runtime/astar/src/weights/pallet_dapp_staking_v3.rs b/runtime/astar/src/weights/pallet_dapp_staking_v3.rs index 66e8a84d1..d7e546f98 100644 --- a/runtime/astar/src/weights/pallet_dapp_staking_v3.rs +++ b/runtime/astar/src/weights/pallet_dapp_staking_v3.rs @@ -48,15 +48,15 @@ use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use core::marker::PhantomData; use pallet_dapp_staking_v3::WeightInfo; -/// Weights for pallet_dapp_staking_v3 using the Substrate node and recommended hardware. +// Weights for pallet_dapp_staking_v3 using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn maintenance_mode() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_901_000 picoseconds. - Weight::from_parts(7_110_000, 0) + // Minimum execution time: 6_096_000 picoseconds. + Weight::from_parts(6_258_000, 0) } /// Storage: `DappStaking::IntegratedDApps` (r:1 w:1) /// Proof: `DappStaking::IntegratedDApps` (`max_values`: Some(65535), `max_size`: Some(116), added: 2096, mode: `MaxEncodedLen`) @@ -68,8 +68,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `3086` - // Minimum execution time: 12_920_000 picoseconds. - Weight::from_parts(13_049_000, 3086) + // Minimum execution time: 12_438_000 picoseconds. + Weight::from_parts(12_827_000, 3086) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -79,8 +79,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `97` // Estimated: `3086` - // Minimum execution time: 11_575_000 picoseconds. - Weight::from_parts(11_820_000, 3086) + // Minimum execution time: 10_853_000 picoseconds. + Weight::from_parts(11_125_000, 3086) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -90,8 +90,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `97` // Estimated: `3086` - // Minimum execution time: 12_043_000 picoseconds. - Weight::from_parts(12_399_000, 3086) + // Minimum execution time: 10_931_000 picoseconds. + Weight::from_parts(11_327_000, 3086) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -105,8 +105,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `97` // Estimated: `3086` - // Minimum execution time: 15_665_000 picoseconds. - Weight::from_parts(15_923_000, 3086) + // Minimum execution time: 15_048_000 picoseconds. + Weight::from_parts(15_439_000, 3086) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -124,8 +124,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `138` // Estimated: `4764` - // Minimum execution time: 28_847_000 picoseconds. - Weight::from_parts(29_269_000, 4764) + // Minimum execution time: 28_197_000 picoseconds. + Weight::from_parts(28_589_000, 4764) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -141,8 +141,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `158` // Estimated: `4764` - // Minimum execution time: 32_150_000 picoseconds. - Weight::from_parts(32_483_000, 4764) + // Minimum execution time: 31_817_000 picoseconds. + Weight::from_parts(32_385_000, 4764) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -158,8 +158,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `158` // Estimated: `4764` - // Minimum execution time: 29_439_000 picoseconds. - Weight::from_parts(30_316_000, 4764) + // Minimum execution time: 28_990_000 picoseconds. + Weight::from_parts(29_442_000, 4764) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -176,10 +176,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `190` // Estimated: `4764` - // Minimum execution time: 29_286_000 picoseconds. - Weight::from_parts(30_396_033, 4764) - // Standard Error: 2_822 - .saturating_add(Weight::from_parts(117_982, 0).saturating_mul(x.into())) + // Minimum execution time: 28_802_000 picoseconds. + Weight::from_parts(29_890_431, 4764) + // Standard Error: 2_601 + .saturating_add(Weight::from_parts(119_567, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -195,8 +195,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `200` // Estimated: `4764` - // Minimum execution time: 26_357_000 picoseconds. - Weight::from_parts(26_804_000, 4764) + // Minimum execution time: 26_863_000 picoseconds. + Weight::from_parts(27_357_000, 4764) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -218,8 +218,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `274` // Estimated: `4764` - // Minimum execution time: 39_953_000 picoseconds. - Weight::from_parts(40_495_000, 4764) + // Minimum execution time: 40_414_000 picoseconds. + Weight::from_parts(41_054_000, 4764) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -241,8 +241,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `459` // Estimated: `4764` - // Minimum execution time: 43_935_000 picoseconds. - Weight::from_parts(44_485_000, 4764) + // Minimum execution time: 44_604_000 picoseconds. + Weight::from_parts(45_089_000, 4764) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -261,10 +261,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `541` // Estimated: `4764` - // Minimum execution time: 44_282_000 picoseconds. - Weight::from_parts(43_704_387, 4764) - // Standard Error: 2_999 - .saturating_add(Weight::from_parts(1_901_320, 0).saturating_mul(x.into())) + // Minimum execution time: 48_438_000 picoseconds. + Weight::from_parts(47_832_086, 4764) + // Standard Error: 3_498 + .saturating_add(Weight::from_parts(1_886_107, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -281,10 +281,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `519` // Estimated: `4764` - // Minimum execution time: 42_099_000 picoseconds. - Weight::from_parts(41_482_351, 4764) - // Standard Error: 3_082 - .saturating_add(Weight::from_parts(1_875_239, 0).saturating_mul(x.into())) + // Minimum execution time: 46_018_000 picoseconds. + Weight::from_parts(45_177_385, 4764) + // Standard Error: 3_286 + .saturating_add(Weight::from_parts(1_902_280, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -298,8 +298,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `275` // Estimated: `3775` - // Minimum execution time: 32_801_000 picoseconds. - Weight::from_parts(33_233_000, 3775) + // Minimum execution time: 35_985_000 picoseconds. + Weight::from_parts(36_345_000, 3775) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -311,8 +311,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `2672` // Estimated: `5113` - // Minimum execution time: 50_552_000 picoseconds. - Weight::from_parts(51_566_000, 5113) + // Minimum execution time: 53_382_000 picoseconds. + Weight::from_parts(55_179_000, 5113) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -332,8 +332,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `322` // Estimated: `4764` - // Minimum execution time: 36_548_000 picoseconds. - Weight::from_parts(37_174_000, 4764) + // Minimum execution time: 35_930_000 picoseconds. + Weight::from_parts(36_779_000, 4764) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -350,10 +350,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `257 + x * (73 ±0)` // Estimated: `4764 + x * (2653 ±0)` - // Minimum execution time: 36_536_000 picoseconds. - Weight::from_parts(32_923_068, 4764) - // Standard Error: 7_141 - .saturating_add(Weight::from_parts(4_979_475, 0).saturating_mul(x.into())) + // Minimum execution time: 35_936_000 picoseconds. + Weight::from_parts(32_624_459, 4764) + // Standard Error: 7_148 + .saturating_add(Weight::from_parts(4_932_135, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) @@ -366,8 +366,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `1486` - // Minimum execution time: 8_966_000 picoseconds. - Weight::from_parts(9_216_000, 1486) + // Minimum execution time: 8_769_000 picoseconds. + Weight::from_parts(8_948_000, 1486) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: `DappStaking::CurrentEraInfo` (r:1 w:1) @@ -384,8 +384,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `334` // Estimated: `4254` - // Minimum execution time: 25_581_000 picoseconds. - Weight::from_parts(26_206_000, 4254) + // Minimum execution time: 24_922_000 picoseconds. + Weight::from_parts(25_631_000, 4254) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -409,8 +409,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `841` // Estimated: `4254` - // Minimum execution time: 41_102_000 picoseconds. - Weight::from_parts(41_895_000, 4254) + // Minimum execution time: 40_873_000 picoseconds. + Weight::from_parts(42_059_000, 4254) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -430,8 +430,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `386` // Estimated: `4254` - // Minimum execution time: 28_342_000 picoseconds. - Weight::from_parts(28_987_000, 4254) + // Minimum execution time: 28_009_000 picoseconds. + Weight::from_parts(28_696_000, 4254) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -444,10 +444,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `152 + x * (32 ±0)` // Estimated: `3061 + x * (2071 ±0)` - // Minimum execution time: 6_941_000 picoseconds. - Weight::from_parts(11_645_090, 3061) - // Standard Error: 3_059 - .saturating_add(Weight::from_parts(2_388_533, 0).saturating_mul(x.into())) + // Minimum execution time: 6_611_000 picoseconds. + Weight::from_parts(10_996_104, 3061) + // Standard Error: 2_861 + .saturating_add(Weight::from_parts(2_367_291, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(Weight::from_parts(0, 2071).saturating_mul(x.into())) @@ -462,8 +462,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `293` // Estimated: `4254` - // Minimum execution time: 7_727_000 picoseconds. - Weight::from_parts(7_910_000, 4254) + // Minimum execution time: 8_185_000 picoseconds. + Weight::from_parts(8_340_000, 4254) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } diff --git a/runtime/astar/src/weights/pallet_inflation.rs b/runtime/astar/src/weights/pallet_inflation.rs index c36c1ed6c..3e934b9ce 100644 --- a/runtime/astar/src/weights/pallet_inflation.rs +++ b/runtime/astar/src/weights/pallet_inflation.rs @@ -51,45 +51,45 @@ use pallet_inflation::WeightInfo; /// Weights for pallet_inflation using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { - /// Storage: Inflation InflationParams (r:0 w:1) - /// Proof: Inflation InflationParams (max_values: Some(1), max_size: Some(64), added: 559, mode: MaxEncodedLen) + /// Storage: `Inflation::InflationParams` (r:0 w:1) + /// Proof: `Inflation::InflationParams` (`max_values`: Some(1), `max_size`: Some(64), added: 559, mode: `MaxEncodedLen`) fn force_set_inflation_params() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_868_000 picoseconds. - Weight::from_parts(9_183_000, 0) + // Minimum execution time: 6_322_000 picoseconds. + Weight::from_parts(6_506_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: Inflation InflationParams (r:1 w:0) - /// Proof: Inflation InflationParams (max_values: Some(1), max_size: Some(64), added: 559, mode: MaxEncodedLen) + /// Storage: `Inflation::InflationParams` (r:1 w:0) + /// Proof: `Inflation::InflationParams` (`max_values`: Some(1), `max_size`: Some(64), added: 559, mode: `MaxEncodedLen`) fn force_inflation_recalculation() -> Weight { // Proof Size summary in bytes: // Measured: `40` // Estimated: `1549` - // Minimum execution time: 13_226_000 picoseconds. - Weight::from_parts(13_460_000, 1549) + // Minimum execution time: 9_527_000 picoseconds. + Weight::from_parts(9_858_000, 1549) .saturating_add(T::DbWeight::get().reads(1_u64)) } - /// Storage: Inflation InflationParams (r:1 w:0) - /// Proof: Inflation InflationParams (max_values: Some(1), max_size: Some(64), added: 559, mode: MaxEncodedLen) + /// Storage: `Inflation::InflationParams` (r:1 w:0) + /// Proof: `Inflation::InflationParams` (`max_values`: Some(1), `max_size`: Some(64), added: 559, mode: `MaxEncodedLen`) fn recalculation() -> Weight { // Proof Size summary in bytes: // Measured: `58` // Estimated: `1549` - // Minimum execution time: 13_150_000 picoseconds. - Weight::from_parts(13_395_000, 1549) + // Minimum execution time: 8_939_000 picoseconds. + Weight::from_parts(9_083_000, 1549) .saturating_add(T::DbWeight::get().reads(1_u64)) } - /// Storage: System Account (r:2 w:2) - /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) + /// Storage: `System::Account` (r:2 w:2) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn hooks_without_recalculation() -> Weight { // Proof Size summary in bytes: // Measured: `39` // Estimated: `6196` - // Minimum execution time: 39_539_000 picoseconds. - Weight::from_parts(40_043_000, 6196) + // Minimum execution time: 36_169_000 picoseconds. + Weight::from_parts(36_480_000, 6196) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } -} \ No newline at end of file +} diff --git a/runtime/astar/src/weights/pallet_xcm.rs b/runtime/astar/src/weights/pallet_xcm.rs index d1ad721b4..464a70068 100644 --- a/runtime/astar/src/weights/pallet_xcm.rs +++ b/runtime/astar/src/weights/pallet_xcm.rs @@ -60,8 +60,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `76` // Estimated: `3541` - // Minimum execution time: 16_397_000 picoseconds. - Weight::from_parts(16_802_000, 3541) + // Minimum execution time: 17_715_000 picoseconds. + Weight::from_parts(18_086_000, 3541) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -90,8 +90,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `278` // Estimated: `3743` - // Minimum execution time: 73_426_000 picoseconds. - Weight::from_parts(74_419_000, 3743) + // Minimum execution time: 81_534_000 picoseconds. + Weight::from_parts(81_915_000, 3743) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -119,16 +119,16 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 7_335_000 picoseconds. - Weight::from_parts(7_569_000, 0) + // Minimum execution time: 7_330_000 picoseconds. + Weight::from_parts(7_605_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } fn force_default_xcm_version() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_376_000 picoseconds. - Weight::from_parts(2_553_000, 0) + // Minimum execution time: 2_105_000 picoseconds. + Weight::from_parts(2_242_000, 0) } /// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1) /// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`) @@ -146,8 +146,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `76` // Estimated: `3541` - // Minimum execution time: 20_539_000 picoseconds. - Weight::from_parts(20_738_000, 3541) + // Minimum execution time: 22_226_000 picoseconds. + Weight::from_parts(22_715_000, 3541) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -165,8 +165,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `135` // Estimated: `3600` - // Minimum execution time: 20_638_000 picoseconds. - Weight::from_parts(21_124_000, 3600) + // Minimum execution time: 22_009_000 picoseconds. + Weight::from_parts(22_558_000, 3600) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -176,8 +176,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_256_000 picoseconds. - Weight::from_parts(2_471_000, 0) + // Minimum execution time: 2_125_000 picoseconds. + Weight::from_parts(2_209_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2) @@ -186,8 +186,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `23` // Estimated: `13388` - // Minimum execution time: 13_329_000 picoseconds. - Weight::from_parts(13_915_000, 13388) + // Minimum execution time: 13_670_000 picoseconds. + Weight::from_parts(14_125_000, 13388) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -197,8 +197,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `27` // Estimated: `13392` - // Minimum execution time: 13_722_000 picoseconds. - Weight::from_parts(13_981_000, 13392) + // Minimum execution time: 13_729_000 picoseconds. + Weight::from_parts(14_127_000, 13392) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -208,8 +208,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `38` // Estimated: `15878` - // Minimum execution time: 15_546_000 picoseconds. - Weight::from_parts(15_958_000, 15878) + // Minimum execution time: 15_598_000 picoseconds. + Weight::from_parts(15_975_000, 15878) .saturating_add(T::DbWeight::get().reads(6_u64)) } /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1) @@ -224,8 +224,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `110` // Estimated: `6050` - // Minimum execution time: 19_427_000 picoseconds. - Weight::from_parts(19_904_000, 6050) + // Minimum execution time: 21_422_000 picoseconds. + Weight::from_parts(21_813_000, 6050) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -235,8 +235,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `70` // Estimated: `10960` - // Minimum execution time: 9_811_000 picoseconds. - Weight::from_parts(10_120_000, 10960) + // Minimum execution time: 9_651_000 picoseconds. + Weight::from_parts(10_063_000, 10960) .saturating_add(T::DbWeight::get().reads(4_u64)) } /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2) @@ -245,8 +245,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `34` // Estimated: `13399` - // Minimum execution time: 14_151_000 picoseconds. - Weight::from_parts(14_597_000, 13399) + // Minimum execution time: 14_375_000 picoseconds. + Weight::from_parts(14_689_000, 13399) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -262,8 +262,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `110` // Estimated: `13475` - // Minimum execution time: 26_263_000 picoseconds. - Weight::from_parts(26_963_000, 13475) + // Minimum execution time: 28_216_000 picoseconds. + Weight::from_parts(28_846_000, 13475) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -275,8 +275,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `1485` - // Minimum execution time: 2_160_000 picoseconds. - Weight::from_parts(2_313_000, 1485) + // Minimum execution time: 2_138_000 picoseconds. + Weight::from_parts(2_286_000, 1485) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -286,8 +286,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `7576` // Estimated: `11041` - // Minimum execution time: 21_847_000 picoseconds. - Weight::from_parts(22_199_000, 11041) + // Minimum execution time: 21_678_000 picoseconds. + Weight::from_parts(21_873_000, 11041) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -297,8 +297,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `24` // Estimated: `3489` - // Minimum execution time: 30_973_000 picoseconds. - Weight::from_parts(31_665_000, 3489) + // Minimum execution time: 36_205_000 picoseconds. + Weight::from_parts(36_995_000, 3489) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/runtime/astar/src/weights/xcm/fungible.rs b/runtime/astar/src/weights/xcm/fungible.rs index bbb0a36ff..a18f31c09 100644 --- a/runtime/astar/src/weights/xcm/fungible.rs +++ b/runtime/astar/src/weights/xcm/fungible.rs @@ -72,10 +72,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn transfer_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `508` + // Measured: `542` // Estimated: `6232` - // Minimum execution time: 46_420_000 picoseconds. - Weight::from_parts(47_162_000, 6232) + // Minimum execution time: 43_120_000 picoseconds. + Weight::from_parts(43_722_000, 6232) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -97,10 +97,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn transfer_reserve_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `582` + // Measured: `650` // Estimated: `6232` - // Minimum execution time: 65_727_000 picoseconds. - Weight::from_parts(66_724_000, 6232) + // Minimum execution time: 60_287_000 picoseconds. + Weight::from_parts(61_082_000, 6232) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -132,10 +132,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn withdraw_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `1919` - // Estimated: `5384` - // Minimum execution time: 51_262_000 picoseconds. - Weight::from_parts(52_184_000, 5384) + // Measured: `1952` + // Estimated: `5417` + // Minimum execution time: 53_528_000 picoseconds. + Weight::from_parts(54_132_000, 5417) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -143,8 +143,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_917_000 picoseconds. - Weight::from_parts(4_020_000, 0) + // Minimum execution time: 1_055_000 picoseconds. + Weight::from_parts(1_089_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -156,10 +156,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn initiate_reserve_withdraw() -> Weight { // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 403_972_000 picoseconds. - Weight::from_parts(411_024_000, 3539) + // Measured: `108` + // Estimated: `3573` + // Minimum execution time: 50_334_000 picoseconds. + Weight::from_parts(50_707_000, 3573) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -173,160 +173,17 @@ impl WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn deposit_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `1659` - // Estimated: `5124` - // Minimum execution time: 42_469_000 picoseconds. - Weight::from_parts(43_416_000, 5124) + // Measured: `1692` + // Estimated: `5157` + // Minimum execution time: 40_497_000 picoseconds. + Weight::from_parts(41_233_000, 5157) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn deposit_reserve_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `1733` - // Estimated: `5198` - // Minimum execution time: 64_346_000 picoseconds. - Weight::from_parts(65_769_000, 5198) - .saturating_add(T::DbWeight::get().reads(8_u64)) - .saturating_add(T::DbWeight::get().writes(4_u64)) - } -} - -// For backwards compatibility and tests -impl WeightInfo for () { - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:2 w:2) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn transfer_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `508` - // Estimated: `6232` - // Minimum execution time: 46_420_000 picoseconds. - Weight::from_parts(47_162_000, 6232) - .saturating_add(RocksDbWeight::get().reads(5_u64)) - .saturating_add(RocksDbWeight::get().writes(4_u64)) - } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:2 w:2) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn transfer_reserve_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `582` - // Estimated: `6232` - // Minimum execution time: 65_727_000 picoseconds. - Weight::from_parts(66_724_000, 6232) - .saturating_add(RocksDbWeight::get().reads(9_u64)) - .saturating_add(RocksDbWeight::get().writes(5_u64)) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn receive_teleported_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn initiate_teleport() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn withdraw_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `1919` - // Estimated: `5384` - // Minimum execution time: 51_262_000 picoseconds. - Weight::from_parts(52_184_000, 5384) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(3_u64)) - } - fn reserve_asset_deposited() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 3_917_000 picoseconds. - Weight::from_parts(4_020_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn initiate_reserve_withdraw() -> Weight { - // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 403_972_000 picoseconds. - Weight::from_parts(411_024_000, 3539) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn deposit_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `1659` - // Estimated: `5124` - // Minimum execution time: 42_469_000 picoseconds. - Weight::from_parts(43_416_000, 5124) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(3_u64)) - } /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `Assets::Asset` (r:1 w:1) @@ -335,21 +192,17 @@ impl WeightInfo for () { /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn deposit_reserve_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `1733` - // Estimated: `5198` - // Minimum execution time: 64_346_000 picoseconds. - Weight::from_parts(65_769_000, 5198) - .saturating_add(RocksDbWeight::get().reads(8_u64)) - .saturating_add(RocksDbWeight::get().writes(4_u64)) + // Measured: `1800` + // Estimated: `5265` + // Minimum execution time: 75_285_000 picoseconds. + Weight::from_parts(76_026_000, 5265) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } } diff --git a/runtime/astar/src/weights/xcm/generic.rs b/runtime/astar/src/weights/xcm/generic.rs index 6871922c4..a629c2db5 100644 --- a/runtime/astar/src/weights/xcm/generic.rs +++ b/runtime/astar/src/weights/xcm/generic.rs @@ -101,20 +101,13 @@ impl WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn buy_execution() -> Weight { // Proof Size summary in bytes: - // Measured: `2296` - // Estimated: `5761` - // Minimum execution time: 105_002_000 picoseconds. - Weight::from_parts(108_931_000, 5761) + // Measured: `717` + // Estimated: `4182` + // Minimum execution time: 16_217_000 picoseconds. + Weight::from_parts(16_433_000, 4182) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } - fn expect_pallet() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 5_852_000 picoseconds. - Weight::from_parts(6_089_000, 0) - } /// Storage: `Benchmark::Override` (r:0 w:0) /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) fn exchange_asset() -> Weight { @@ -197,10 +190,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn report_holding() -> Weight { // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 346_909_000 picoseconds. - Weight::from_parts(352_602_000, 3539) + // Measured: `131` + // Estimated: `3596` + // Minimum execution time: 46_828_000 picoseconds. + Weight::from_parts(47_506_000, 3596) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -210,58 +203,58 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `3465` - // Minimum execution time: 8_607_000 picoseconds. - Weight::from_parts(8_813_000, 3465) + // Minimum execution time: 4_837_000 picoseconds. + Weight::from_parts(5_048_000, 3465) .saturating_add(T::DbWeight::get().reads(1_u64)) } fn transact() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 12_103_000 picoseconds. - Weight::from_parts(12_304_000, 0) + // Minimum execution time: 7_561_000 picoseconds. + Weight::from_parts(7_745_000, 0) } fn refund_surplus() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_737_000 picoseconds. - Weight::from_parts(4_943_000, 0) + // Minimum execution time: 3_983_000 picoseconds. + Weight::from_parts(4_077_000, 0) } fn set_error_handler() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_764_000 picoseconds. - Weight::from_parts(2_853_000, 0) + // Minimum execution time: 708_000 picoseconds. + Weight::from_parts(738_000, 0) } fn set_appendix() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_793_000 picoseconds. - Weight::from_parts(2_876_000, 0) + // Minimum execution time: 702_000 picoseconds. + Weight::from_parts(720_000, 0) } fn clear_error() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_746_000 picoseconds. - Weight::from_parts(2_828_000, 0) + // Minimum execution time: 640_000 picoseconds. + Weight::from_parts(661_000, 0) } fn descend_origin() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_348_000 picoseconds. - Weight::from_parts(3_482_000, 0) + // Minimum execution time: 688_000 picoseconds. + Weight::from_parts(719_000, 0) } fn clear_origin() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_730_000 picoseconds. - Weight::from_parts(2_824_000, 0) + // Minimum execution time: 646_000 picoseconds. + Weight::from_parts(689_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -273,10 +266,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn report_error() -> Weight { // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 21_279_000 picoseconds. - Weight::from_parts(21_644_000, 3539) + // Measured: `131` + // Estimated: `3596` + // Minimum execution time: 15_315_000 picoseconds. + Weight::from_parts(15_654_000, 3596) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -284,10 +277,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`) fn claim_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `23` - // Estimated: `3488` - // Minimum execution time: 12_317_000 picoseconds. - Weight::from_parts(12_590_000, 3488) + // Measured: `24` + // Estimated: `3489` + // Minimum execution time: 7_889_000 picoseconds. + Weight::from_parts(8_038_000, 3489) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -295,8 +288,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_715_000 picoseconds. - Weight::from_parts(2_780_000, 0) + // Minimum execution time: 605_000 picoseconds. + Weight::from_parts(636_000, 0) } /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1) /// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`) @@ -308,10 +301,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn subscribe_version() -> Weight { // Proof Size summary in bytes: - // Measured: `42` - // Estimated: `3507` - // Minimum execution time: 22_632_000 picoseconds. - Weight::from_parts(22_943_000, 3507) + // Measured: `99` + // Estimated: `3564` + // Minimum execution time: 16_393_000 picoseconds. + Weight::from_parts(16_762_000, 3564) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -321,44 +314,44 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_554_000 picoseconds. - Weight::from_parts(4_749_000, 0) + // Minimum execution time: 2_326_000 picoseconds. + Weight::from_parts(2_480_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } fn burn_asset() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 120_072_000 picoseconds. - Weight::from_parts(123_411_000, 0) + // Minimum execution time: 21_864_000 picoseconds. + Weight::from_parts(22_349_000, 0) } fn expect_asset() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_755_000 picoseconds. - Weight::from_parts(11_914_000, 0) + // Minimum execution time: 7_399_000 picoseconds. + Weight::from_parts(7_599_000, 0) } fn expect_origin() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_830_000 picoseconds. - Weight::from_parts(2_913_000, 0) + // Minimum execution time: 642_000 picoseconds. + Weight::from_parts(671_000, 0) } fn expect_error() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_664_000 picoseconds. - Weight::from_parts(2_789_000, 0) + // Minimum execution time: 607_000 picoseconds. + Weight::from_parts(641_000, 0) } fn expect_transact_status() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_865_000 picoseconds. - Weight::from_parts(2_977_000, 0) + // Minimum execution time: 812_000 picoseconds. + Weight::from_parts(847_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -370,356 +363,19 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn query_pallet() -> Weight { // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 26_145_000 picoseconds. - Weight::from_parts(26_530_000, 3539) + // Measured: `131` + // Estimated: `3596` + // Minimum execution time: 20_485_000 picoseconds. + Weight::from_parts(20_677_000, 3596) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn report_transact_status() -> Weight { - // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 21_368_000 picoseconds. - Weight::from_parts(22_050_000, 3539) - .saturating_add(T::DbWeight::get().reads(4_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - } - fn clear_transact_status() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_759_000 picoseconds. - Weight::from_parts(2_849_000, 0) - } - fn set_topic() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_723_000 picoseconds. - Weight::from_parts(2_797_000, 0) - } - fn clear_topic() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_684_000 picoseconds. - Weight::from_parts(2_757_000, 0) - } - fn set_fees_mode() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_685_000 picoseconds. - Weight::from_parts(2_790_000, 0) - } - fn unpaid_execution() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_819_000 picoseconds. - Weight::from_parts(2_895_000, 0) - } -} - -// For backwards compatibility and tests -impl WeightInfo for () { - /// Storage: `XcAssetConfig::AssetLocationUnitsPerSecond` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationUnitsPerSecond` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn buy_execution() -> Weight { - // Proof Size summary in bytes: - // Measured: `2296` - // Estimated: `5761` - // Minimum execution time: 105_002_000 picoseconds. - Weight::from_parts(108_931_000, 5761) - .saturating_add(RocksDbWeight::get().reads(5_u64)) - .saturating_add(RocksDbWeight::get().writes(3_u64)) - } fn expect_pallet() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 5_852_000 picoseconds. - Weight::from_parts(6_089_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn exchange_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn export_message() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn lock_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn unlock_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn note_unlockable() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn request_unlock() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn universal_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn alias_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn report_holding() -> Weight { - // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 346_909_000 picoseconds. - Weight::from_parts(352_602_000, 3539) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - /// Storage: `PolkadotXcm::Queries` (r:1 w:0) - /// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn query_response() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `3465` - // Minimum execution time: 8_607_000 picoseconds. - Weight::from_parts(8_813_000, 3465) - .saturating_add(RocksDbWeight::get().reads(1_u64)) - } - fn transact() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 12_103_000 picoseconds. - Weight::from_parts(12_304_000, 0) - } - fn refund_surplus() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 4_737_000 picoseconds. - Weight::from_parts(4_943_000, 0) - } - fn set_error_handler() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_764_000 picoseconds. - Weight::from_parts(2_853_000, 0) - } - fn set_appendix() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_793_000 picoseconds. - Weight::from_parts(2_876_000, 0) - } - fn clear_error() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_746_000 picoseconds. - Weight::from_parts(2_828_000, 0) - } - fn descend_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 3_348_000 picoseconds. - Weight::from_parts(3_482_000, 0) - } - fn clear_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_730_000 picoseconds. - Weight::from_parts(2_824_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn report_error() -> Weight { - // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 21_279_000 picoseconds. - Weight::from_parts(21_644_000, 3539) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - /// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1) - /// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn claim_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `23` - // Estimated: `3488` - // Minimum execution time: 12_317_000 picoseconds. - Weight::from_parts(12_590_000, 3488) - .saturating_add(RocksDbWeight::get().reads(1_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - fn trap() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_715_000 picoseconds. - Weight::from_parts(2_780_000, 0) - } - /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1) - /// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn subscribe_version() -> Weight { - // Proof Size summary in bytes: - // Measured: `42` - // Estimated: `3507` - // Minimum execution time: 22_632_000 picoseconds. - Weight::from_parts(22_943_000, 3507) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(2_u64)) - } - /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:0 w:1) - /// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn unsubscribe_version() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 4_554_000 picoseconds. - Weight::from_parts(4_749_000, 0) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - fn burn_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 120_072_000 picoseconds. - Weight::from_parts(123_411_000, 0) - } - fn expect_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 11_755_000 picoseconds. - Weight::from_parts(11_914_000, 0) - } - fn expect_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_830_000 picoseconds. - Weight::from_parts(2_913_000, 0) - } - fn expect_error() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_664_000 picoseconds. - Weight::from_parts(2_789_000, 0) - } - fn expect_transact_status() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_865_000 picoseconds. - Weight::from_parts(2_977_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn query_pallet() -> Weight { - // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 26_145_000 picoseconds. - Weight::from_parts(26_530_000, 3539) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) + // Minimum execution time: 4_484_000 picoseconds. + Weight::from_parts(4_591_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -731,46 +387,46 @@ impl WeightInfo for () { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn report_transact_status() -> Weight { // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 21_368_000 picoseconds. - Weight::from_parts(22_050_000, 3539) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) + // Measured: `131` + // Estimated: `3596` + // Minimum execution time: 15_208_000 picoseconds. + Weight::from_parts(15_626_000, 3596) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn clear_transact_status() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_759_000 picoseconds. - Weight::from_parts(2_849_000, 0) + // Minimum execution time: 649_000 picoseconds. + Weight::from_parts(684_000, 0) } fn set_topic() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_723_000 picoseconds. - Weight::from_parts(2_797_000, 0) + // Minimum execution time: 596_000 picoseconds. + Weight::from_parts(649_000, 0) } fn clear_topic() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_684_000 picoseconds. - Weight::from_parts(2_757_000, 0) + // Minimum execution time: 602_000 picoseconds. + Weight::from_parts(648_000, 0) } fn set_fees_mode() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_685_000 picoseconds. - Weight::from_parts(2_790_000, 0) + // Minimum execution time: 605_000 picoseconds. + Weight::from_parts(647_000, 0) } fn unpaid_execution() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_819_000 picoseconds. - Weight::from_parts(2_895_000, 0) + // Minimum execution time: 654_000 picoseconds. + Weight::from_parts(695_000, 0) } } diff --git a/runtime/astar/src/xcm_config.rs b/runtime/astar/src/xcm_config.rs index a3a306592..77e44a3fe 100644 --- a/runtime/astar/src/xcm_config.rs +++ b/runtime/astar/src/xcm_config.rs @@ -275,6 +275,10 @@ impl xcm_executor::Config for XcmConfig { type SafeCallFilter = SafeCallFilter; type Aliasers = Nothing; type TransactionalProcessor = FrameTransactionalProcessor; + + type HrmpNewChannelOpenRequestHandler = (); + type HrmpChannelAcceptedHandler = (); + type HrmpChannelClosingHandler = (); } /// Local origins on this chain are allowed to dispatch XCM sends/executions. @@ -337,19 +341,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight; } -parameter_types! { - pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent; -} - -// TODO: This pallet should be removed after the lazy migration is done and -// event `Completed` is emitted. -// https://github.com/paritytech/polkadot-sdk/pull/1246 -impl cumulus_pallet_dmp_queue::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type DmpSink = frame_support::traits::EnqueueWithOrigin; - type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight; -} - parameter_types! { /// The absolute location in perspective of the whole network. pub AstarLocationAbsolute: Location = Location { diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs index ee32d7a9f..a76b1007d 100644 --- a/runtime/local/src/lib.rs +++ b/runtime/local/src/lib.rs @@ -26,13 +26,13 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); use frame_support::{ construct_runtime, - genesis_builder_helper::{build_config, create_default_config}, + genesis_builder_helper::{build_state, get_preset}, parameter_types, traits::{ - fungible::HoldConsideration, + fungible::{Balanced, Credit, HoldConsideration}, tokens::{PayFromAccount, UnityAssetBalanceConversion}, - AsEnsureOriginWithArg, ConstU128, ConstU32, ConstU64, Currency, EqualPrivilegeOnly, - FindAuthor, Get, InstanceFilter, LinearStoragePrice, Nothing, OnFinalize, WithdrawReasons, + AsEnsureOriginWithArg, ConstU128, ConstU32, ConstU64, EqualPrivilegeOnly, FindAuthor, Get, + InstanceFilter, LinearStoragePrice, Nothing, OnFinalize, WithdrawReasons, }, weights::{ constants::{ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND}, @@ -49,7 +49,7 @@ use pallet_ethereum::PostLogContent; use pallet_evm::{FeeCalculator, GasWeightMapping, Runner}; use pallet_evm_precompile_assets_erc20::AddressToAssetId; use pallet_grandpa::{fg_primitives, AuthorityList as GrandpaAuthorityList}; -use pallet_transaction_payment::{CurrencyAdapter, Multiplier, TargetedFeeAdjustment}; +use pallet_transaction_payment::{FungibleAdapter, Multiplier, TargetedFeeAdjustment}; use parity_scale_codec::{Compact, Decode, Encode, MaxEncodedLen}; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, ConstBool, OpaqueMetadata, H160, H256, U256}; @@ -269,6 +269,7 @@ impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = ConstU32<50>; + type SlotDuration = pallet_aura::MinimumPeriodTimesTwo; type AllowMultipleBlocksPerSlot = ConstBool; } @@ -392,7 +393,7 @@ impl WeightToFeePolynomial for WeightToFee { impl pallet_transaction_payment::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type OnChargeTransaction = CurrencyAdapter; + type OnChargeTransaction = FungibleAdapter; type WeightToFee = WeightToFee; type OperationalFeeMultiplier = OperationalFeeMultiplier; type FeeMultiplierUpdate = TargetedFeeAdjustment< @@ -436,8 +437,6 @@ parameter_types! { pub const DappsStakingPalletId: PalletId = PalletId(*b"py/dpsst"); } -type NegativeImbalance = >::NegativeImbalance; - impl pallet_static_price_provider::Config for Runtime { type RuntimeEvent = RuntimeEvent; } @@ -494,12 +493,12 @@ impl pallet_dapp_staking_v3::Config for Runtime { } pub struct InflationPayoutPerBlock; -impl pallet_inflation::PayoutPerBlock for InflationPayoutPerBlock { - fn treasury(reward: NegativeImbalance) { - Balances::resolve_creating(&TreasuryPalletId::get().into_account_truncating(), reward); +impl pallet_inflation::PayoutPerBlock> for InflationPayoutPerBlock { + fn treasury(reward: Credit) { + let _ = Balances::resolve(&TreasuryPalletId::get().into_account_truncating(), reward); } - fn collators(_reward: NegativeImbalance) { + fn collators(_reward: Credit) { // no collators for local dev node } } @@ -582,7 +581,8 @@ impl> FindAuthor for FindAuthorTruncated { I: 'a + IntoIterator, { if let Some(author_index) = F::find_author(digests) { - let authority_id = Aura::authorities()[author_index as usize].clone(); + let authority_id = + pallet_aura::Authorities::::get()[author_index as usize].clone(); return Some(H160::from_slice(&authority_id.encode()[4..24])); } @@ -626,7 +626,7 @@ impl pallet_evm::Config for Runtime { type PrecompilesType = Precompiles; type PrecompilesValue = PrecompilesValue; type ChainId = ChainId; - type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter; + type OnChargeTransaction = pallet_evm::EVMFungibleAdapter; type BlockGasLimit = BlockGasLimit; type Timestamp = Timestamp; type OnCreate = (); @@ -1363,7 +1363,7 @@ impl_runtime_apis! { } fn authorities() -> Vec { - Aura::authorities().into_inner() + pallet_aura::Authorities::::get().into_inner() } } @@ -1799,12 +1799,17 @@ impl_runtime_apis! { impl sp_genesis_builder::GenesisBuilder for Runtime { - fn create_default_config() -> Vec { - create_default_config::() + + fn build_state(config: Vec) -> sp_genesis_builder::Result { + build_state::(config) + } + + fn get_preset(id: &Option) -> Option> { + get_preset::(id, |_| None) } - fn build_config(config: Vec) -> sp_genesis_builder::Result { - build_config::(config) + fn preset_names() -> Vec { + vec![] } } @@ -1922,6 +1927,84 @@ impl_runtime_apis! { Ok(()) } + + fn trace_call( + header: &::Header, + from: H160, + to: H160, + data: Vec, + value: U256, + gas_limit: U256, + max_fee_per_gas: Option, + max_priority_fee_per_gas: Option, + nonce: Option, + access_list: Option)>>, + ) -> Result<(), sp_runtime::DispatchError> { + use moonbeam_evm_tracer::tracer::EvmTracer; + + // Initialize block: calls the "on_initialize" hook on every pallet + // in AllPalletsWithSystem. + Executive::initialize_block(header); + + EvmTracer::new().trace(|| { + let is_transactional = false; + let validate = true; + let without_base_extrinsic_weight = true; + + + // Estimated encoded transaction size must be based on the heaviest transaction + // type (EIP1559Transaction) to be compatible with all transaction types. + let mut estimated_transaction_len = data.len() + + // pallet ethereum index: 1 + // transact call index: 1 + // Transaction enum variant: 1 + // chain_id 8 bytes + // nonce: 32 + // max_priority_fee_per_gas: 32 + // max_fee_per_gas: 32 + // gas_limit: 32 + // action: 21 (enum varianrt + call address) + // value: 32 + // access_list: 1 (empty vec size) + // 65 bytes signature + 258; + + if access_list.is_some() { + estimated_transaction_len += access_list.encoded_size(); + } + + let gas_limit = gas_limit.min(u64::MAX.into()).low_u64(); + + let (weight_limit, proof_size_base_cost) = + match ::GasWeightMapping::gas_to_weight( + gas_limit, + without_base_extrinsic_weight + ) { + weight_limit if weight_limit.proof_size() > 0 => { + (Some(weight_limit), Some(estimated_transaction_len as u64)) + } + _ => (None, None), + }; + + let _ = ::Runner::call( + from, + to, + data, + value, + gas_limit, + max_fee_per_gas, + max_priority_fee_per_gas, + nonce, + access_list.unwrap_or_default(), + is_transactional, + validate, + weight_limit, + proof_size_base_cost, + ::config(), + ); + }); + Ok(()) + } } #[cfg(feature = "evm-tracing")] diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml index a68ec0fd6..0efd23eb9 100644 --- a/runtime/shibuya/Cargo.toml +++ b/runtime/shibuya/Cargo.toml @@ -96,6 +96,7 @@ polkadot-runtime-common = { workspace = true } xcm = { workspace = true } xcm-builder = { workspace = true } xcm-executor = { workspace = true } +xcm-fee-payment-runtime-api = { workspace = true } # orml dependencies orml-oracle = { workspace = true } @@ -200,6 +201,7 @@ std = [ "pallet-evm-precompile-assets-erc20/std", "pallet-evm-precompile-xcm/std", "pallet-evm-precompile-unified-accounts/std", + "xcm-fee-payment-runtime-api/std", "pallet-evm-precompile-dispatch-lockdrop/std", "pallet-dapp-staking-v3/std", "orml-oracle/std", diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index e28ea22f4..218d5a3ec 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -26,12 +26,12 @@ use cumulus_primitives_core::AggregateMessageOrigin; use frame_support::{ construct_runtime, dispatch::DispatchClass, - genesis_builder_helper::{build_config, create_default_config}, + genesis_builder_helper::{build_state, get_preset}, parameter_types, traits::{ - fungible::HoldConsideration, + fungible::{Balanced, Credit, HoldConsideration}, tokens::{PayFromAccount, UnityAssetBalanceConversion}, - AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, Contains, Currency, + AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, Contains, EqualPrivilegeOnly, FindAuthor, Get, Imbalance, InstanceFilter, LinearStoragePrice, Nothing, OnFinalize, OnUnbalanced, WithdrawReasons, }, @@ -39,8 +39,8 @@ use frame_support::{ constants::{ BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, }, - ConstantMultiplier, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, - WeightToFeePolynomial, + ConstantMultiplier, Weight, WeightToFee as WeightToFeeT, WeightToFeeCoefficient, + WeightToFeeCoefficients, WeightToFeePolynomial, }, ConsensusEngineId, PalletId, }; @@ -70,6 +70,11 @@ use sp_runtime::{ ApplyExtrinsicResult, FixedPointNumber, FixedU128, Perbill, Permill, Perquintill, RuntimeDebug, }; use sp_std::{collections::btree_map::BTreeMap, prelude::*}; +use xcm::{ + v4::{AssetId as XcmAssetId, Location as XcmLocation}, + IntoVersion, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm, +}; +use xcm_fee_payment_runtime_api::Error as XcmPaymentApiError; use astar_primitives::{ dapp_staking::{ @@ -144,6 +149,7 @@ pub const fn contracts_deposit(items: u32, bytes: u32) -> Balance { /// Change this to adjust the block time. pub const MILLISECS_PER_BLOCK: u64 = 12000; pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK; + // Time is measured by number of blocks. pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber); pub const HOURS: BlockNumber = MINUTES * 60; @@ -487,12 +493,12 @@ impl pallet_dapp_staking_v3::Config for Runtime { } pub struct InflationPayoutPerBlock; -impl pallet_inflation::PayoutPerBlock for InflationPayoutPerBlock { - fn treasury(reward: NegativeImbalance) { - Balances::resolve_creating(&TreasuryPalletId::get().into_account_truncating(), reward); +impl pallet_inflation::PayoutPerBlock> for InflationPayoutPerBlock { + fn treasury(reward: Credit) { + let _ = Balances::resolve(&TreasuryPalletId::get().into_account_truncating(), reward); } - fn collators(reward: NegativeImbalance) { + fn collators(reward: Credit) { ToStakingPot::on_unbalanced(reward); } } @@ -565,6 +571,8 @@ impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = ConstU32<250>; + type SlotDuration = ConstU64; + // Set to `true` once async backing is enabled. type AllowMultipleBlocksPerSlot = ConstBool; } @@ -633,13 +641,11 @@ parameter_types! { pub TreasuryAccountId: AccountId = TreasuryPalletId::get().into_account_truncating(); } -type NegativeImbalance = >::NegativeImbalance; - pub struct ToStakingPot; -impl OnUnbalanced for ToStakingPot { - fn on_nonzero_unbalanced(amount: NegativeImbalance) { +impl OnUnbalanced> for ToStakingPot { + fn on_nonzero_unbalanced(amount: Credit) { let staking_pot = PotId::get().into_account_truncating(); - Balances::resolve_creating(&staking_pot, amount); + let _ = Balances::resolve(&staking_pot, amount); } } @@ -758,7 +764,7 @@ impl pallet_contracts::Config for Runtime { type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; type Debug = (); type Environment = (); - type Migrations = (); + type Migrations = (pallet_contracts::migration::v16::Migration,); type Xcm = (); type UploadOrigin = EnsureSigned<::AccountId>; type InstantiateOrigin = EnsureSigned<::AccountId>; @@ -805,7 +811,7 @@ impl WeightToFeePolynomial for WeightToFee { /// /// Similar to standard `WeightToFee` handler, but force uses the minimum multiplier. pub struct XcmWeightToFee; -impl frame_support::weights::WeightToFee for XcmWeightToFee { +impl WeightToFeeT for XcmWeightToFee { type Balance = Balance; fn weight_to_fee(n: &Weight) -> Self::Balance { @@ -814,8 +820,8 @@ impl frame_support::weights::WeightToFee for XcmWeightToFee { } pub struct DealWithFees; -impl OnUnbalanced for DealWithFees { - fn on_unbalanceds(mut fees_then_tips: impl Iterator) { +impl OnUnbalanced> for DealWithFees { + fn on_unbalanceds(mut fees_then_tips: impl Iterator>) { if let Some(fees) = fees_then_tips.next() { // Burn 80% of fees, rest goes to collator, including 100% of the tips. let (to_burn, mut collator) = fees.ration(80, 20); @@ -834,7 +840,7 @@ impl OnUnbalanced for DealWithFees { impl pallet_transaction_payment::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; + type OnChargeTransaction = pallet_transaction_payment::FungibleAdapter; type WeightToFee = WeightToFee; type OperationalFeeMultiplier = OperationalFeeMultiplier; type FeeMultiplierUpdate = TargetedFeeAdjustment< @@ -899,7 +905,8 @@ impl> FindAuthor for FindAuthorTruncated { I: 'a + IntoIterator, { if let Some(author_index) = F::find_author(digests) { - let authority_id = Aura::authorities()[author_index as usize].clone(); + let authority_id = + pallet_aura::Authorities::::get()[author_index as usize].clone(); return Some(H160::from_slice(&authority_id.encode()[4..24])); } @@ -939,7 +946,7 @@ impl pallet_evm::Config for Runtime { // Ethereum-compatible chain_id: // * Shibuya: 81 type ChainId = EVMChainId; - type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter; + type OnChargeTransaction = pallet_evm::EVMFungibleAdapter; type BlockGasLimit = BlockGasLimit; type Timestamp = Timestamp; type OnCreate = (); @@ -1051,7 +1058,6 @@ impl InstanceFilter for ProxyType { | RuntimeCall::XcmpQueue(..) | RuntimeCall::PolkadotXcm(..) | RuntimeCall::CumulusXcm(..) - | RuntimeCall::DmpQueue(..) | RuntimeCall::XcAssetConfig(..) // Skip entire EVM pallet // Skip entire Ethereum pallet @@ -1160,6 +1166,7 @@ impl pallet_message_queue::Config for Runtime { type HeapSize = ConstU32<{ 128 * 1048 }>; type MaxStale = ConstU32<8>; type ServiceWeight = MessageQueueServiceWeight; + type IdleMaxServiceWeight = MessageQueueServiceWeight; } parameter_types! { @@ -1541,7 +1548,6 @@ construct_runtime!( XcmpQueue: cumulus_pallet_xcmp_queue = 50, PolkadotXcm: pallet_xcm = 51, CumulusXcm: cumulus_pallet_xcm = 52, - DmpQueue: cumulus_pallet_dmp_queue = 53, XcAssetConfig: pallet_xc_asset_config = 54, XTokens: orml_xtokens = 55, MessageQueue: pallet_message_queue = 56, @@ -1630,15 +1636,23 @@ parameter_types! { ]; } +parameter_types! { + pub const DmpQueuePalletName: &'static str = "DmpQueue"; +} + /// All migrations that will run on the next runtime upgrade. /// /// Once done, migrations should be removed from the tuple. pub type Migrations = ( - cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4, // permanent migration, do not remove pallet_xcm::migration::MigrateToLatestXcmVersion, // dapp-staking dyn tier threshold migrations pallet_dapp_staking_v3::migration::versioned_migrations::V7ToV8, + frame_support::migrations::RemovePallet< + DmpQueuePalletName, + ::DbWeight, + >, + pallet_contracts::Migration, ); type EventRecord = frame_system::EventRecord< @@ -1727,7 +1741,6 @@ mod benches { [xcm_benchmarks_generic, XcmGeneric] [xcm_benchmarks_fungible, XcmFungible] [pallet_price_aggregator, PriceAggregator] - [pallet_membership, OracleMembership] [pallet_collective_proxy, CollectiveProxy] [orml_oracle, Oracle] ); @@ -1768,7 +1781,7 @@ impl_runtime_apis! { } fn authorities() -> Vec { - Aura::authorities().into_inner() + pallet_aura::Authorities::::get().into_inner() } } @@ -2218,14 +2231,77 @@ impl_runtime_apis! { } } + impl xcm_fee_payment_runtime_api::XcmPaymentApi for Runtime { + fn query_acceptable_payment_assets(xcm_version: xcm::Version) -> Result, XcmPaymentApiError> { + if !matches!(xcm_version, xcm::v3::VERSION | xcm::v4::VERSION) { + return Err(XcmPaymentApiError::UnhandledXcmVersion); + } + + // Native asset is always supported + let native_asset_location: XcmLocation = XcmLocation::try_from(xcm_config::ShibuyaLocation::get()) + .map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + + Ok([VersionedAssetId::V4(native_asset_location.into())] + .into_iter() + // Acquire foreign assets which have 'units per second' configured + .chain( + pallet_xc_asset_config::AssetLocationUnitsPerSecond::::iter_keys().filter_map(|asset_location| { + + match XcmLocation::try_from(asset_location) { + Ok(asset) => Some(VersionedAssetId::V4(asset.into())), + Err(_) => None, + } + }) + ).filter_map(|asset| asset.into_version(xcm_version).ok()).collect()) + } + + // TODO: improve this function, reduce code duplication, especially on a such a functional level + fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { + let native_asset_location = XcmLocation::try_from(xcm_config::ShibuyaLocation::get()) + .map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + let native_asset = VersionedAssetId::V4(native_asset_location.into()); + + let asset = asset + .into_version(xcm::v4::VERSION) + .map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + + if native_asset == asset { + Ok(XcmWeightToFee::weight_to_fee(&weight)) + } else { + let asset_id: XcmAssetId = asset.try_into().map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + let versioned_location = VersionedLocation::V4(asset_id.0); + + match pallet_xc_asset_config::AssetLocationUnitsPerSecond::::get(versioned_location) { + Some(units_per_sec) => { + Ok(units_per_sec.saturating_mul(weight.ref_time() as u128) + / (WEIGHT_REF_TIME_PER_SECOND as u128)) + } + None => Err(XcmPaymentApiError::AssetNotFound), + } + } + } + + fn query_xcm_weight(message: VersionedXcm<()>) -> Result { + PolkadotXcm::query_xcm_weight(message) + } + + fn query_delivery_fees(destination: VersionedLocation, message: VersionedXcm<()>) -> Result { + PolkadotXcm::query_delivery_fees(destination, message) + } + } impl sp_genesis_builder::GenesisBuilder for Runtime { - fn create_default_config() -> Vec { - create_default_config::() + + fn build_state(config: Vec) -> sp_genesis_builder::Result { + build_state::(config) + } + + fn get_preset(id: &Option) -> Option> { + get_preset::(id, |_| None) } - fn build_config(config: Vec) -> sp_genesis_builder::Result { - build_config::(config) + fn preset_names() -> Vec { + vec![] } } @@ -2332,6 +2408,7 @@ impl_runtime_apis! { type DeliveryHelper = (); // destination location to be used in benchmarks fn valid_destination() -> Result { + assert_ok!(PolkadotXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(Location::parent()), xcm::v4::VERSION)); Ok(Location::parent()) } fn worst_case_holding(_depositable_count: u32) -> Assets { @@ -2355,11 +2432,13 @@ impl_runtime_apis! { } fn transact_origin_and_runtime_call() -> Result<(Location, RuntimeCall), BenchmarkError> { + assert_ok!(PolkadotXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(Location::parent()), xcm::v4::VERSION)); Ok((Location::parent(), frame_system::Call::remark_with_event { remark: vec![] }.into())) } fn subscribe_origin() -> Result { + assert_ok!(PolkadotXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(Location::parent()), xcm::v4::VERSION)); Ok(Location::parent()) } fn claimable_asset() @@ -2382,7 +2461,7 @@ impl_runtime_apis! { Err(BenchmarkError::Skip) } fn fee_asset() -> Result { - Ok((AssetId(Here.into()), 100).into()) + Ok((AssetId(Here.into()), 1_000_000_000_000_000_000u128).into()) } } @@ -2518,6 +2597,84 @@ impl_runtime_apis! { Ok(()) } + + fn trace_call( + header: &::Header, + from: H160, + to: H160, + data: Vec, + value: U256, + gas_limit: U256, + max_fee_per_gas: Option, + max_priority_fee_per_gas: Option, + nonce: Option, + access_list: Option)>>, + ) -> Result<(), sp_runtime::DispatchError> { + use moonbeam_evm_tracer::tracer::EvmTracer; + + // Initialize block: calls the "on_initialize" hook on every pallet + // in AllPalletsWithSystem. + Executive::initialize_block(header); + + EvmTracer::new().trace(|| { + let is_transactional = false; + let validate = true; + let without_base_extrinsic_weight = true; + + + // Estimated encoded transaction size must be based on the heaviest transaction + // type (EIP1559Transaction) to be compatible with all transaction types. + let mut estimated_transaction_len = data.len() + + // pallet ethereum index: 1 + // transact call index: 1 + // Transaction enum variant: 1 + // chain_id 8 bytes + // nonce: 32 + // max_priority_fee_per_gas: 32 + // max_fee_per_gas: 32 + // gas_limit: 32 + // action: 21 (enum varianrt + call address) + // value: 32 + // access_list: 1 (empty vec size) + // 65 bytes signature + 258; + + if access_list.is_some() { + estimated_transaction_len += access_list.encoded_size(); + } + + let gas_limit = gas_limit.min(u64::MAX.into()).low_u64(); + + let (weight_limit, proof_size_base_cost) = + match ::GasWeightMapping::gas_to_weight( + gas_limit, + without_base_extrinsic_weight + ) { + weight_limit if weight_limit.proof_size() > 0 => { + (Some(weight_limit), Some(estimated_transaction_len as u64)) + } + _ => (None, None), + }; + + let _ = ::Runner::call( + from, + to, + data, + value, + gas_limit, + max_fee_per_gas, + max_priority_fee_per_gas, + nonce, + access_list.unwrap_or_default(), + is_transactional, + validate, + weight_limit, + proof_size_base_cost, + ::config(), + ); + }); + Ok(()) + } } #[cfg(feature = "evm-tracing")] diff --git a/runtime/shibuya/src/weights/orml_oracle.rs b/runtime/shibuya/src/weights/orml_oracle.rs index 6e96b836c..2952ecb8c 100644 --- a/runtime/shibuya/src/weights/orml_oracle.rs +++ b/runtime/shibuya/src/weights/orml_oracle.rs @@ -59,17 +59,19 @@ impl orml_oracle::WeightInfo for SubstrateWeight { /// Proof: `Oracle::RawValues` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`) /// Storage: `Oracle::Values` (r:1 w:0) /// Proof: `Oracle::Values` (`max_values`: None, `max_size`: Some(33), added: 2508, mode: `MaxEncodedLen`) - /// The range of component `x` is `[1, 2]`. + /// The range of component `x` is `[0, 2]`. fn feed_values(x: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `345` // Estimated: `8634` - // Minimum execution time: 25_321_000 picoseconds. - Weight::from_parts(18_159_773, 8634) - // Standard Error: 58_695 - .saturating_add(Weight::from_parts(7_973_363, 0).saturating_mul(x.into())) - .saturating_add(T::DbWeight::get().reads(7_u64)) - .saturating_add(T::DbWeight::get().writes(2_u64)) + // Minimum execution time: 14_010_000 picoseconds. + Weight::from_parts(14_824_586, 8634) + // Standard Error: 29_331 + .saturating_add(Weight::from_parts(10_148_634, 0).saturating_mul(x.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(x.into()))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(x.into()))) } /// Storage: `Oracle::HasDispatched` (r:0 w:1) /// Proof: `Oracle::HasDispatched` (`max_values`: Some(1), `max_size`: Some(257), added: 752, mode: `MaxEncodedLen`) @@ -77,8 +79,8 @@ impl orml_oracle::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 1_170_000 picoseconds. - Weight::from_parts(1_248_000, 0) + // Minimum execution time: 880_000 picoseconds. + Weight::from_parts(914_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/runtime/shibuya/src/weights/pallet_assets.rs b/runtime/shibuya/src/weights/pallet_assets.rs index e9a12a1d7..13e9cba72 100644 --- a/runtime/shibuya/src/weights/pallet_assets.rs +++ b/runtime/shibuya/src/weights/pallet_assets.rs @@ -59,8 +59,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `795` // Estimated: `4260` - // Minimum execution time: 30_773_000 picoseconds. - Weight::from_parts(31_337_000, 4260) + // Minimum execution time: 30_871_000 picoseconds. + Weight::from_parts(31_333_000, 4260) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -72,8 +72,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `655` // Estimated: `4120` - // Minimum execution time: 18_585_000 picoseconds. - Weight::from_parts(19_019_000, 4120) + // Minimum execution time: 18_426_000 picoseconds. + Weight::from_parts(19_017_000, 4120) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -83,8 +83,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `393` // Estimated: `3687` - // Minimum execution time: 13_288_000 picoseconds. - Weight::from_parts(13_440_000, 3687) + // Minimum execution time: 13_147_000 picoseconds. + Weight::from_parts(13_557_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -99,12 +99,12 @@ impl pallet_assets::WeightInfo for SubstrateWeight { /// The range of component `c` is `[0, 1000]`. fn destroy_accounts(c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `535 + c * (208 ±0)` + // Measured: `500 + c * (208 ±0)` // Estimated: `3687 + c * (2621 ±0)` - // Minimum execution time: 14_171_000 picoseconds. - Weight::from_parts(14_445_000, 3687) - // Standard Error: 6_240 - .saturating_add(Weight::from_parts(11_963_193, 0).saturating_mul(c.into())) + // Minimum execution time: 13_831_000 picoseconds. + Weight::from_parts(14_255_000, 3687) + // Standard Error: 5_776 + .saturating_add(Weight::from_parts(12_034_182, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -120,10 +120,10 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `542 + a * (86 ±0)` // Estimated: `3687 + a * (2635 ±0)` - // Minimum execution time: 17_694_000 picoseconds. - Weight::from_parts(17_830_000, 3687) - // Standard Error: 4_136 - .saturating_add(Weight::from_parts(11_329_548, 0).saturating_mul(a.into())) + // Minimum execution time: 17_371_000 picoseconds. + Weight::from_parts(17_767_000, 3687) + // Standard Error: 3_912 + .saturating_add(Weight::from_parts(11_416_197, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -140,8 +140,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `359` // Estimated: `3687` - // Minimum execution time: 12_920_000 picoseconds. - Weight::from_parts(13_225_000, 3687) + // Minimum execution time: 12_763_000 picoseconds. + Weight::from_parts(13_230_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -153,8 +153,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `359` // Estimated: `3687` - // Minimum execution time: 19_404_000 picoseconds. - Weight::from_parts(19_898_000, 3687) + // Minimum execution time: 19_678_000 picoseconds. + Weight::from_parts(19_891_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -168,8 +168,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `521` // Estimated: `3687` - // Minimum execution time: 30_518_000 picoseconds. - Weight::from_parts(31_071_000, 3687) + // Minimum execution time: 30_716_000 picoseconds. + Weight::from_parts(31_336_000, 3687) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -183,10 +183,10 @@ impl pallet_assets::WeightInfo for SubstrateWeight { /// Proof: `UnifiedAccounts::NativeToEvm` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`) fn transfer() -> Weight { // Proof Size summary in bytes: - // Measured: `626` + // Measured: `593` // Estimated: `6232` - // Minimum execution time: 41_063_000 picoseconds. - Weight::from_parts(41_857_000, 6232) + // Minimum execution time: 40_954_000 picoseconds. + Weight::from_parts(41_777_000, 6232) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -198,10 +198,10 @@ impl pallet_assets::WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn transfer_keep_alive() -> Weight { // Proof Size summary in bytes: - // Measured: `584` + // Measured: `551` // Estimated: `6232` - // Minimum execution time: 34_010_000 picoseconds. - Weight::from_parts(34_608_000, 6232) + // Minimum execution time: 34_249_000 picoseconds. + Weight::from_parts(34_729_000, 6232) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -215,10 +215,10 @@ impl pallet_assets::WeightInfo for SubstrateWeight { /// Proof: `UnifiedAccounts::NativeToEvm` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`) fn force_transfer() -> Weight { // Proof Size summary in bytes: - // Measured: `626` + // Measured: `593` // Estimated: `6232` - // Minimum execution time: 41_199_000 picoseconds. - Weight::from_parts(41_786_000, 6232) + // Minimum execution time: 41_099_000 picoseconds. + Weight::from_parts(41_530_000, 6232) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -230,8 +230,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `479` // Estimated: `3687` - // Minimum execution time: 16_289_000 picoseconds. - Weight::from_parts(16_606_000, 3687) + // Minimum execution time: 16_876_000 picoseconds. + Weight::from_parts(17_197_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -243,8 +243,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `479` // Estimated: `3687` - // Minimum execution time: 16_470_000 picoseconds. - Weight::from_parts(16_797_000, 3687) + // Minimum execution time: 16_787_000 picoseconds. + Weight::from_parts(17_242_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -254,8 +254,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `393` // Estimated: `3687` - // Minimum execution time: 12_886_000 picoseconds. - Weight::from_parts(13_226_000, 3687) + // Minimum execution time: 13_144_000 picoseconds. + Weight::from_parts(13_490_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -265,8 +265,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `393` // Estimated: `3687` - // Minimum execution time: 12_916_000 picoseconds. - Weight::from_parts(13_191_000, 3687) + // Minimum execution time: 12_936_000 picoseconds. + Weight::from_parts(13_161_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -278,8 +278,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `359` // Estimated: `3687` - // Minimum execution time: 12_070_000 picoseconds. - Weight::from_parts(12_339_000, 3687) + // Minimum execution time: 11_758_000 picoseconds. + Weight::from_parts(12_081_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -289,8 +289,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `359` // Estimated: `3687` - // Minimum execution time: 10_701_000 picoseconds. - Weight::from_parts(10_959_000, 3687) + // Minimum execution time: 10_588_000 picoseconds. + Weight::from_parts(10_862_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -300,16 +300,14 @@ impl pallet_assets::WeightInfo for SubstrateWeight { /// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(152), added: 2627, mode: `MaxEncodedLen`) /// The range of component `n` is `[0, 50]`. /// The range of component `s` is `[0, 50]`. - fn set_metadata(n: u32, s: u32, ) -> Weight { + fn set_metadata(_n: u32, s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `359` // Estimated: `3687` - // Minimum execution time: 25_234_000 picoseconds. - Weight::from_parts(25_597_463, 3687) - // Standard Error: 660 - .saturating_add(Weight::from_parts(9_991, 0).saturating_mul(n.into())) - // Standard Error: 660 - .saturating_add(Weight::from_parts(4_898, 0).saturating_mul(s.into())) + // Minimum execution time: 24_794_000 picoseconds. + Weight::from_parts(25_578_616, 3687) + // Standard Error: 596 + .saturating_add(Weight::from_parts(1_031, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -321,8 +319,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `535` // Estimated: `3687` - // Minimum execution time: 25_954_000 picoseconds. - Weight::from_parts(26_679_000, 3687) + // Minimum execution time: 25_784_000 picoseconds. + Weight::from_parts(26_200_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -332,16 +330,14 @@ impl pallet_assets::WeightInfo for SubstrateWeight { /// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(152), added: 2627, mode: `MaxEncodedLen`) /// The range of component `n` is `[0, 50]`. /// The range of component `s` is `[0, 50]`. - fn force_set_metadata(n: u32, s: u32, ) -> Weight { + fn force_set_metadata(_n: u32, s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `198` // Estimated: `3687` - // Minimum execution time: 10_999_000 picoseconds. - Weight::from_parts(11_508_016, 3687) - // Standard Error: 306 - .saturating_add(Weight::from_parts(1_216, 0).saturating_mul(n.into())) - // Standard Error: 306 - .saturating_add(Weight::from_parts(1_235, 0).saturating_mul(s.into())) + // Minimum execution time: 10_784_000 picoseconds. + Weight::from_parts(11_276_674, 3687) + // Standard Error: 283 + .saturating_add(Weight::from_parts(963, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -353,8 +349,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `535` // Estimated: `3687` - // Minimum execution time: 25_379_000 picoseconds. - Weight::from_parts(26_041_000, 3687) + // Minimum execution time: 24_881_000 picoseconds. + Weight::from_parts(25_239_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -364,8 +360,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `359` // Estimated: `3687` - // Minimum execution time: 10_204_000 picoseconds. - Weight::from_parts(10_649_000, 3687) + // Minimum execution time: 10_212_000 picoseconds. + Weight::from_parts(10_445_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -377,8 +373,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `393` // Estimated: `3687` - // Minimum execution time: 27_578_000 picoseconds. - Weight::from_parts(28_160_000, 3687) + // Minimum execution time: 27_490_000 picoseconds. + Weight::from_parts(27_943_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -392,10 +388,10 @@ impl pallet_assets::WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn transfer_approved() -> Weight { // Proof Size summary in bytes: - // Measured: `817` + // Measured: `784` // Estimated: `6232` - // Minimum execution time: 54_322_000 picoseconds. - Weight::from_parts(54_857_000, 6232) + // Minimum execution time: 53_685_000 picoseconds. + Weight::from_parts(54_041_000, 6232) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -407,8 +403,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `575` // Estimated: `3687` - // Minimum execution time: 29_697_000 picoseconds. - Weight::from_parts(30_355_000, 3687) + // Minimum execution time: 29_541_000 picoseconds. + Weight::from_parts(30_163_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -420,8 +416,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `575` // Estimated: `3687` - // Minimum execution time: 30_198_000 picoseconds. - Weight::from_parts(30_810_000, 3687) + // Minimum execution time: 29_825_000 picoseconds. + Weight::from_parts(30_377_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -431,8 +427,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `359` // Estimated: `3687` - // Minimum execution time: 11_137_000 picoseconds. - Weight::from_parts(11_346_000, 3687) + // Minimum execution time: 10_943_000 picoseconds. + Weight::from_parts(11_180_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -446,8 +442,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `566` // Estimated: `3687` - // Minimum execution time: 29_448_000 picoseconds. - Weight::from_parts(29_777_000, 3687) + // Minimum execution time: 29_151_000 picoseconds. + Weight::from_parts(29_566_000, 3687) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -459,8 +455,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `359` // Estimated: `3687` - // Minimum execution time: 27_369_000 picoseconds. - Weight::from_parts(27_968_000, 3687) + // Minimum execution time: 26_895_000 picoseconds. + Weight::from_parts(27_474_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -474,8 +470,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `704` // Estimated: `3687` - // Minimum execution time: 28_639_000 picoseconds. - Weight::from_parts(28_992_000, 3687) + // Minimum execution time: 28_474_000 picoseconds. + Weight::from_parts(28_897_000, 3687) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -487,8 +483,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `530` // Estimated: `3687` - // Minimum execution time: 26_478_000 picoseconds. - Weight::from_parts(26_848_000, 3687) + // Minimum execution time: 26_245_000 picoseconds. + Weight::from_parts(26_636_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -500,8 +496,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `479` // Estimated: `3687` - // Minimum execution time: 16_211_000 picoseconds. - Weight::from_parts(16_729_000, 3687) + // Minimum execution time: 16_471_000 picoseconds. + Weight::from_parts(16_817_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/runtime/shibuya/src/weights/pallet_balances.rs b/runtime/shibuya/src/weights/pallet_balances.rs index da5dbbea8..df292edac 100644 --- a/runtime/shibuya/src/weights/pallet_balances.rs +++ b/runtime/shibuya/src/weights/pallet_balances.rs @@ -57,8 +57,8 @@ impl pallet_balances::WeightInfo for SubstrateWeight // Proof Size summary in bytes: // Measured: `94` // Estimated: `3593` - // Minimum execution time: 45_586_000 picoseconds. - Weight::from_parts(46_228_000, 3593) + // Minimum execution time: 45_845_000 picoseconds. + Weight::from_parts(46_305_000, 3593) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -68,8 +68,8 @@ impl pallet_balances::WeightInfo for SubstrateWeight // Proof Size summary in bytes: // Measured: `52` // Estimated: `3593` - // Minimum execution time: 31_484_000 picoseconds. - Weight::from_parts(32_124_000, 3593) + // Minimum execution time: 31_760_000 picoseconds. + Weight::from_parts(32_025_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -79,8 +79,8 @@ impl pallet_balances::WeightInfo for SubstrateWeight // Proof Size summary in bytes: // Measured: `140` // Estimated: `3593` - // Minimum execution time: 12_933_000 picoseconds. - Weight::from_parts(13_286_000, 3593) + // Minimum execution time: 12_340_000 picoseconds. + Weight::from_parts(12_660_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -92,8 +92,8 @@ impl pallet_balances::WeightInfo for SubstrateWeight // Proof Size summary in bytes: // Measured: `182` // Estimated: `3593` - // Minimum execution time: 22_605_000 picoseconds. - Weight::from_parts(23_442_000, 3593) + // Minimum execution time: 23_320_000 picoseconds. + Weight::from_parts(23_776_000, 3593) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -105,8 +105,8 @@ impl pallet_balances::WeightInfo for SubstrateWeight // Proof Size summary in bytes: // Measured: `197` // Estimated: `6196` - // Minimum execution time: 47_087_000 picoseconds. - Weight::from_parts(47_709_000, 6196) + // Minimum execution time: 48_296_000 picoseconds. + Weight::from_parts(48_812_000, 6196) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -118,8 +118,8 @@ impl pallet_balances::WeightInfo for SubstrateWeight // Proof Size summary in bytes: // Measured: `94` // Estimated: `3593` - // Minimum execution time: 44_690_000 picoseconds. - Weight::from_parts(45_117_000, 3593) + // Minimum execution time: 45_941_000 picoseconds. + Weight::from_parts(46_527_000, 3593) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -129,8 +129,8 @@ impl pallet_balances::WeightInfo for SubstrateWeight // Proof Size summary in bytes: // Measured: `140` // Estimated: `3593` - // Minimum execution time: 14_694_000 picoseconds. - Weight::from_parts(15_038_000, 3593) + // Minimum execution time: 14_745_000 picoseconds. + Weight::from_parts(15_204_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -141,10 +141,10 @@ impl pallet_balances::WeightInfo for SubstrateWeight // Proof Size summary in bytes: // Measured: `0 + u * (136 ±0)` // Estimated: `990 + u * (2603 ±0)` - // Minimum execution time: 14_456_000 picoseconds. - Weight::from_parts(14_807_000, 990) - // Standard Error: 8_717 - .saturating_add(Weight::from_parts(10_808_686, 0).saturating_mul(u.into())) + // Minimum execution time: 14_297_000 picoseconds. + Weight::from_parts(14_615_000, 990) + // Standard Error: 9_129 + .saturating_add(Weight::from_parts(10_977_662, 0).saturating_mul(u.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into()))) .saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into())) @@ -153,8 +153,8 @@ impl pallet_balances::WeightInfo for SubstrateWeight // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 5_975_000 picoseconds. - Weight::from_parts(6_179_000, 0) + // Minimum execution time: 5_666_000 picoseconds. + Weight::from_parts(5_975_000, 0) } fn burn() -> Weight { diff --git a/runtime/shibuya/src/weights/pallet_dapp_staking_v3.rs b/runtime/shibuya/src/weights/pallet_dapp_staking_v3.rs index 9cf020149..10d37c559 100644 --- a/runtime/shibuya/src/weights/pallet_dapp_staking_v3.rs +++ b/runtime/shibuya/src/weights/pallet_dapp_staking_v3.rs @@ -55,8 +55,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_248_000 picoseconds. - Weight::from_parts(6_411_000, 0) + // Minimum execution time: 5_644_000 picoseconds. + Weight::from_parts(5_873_000, 0) } /// Storage: `DappStaking::IntegratedDApps` (r:1 w:1) /// Proof: `DappStaking::IntegratedDApps` (`max_values`: Some(65535), `max_size`: Some(116), added: 2096, mode: `MaxEncodedLen`) @@ -68,8 +68,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `3086` - // Minimum execution time: 12_268_000 picoseconds. - Weight::from_parts(12_474_000, 3086) + // Minimum execution time: 11_812_000 picoseconds. + Weight::from_parts(12_247_000, 3086) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -79,8 +79,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `97` // Estimated: `3086` - // Minimum execution time: 10_962_000 picoseconds. - Weight::from_parts(11_245_000, 3086) + // Minimum execution time: 10_416_000 picoseconds. + Weight::from_parts(10_663_000, 3086) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -90,8 +90,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `97` // Estimated: `3086` - // Minimum execution time: 11_415_000 picoseconds. - Weight::from_parts(11_557_000, 3086) + // Minimum execution time: 10_216_000 picoseconds. + Weight::from_parts(10_571_000, 3086) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -105,8 +105,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `97` // Estimated: `3086` - // Minimum execution time: 15_054_000 picoseconds. - Weight::from_parts(15_219_000, 3086) + // Minimum execution time: 14_241_000 picoseconds. + Weight::from_parts(14_711_000, 3086) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -124,8 +124,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `138` // Estimated: `4764` - // Minimum execution time: 27_562_000 picoseconds. - Weight::from_parts(27_847_000, 4764) + // Minimum execution time: 30_193_000 picoseconds. + Weight::from_parts(30_498_000, 4764) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -141,8 +141,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `156` // Estimated: `4764` - // Minimum execution time: 30_938_000 picoseconds. - Weight::from_parts(31_494_000, 4764) + // Minimum execution time: 30_765_000 picoseconds. + Weight::from_parts(31_167_000, 4764) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -158,8 +158,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `156` // Estimated: `4764` - // Minimum execution time: 28_608_000 picoseconds. - Weight::from_parts(29_210_000, 4764) + // Minimum execution time: 28_141_000 picoseconds. + Weight::from_parts(28_502_000, 4764) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -176,10 +176,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `187` // Estimated: `4764` - // Minimum execution time: 28_538_000 picoseconds. - Weight::from_parts(29_479_578, 4764) - // Standard Error: 4_546 - .saturating_add(Weight::from_parts(186_430, 0).saturating_mul(x.into())) + // Minimum execution time: 27_809_000 picoseconds. + Weight::from_parts(28_780_892, 4764) + // Standard Error: 4_544 + .saturating_add(Weight::from_parts(190_464, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -195,8 +195,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `182` // Estimated: `4764` - // Minimum execution time: 25_327_000 picoseconds. - Weight::from_parts(25_930_000, 4764) + // Minimum execution time: 25_097_000 picoseconds. + Weight::from_parts(25_376_000, 4764) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -218,8 +218,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `272` // Estimated: `4764` - // Minimum execution time: 38_972_000 picoseconds. - Weight::from_parts(39_410_000, 4764) + // Minimum execution time: 38_233_000 picoseconds. + Weight::from_parts(38_804_000, 4764) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -241,8 +241,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `453` // Estimated: `4764` - // Minimum execution time: 43_013_000 picoseconds. - Weight::from_parts(43_369_000, 4764) + // Minimum execution time: 42_466_000 picoseconds. + Weight::from_parts(42_850_000, 4764) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -261,10 +261,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `522` // Estimated: `4764` - // Minimum execution time: 43_303_000 picoseconds. - Weight::from_parts(42_353_415, 4764) - // Standard Error: 4_034 - .saturating_add(Weight::from_parts(1_894_887, 0).saturating_mul(x.into())) + // Minimum execution time: 46_446_000 picoseconds. + Weight::from_parts(45_930_258, 4764) + // Standard Error: 4_071 + .saturating_add(Weight::from_parts(1_720_079, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -281,10 +281,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `501` // Estimated: `4764` - // Minimum execution time: 40_833_000 picoseconds. - Weight::from_parts(40_376_535, 4764) - // Standard Error: 4_977 - .saturating_add(Weight::from_parts(1_875_635, 0).saturating_mul(x.into())) + // Minimum execution time: 44_171_000 picoseconds. + Weight::from_parts(43_679_252, 4764) + // Standard Error: 4_295 + .saturating_add(Weight::from_parts(1_728_663, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -298,8 +298,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `271` // Estimated: `3775` - // Minimum execution time: 31_691_000 picoseconds. - Weight::from_parts(32_123_000, 3775) + // Minimum execution time: 34_646_000 picoseconds. + Weight::from_parts(34_959_000, 3775) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -311,8 +311,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `2672` // Estimated: `5113` - // Minimum execution time: 50_729_000 picoseconds. - Weight::from_parts(51_933_000, 5113) + // Minimum execution time: 50_005_000 picoseconds. + Weight::from_parts(50_884_000, 5113) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -332,8 +332,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `317` // Estimated: `4764` - // Minimum execution time: 35_712_000 picoseconds. - Weight::from_parts(35_993_000, 4764) + // Minimum execution time: 36_058_000 picoseconds. + Weight::from_parts(36_468_000, 4764) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -350,10 +350,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `255 + x * (73 ±0)` // Estimated: `4764 + x * (2653 ±0)` - // Minimum execution time: 35_330_000 picoseconds. - Weight::from_parts(31_912_755, 4764) - // Standard Error: 12_633 - .saturating_add(Weight::from_parts(4_919_251, 0).saturating_mul(x.into())) + // Minimum execution time: 35_401_000 picoseconds. + Weight::from_parts(31_550_798, 4764) + // Standard Error: 9_420 + .saturating_add(Weight::from_parts(4_950_275, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) @@ -366,8 +366,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `1486` - // Minimum execution time: 8_737_000 picoseconds. - Weight::from_parts(8_898_000, 1486) + // Minimum execution time: 8_432_000 picoseconds. + Weight::from_parts(8_696_000, 1486) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: `DappStaking::CurrentEraInfo` (r:1 w:1) @@ -384,8 +384,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `334` // Estimated: `4254` - // Minimum execution time: 24_461_000 picoseconds. - Weight::from_parts(25_019_000, 4254) + // Minimum execution time: 24_158_000 picoseconds. + Weight::from_parts(24_700_000, 4254) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -409,8 +409,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `631` // Estimated: `4254` - // Minimum execution time: 37_507_000 picoseconds. - Weight::from_parts(38_532_000, 4254) + // Minimum execution time: 37_971_000 picoseconds. + Weight::from_parts(38_780_000, 4254) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -430,8 +430,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `386` // Estimated: `4254` - // Minimum execution time: 27_753_000 picoseconds. - Weight::from_parts(28_097_000, 4254) + // Minimum execution time: 27_435_000 picoseconds. + Weight::from_parts(28_483_000, 4254) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -444,10 +444,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `152 + x * (32 ±0)` // Estimated: `3061 + x * (2071 ±0)` - // Minimum execution time: 6_671_000 picoseconds. - Weight::from_parts(11_257_216, 3061) - // Standard Error: 2_748 - .saturating_add(Weight::from_parts(2_393_417, 0).saturating_mul(x.into())) + // Minimum execution time: 8_569_000 picoseconds. + Weight::from_parts(11_220_207, 3061) + // Standard Error: 2_396 + .saturating_add(Weight::from_parts(2_393_849, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(Weight::from_parts(0, 2071).saturating_mul(x.into())) @@ -462,8 +462,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `293` // Estimated: `4254` - // Minimum execution time: 7_523_000 picoseconds. - Weight::from_parts(7_623_000, 4254) + // Minimum execution time: 8_023_000 picoseconds. + Weight::from_parts(8_354_000, 4254) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } diff --git a/runtime/shibuya/src/weights/pallet_inflation.rs b/runtime/shibuya/src/weights/pallet_inflation.rs index 23e9a4f18..ac8f849fe 100644 --- a/runtime/shibuya/src/weights/pallet_inflation.rs +++ b/runtime/shibuya/src/weights/pallet_inflation.rs @@ -51,45 +51,45 @@ use pallet_inflation::WeightInfo; /// Weights for pallet_inflation using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { - /// Storage: Inflation InflationParams (r:0 w:1) - /// Proof: Inflation InflationParams (max_values: Some(1), max_size: Some(64), added: 559, mode: MaxEncodedLen) + /// Storage: `Inflation::InflationParams` (r:0 w:1) + /// Proof: `Inflation::InflationParams` (`max_values`: Some(1), `max_size`: Some(64), added: 559, mode: `MaxEncodedLen`) fn force_set_inflation_params() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 9_487_000 picoseconds. - Weight::from_parts(9_652_000, 0) + // Minimum execution time: 6_123_000 picoseconds. + Weight::from_parts(6_252_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: Inflation InflationParams (r:1 w:0) - /// Proof: Inflation InflationParams (max_values: Some(1), max_size: Some(64), added: 559, mode: MaxEncodedLen) + /// Storage: `Inflation::InflationParams` (r:1 w:0) + /// Proof: `Inflation::InflationParams` (`max_values`: Some(1), `max_size`: Some(64), added: 559, mode: `MaxEncodedLen`) fn force_inflation_recalculation() -> Weight { // Proof Size summary in bytes: // Measured: `40` // Estimated: `1549` - // Minimum execution time: 13_496_000 picoseconds. - Weight::from_parts(13_762_000, 1549) + // Minimum execution time: 9_286_000 picoseconds. + Weight::from_parts(9_595_000, 1549) .saturating_add(T::DbWeight::get().reads(1_u64)) } - /// Storage: Inflation InflationParams (r:1 w:0) - /// Proof: Inflation InflationParams (max_values: Some(1), max_size: Some(64), added: 559, mode: MaxEncodedLen) + /// Storage: `Inflation::InflationParams` (r:1 w:0) + /// Proof: `Inflation::InflationParams` (`max_values`: Some(1), `max_size`: Some(64), added: 559, mode: `MaxEncodedLen`) fn recalculation() -> Weight { // Proof Size summary in bytes: // Measured: `58` // Estimated: `1549` - // Minimum execution time: 13_811_000 picoseconds. - Weight::from_parts(13_995_000, 1549) + // Minimum execution time: 9_081_000 picoseconds. + Weight::from_parts(9_327_000, 1549) .saturating_add(T::DbWeight::get().reads(1_u64)) } - /// Storage: System Account (r:2 w:1) - /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) + /// Storage: `System::Account` (r:2 w:2) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn hooks_without_recalculation() -> Weight { // Proof Size summary in bytes: // Measured: `174` // Estimated: `6196` - // Minimum execution time: 21_351_000 picoseconds. - Weight::from_parts(21_749_000, 6196) + // Minimum execution time: 36_384_000 picoseconds. + Weight::from_parts(37_046_000, 6196) .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } -} \ No newline at end of file +} diff --git a/runtime/shibuya/src/weights/pallet_xcm.rs b/runtime/shibuya/src/weights/pallet_xcm.rs index e9700b0c0..a4a6bd019 100644 --- a/runtime/shibuya/src/weights/pallet_xcm.rs +++ b/runtime/shibuya/src/weights/pallet_xcm.rs @@ -60,8 +60,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `109` // Estimated: `3574` - // Minimum execution time: 16_607_000 picoseconds. - Weight::from_parts(17_088_000, 3574) + // Minimum execution time: 16_751_000 picoseconds. + Weight::from_parts(17_207_000, 3574) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -88,10 +88,10 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { /// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`) fn reserve_transfer_assets() -> Weight { // Proof Size summary in bytes: - // Measured: `382` - // Estimated: `3847` - // Minimum execution time: 76_020_000 picoseconds. - Weight::from_parts(77_852_000, 3847) + // Measured: `348` + // Estimated: `3813` + // Minimum execution time: 78_254_000 picoseconds. + Weight::from_parts(79_116_000, 3813) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -119,16 +119,16 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 7_506_000 picoseconds. - Weight::from_parts(7_791_000, 0) + // Minimum execution time: 7_023_000 picoseconds. + Weight::from_parts(7_174_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } fn force_default_xcm_version() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_287_000 picoseconds. - Weight::from_parts(2_423_000, 0) + // Minimum execution time: 2_128_000 picoseconds. + Weight::from_parts(2_279_000, 0) } /// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1) /// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`) @@ -146,8 +146,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `109` // Estimated: `3574` - // Minimum execution time: 20_432_000 picoseconds. - Weight::from_parts(21_217_000, 3574) + // Minimum execution time: 21_762_000 picoseconds. + Weight::from_parts(22_188_000, 3574) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -165,8 +165,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `168` // Estimated: `3633` - // Minimum execution time: 21_477_000 picoseconds. - Weight::from_parts(21_811_000, 3633) + // Minimum execution time: 21_563_000 picoseconds. + Weight::from_parts(21_965_000, 3633) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -176,8 +176,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_284_000 picoseconds. - Weight::from_parts(2_499_000, 0) + // Minimum execution time: 2_229_000 picoseconds. + Weight::from_parts(2_353_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2) @@ -186,8 +186,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `22` // Estimated: `13387` - // Minimum execution time: 14_915_000 picoseconds. - Weight::from_parts(15_133_000, 13387) + // Minimum execution time: 14_779_000 picoseconds. + Weight::from_parts(15_096_000, 13387) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -197,8 +197,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `26` // Estimated: `13391` - // Minimum execution time: 14_764_000 picoseconds. - Weight::from_parts(14_997_000, 13391) + // Minimum execution time: 14_980_000 picoseconds. + Weight::from_parts(15_271_000, 13391) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -208,8 +208,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `75` // Estimated: `15915` - // Minimum execution time: 16_328_000 picoseconds. - Weight::from_parts(16_751_000, 15915) + // Minimum execution time: 16_655_000 picoseconds. + Weight::from_parts(17_231_000, 15915) .saturating_add(T::DbWeight::get().reads(6_u64)) } /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1) @@ -224,8 +224,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `142` // Estimated: `6082` - // Minimum execution time: 20_408_000 picoseconds. - Weight::from_parts(21_085_000, 6082) + // Minimum execution time: 20_914_000 picoseconds. + Weight::from_parts(21_162_000, 6082) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -235,8 +235,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `69` // Estimated: `10959` - // Minimum execution time: 11_110_000 picoseconds. - Weight::from_parts(11_401_000, 10959) + // Minimum execution time: 10_722_000 picoseconds. + Weight::from_parts(10_999_000, 10959) .saturating_add(T::DbWeight::get().reads(4_u64)) } /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2) @@ -245,8 +245,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `33` // Estimated: `13398` - // Minimum execution time: 15_421_000 picoseconds. - Weight::from_parts(15_759_000, 13398) + // Minimum execution time: 15_096_000 picoseconds. + Weight::from_parts(15_500_000, 13398) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -262,8 +262,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `142` // Estimated: `13507` - // Minimum execution time: 28_581_000 picoseconds. - Weight::from_parts(29_076_000, 13507) + // Minimum execution time: 28_084_000 picoseconds. + Weight::from_parts(28_712_000, 13507) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -275,8 +275,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `1485` - // Minimum execution time: 2_278_000 picoseconds. - Weight::from_parts(2_325_000, 1485) + // Minimum execution time: 2_163_000 picoseconds. + Weight::from_parts(2_264_000, 1485) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -286,8 +286,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `7576` // Estimated: `11041` - // Minimum execution time: 22_435_000 picoseconds. - Weight::from_parts(22_641_000, 11041) + // Minimum execution time: 21_322_000 picoseconds. + Weight::from_parts(21_524_000, 11041) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -297,8 +297,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `23` // Estimated: `3488` - // Minimum execution time: 31_984_000 picoseconds. - Weight::from_parts(32_565_000, 3488) + // Minimum execution time: 35_039_000 picoseconds. + Weight::from_parts(35_575_000, 3488) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/runtime/shibuya/src/weights/xcm/fungible.rs b/runtime/shibuya/src/weights/xcm/fungible.rs index b652c2fc8..beb8b4a25 100644 --- a/runtime/shibuya/src/weights/xcm/fungible.rs +++ b/runtime/shibuya/src/weights/xcm/fungible.rs @@ -72,10 +72,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn transfer_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `545` + // Measured: `612` // Estimated: `6232` - // Minimum execution time: 46_672_000 picoseconds. - Weight::from_parts(47_320_000, 6232) + // Minimum execution time: 44_349_000 picoseconds. + Weight::from_parts(44_918_000, 6232) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -97,10 +97,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn transfer_reserve_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `690` + // Measured: `790` // Estimated: `6232` - // Minimum execution time: 65_825_000 picoseconds. - Weight::from_parts(67_220_000, 6232) + // Minimum execution time: 61_640_000 picoseconds. + Weight::from_parts(62_585_000, 6232) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -134,10 +134,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `UnifiedAccounts::NativeToEvm` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`) fn withdraw_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `1960` - // Estimated: `5425` - // Minimum execution time: 54_402_000 picoseconds. - Weight::from_parts(55_279_000, 5425) + // Measured: `2026` + // Estimated: `5491` + // Minimum execution time: 54_686_000 picoseconds. + Weight::from_parts(55_449_000, 5491) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -145,8 +145,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_651_000 picoseconds. - Weight::from_parts(3_790_000, 0) + // Minimum execution time: 875_000 picoseconds. + Weight::from_parts(933_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -158,10 +158,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn initiate_reserve_withdraw() -> Weight { // Proof Size summary in bytes: - // Measured: `145` - // Estimated: `3610` - // Minimum execution time: 402_261_000 picoseconds. - Weight::from_parts(408_453_000, 3610) + // Measured: `178` + // Estimated: `3643` + // Minimum execution time: 49_394_000 picoseconds. + Weight::from_parts(49_879_000, 3643) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -175,102 +175,17 @@ impl WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn deposit_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `1696` - // Estimated: `5161` - // Minimum execution time: 42_761_000 picoseconds. - Weight::from_parts(43_379_000, 5161) + // Measured: `1762` + // Estimated: `5227` + // Minimum execution time: 40_018_000 picoseconds. + Weight::from_parts(40_687_000, 5227) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn deposit_reserve_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `1841` - // Estimated: `5306` - // Minimum execution time: 65_274_000 picoseconds. - Weight::from_parts(66_706_000, 5306) - .saturating_add(T::DbWeight::get().reads(8_u64)) - .saturating_add(T::DbWeight::get().writes(4_u64)) - } -} - -// For backwards compatibility and tests -impl WeightInfo for () { - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:2 w:2) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn transfer_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `545` - // Estimated: `6232` - // Minimum execution time: 46_672_000 picoseconds. - Weight::from_parts(47_320_000, 6232) - .saturating_add(RocksDbWeight::get().reads(5_u64)) - .saturating_add(RocksDbWeight::get().writes(4_u64)) - } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:2 w:2) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn transfer_reserve_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `690` - // Estimated: `6232` - // Minimum execution time: 65_825_000 picoseconds. - Weight::from_parts(67_220_000, 6232) - .saturating_add(RocksDbWeight::get().reads(9_u64)) - .saturating_add(RocksDbWeight::get().writes(5_u64)) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn receive_teleported_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn initiate_teleport() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `Assets::Asset` (r:1 w:1) @@ -279,81 +194,17 @@ impl WeightInfo for () { /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// Storage: `UnifiedAccounts::NativeToEvm` (r:1 w:0) - /// Proof: `UnifiedAccounts::NativeToEvm` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`) - fn withdraw_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `1960` - // Estimated: `5425` - // Minimum execution time: 54_402_000 picoseconds. - Weight::from_parts(55_279_000, 5425) - .saturating_add(RocksDbWeight::get().reads(5_u64)) - .saturating_add(RocksDbWeight::get().writes(3_u64)) - } - fn reserve_asset_deposited() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 3_651_000 picoseconds. - Weight::from_parts(3_790_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn initiate_reserve_withdraw() -> Weight { - // Proof Size summary in bytes: - // Measured: `145` - // Estimated: `3610` - // Minimum execution time: 402_261_000 picoseconds. - Weight::from_parts(408_453_000, 3610) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn deposit_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `1696` - // Estimated: `5161` - // Minimum execution time: 42_761_000 picoseconds. - Weight::from_parts(43_379_000, 5161) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(3_u64)) - } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn deposit_reserve_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `1841` - // Estimated: `5306` - // Minimum execution time: 65_274_000 picoseconds. - Weight::from_parts(66_706_000, 5306) - .saturating_add(RocksDbWeight::get().reads(8_u64)) - .saturating_add(RocksDbWeight::get().writes(4_u64)) + // Measured: `1940` + // Estimated: `5405` + // Minimum execution time: 74_430_000 picoseconds. + Weight::from_parts(75_763_000, 5405) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } } diff --git a/runtime/shibuya/src/weights/xcm/generic.rs b/runtime/shibuya/src/weights/xcm/generic.rs index 4d84b7e74..e7f3ce51f 100644 --- a/runtime/shibuya/src/weights/xcm/generic.rs +++ b/runtime/shibuya/src/weights/xcm/generic.rs @@ -101,20 +101,13 @@ impl WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn buy_execution() -> Weight { // Proof Size summary in bytes: - // Measured: `2468` - // Estimated: `5933` - // Minimum execution time: 102_493_000 picoseconds. - Weight::from_parts(104_977_000, 5933) + // Measured: `754` + // Estimated: `4219` + // Minimum execution time: 15_707_000 picoseconds. + Weight::from_parts(15_847_000, 4219) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } - fn expect_pallet() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 7_274_000 picoseconds. - Weight::from_parts(7_430_000, 0) - } /// Storage: `Benchmark::Override` (r:0 w:0) /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) fn exchange_asset() -> Weight { @@ -197,10 +190,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn report_holding() -> Weight { // Proof Size summary in bytes: - // Measured: `145` - // Estimated: `3610` - // Minimum execution time: 342_348_000 picoseconds. - Weight::from_parts(348_266_000, 3610) + // Measured: `200` + // Estimated: `3665` + // Minimum execution time: 50_248_000 picoseconds. + Weight::from_parts(50_660_000, 3665) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -210,58 +203,58 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `3465` - // Minimum execution time: 8_733_000 picoseconds. - Weight::from_parts(8_933_000, 3465) + // Minimum execution time: 4_926_000 picoseconds. + Weight::from_parts(5_108_000, 3465) .saturating_add(T::DbWeight::get().reads(1_u64)) } fn transact() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_175_000 picoseconds. - Weight::from_parts(11_392_000, 0) + // Minimum execution time: 7_228_000 picoseconds. + Weight::from_parts(7_374_000, 0) } fn refund_surplus() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_765_000 picoseconds. - Weight::from_parts(4_855_000, 0) + // Minimum execution time: 3_893_000 picoseconds. + Weight::from_parts(3_984_000, 0) } fn set_error_handler() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_766_000 picoseconds. - Weight::from_parts(2_882_000, 0) + // Minimum execution time: 685_000 picoseconds. + Weight::from_parts(713_000, 0) } fn set_appendix() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_808_000 picoseconds. - Weight::from_parts(2_906_000, 0) + // Minimum execution time: 678_000 picoseconds. + Weight::from_parts(707_000, 0) } fn clear_error() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_750_000 picoseconds. - Weight::from_parts(2_810_000, 0) + // Minimum execution time: 580_000 picoseconds. + Weight::from_parts(626_000, 0) } fn descend_origin() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_345_000 picoseconds. - Weight::from_parts(3_463_000, 0) + // Minimum execution time: 654_000 picoseconds. + Weight::from_parts(705_000, 0) } fn clear_origin() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_741_000 picoseconds. - Weight::from_parts(2_828_000, 0) + // Minimum execution time: 639_000 picoseconds. + Weight::from_parts(672_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -273,10 +266,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn report_error() -> Weight { // Proof Size summary in bytes: - // Measured: `145` - // Estimated: `3610` - // Minimum execution time: 21_978_000 picoseconds. - Weight::from_parts(22_563_000, 3610) + // Measured: `200` + // Estimated: `3665` + // Minimum execution time: 18_667_000 picoseconds. + Weight::from_parts(19_149_000, 3665) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -286,8 +279,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `23` // Estimated: `3488` - // Minimum execution time: 12_387_000 picoseconds. - Weight::from_parts(12_607_000, 3488) + // Minimum execution time: 7_860_000 picoseconds. + Weight::from_parts(7_979_000, 3488) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -295,8 +288,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_722_000 picoseconds. - Weight::from_parts(2_779_000, 0) + // Minimum execution time: 594_000 picoseconds. + Weight::from_parts(633_000, 0) } /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1) /// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`) @@ -308,10 +301,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn subscribe_version() -> Weight { // Proof Size summary in bytes: - // Measured: `42` - // Estimated: `3507` - // Minimum execution time: 22_260_000 picoseconds. - Weight::from_parts(22_897_000, 3507) + // Measured: `131` + // Estimated: `3596` + // Minimum execution time: 16_667_000 picoseconds. + Weight::from_parts(16_966_000, 3596) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -321,44 +314,44 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_742_000 picoseconds. - Weight::from_parts(4_843_000, 0) + // Minimum execution time: 2_541_000 picoseconds. + Weight::from_parts(2_598_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } fn burn_asset() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 119_879_000 picoseconds. - Weight::from_parts(124_068_000, 0) + // Minimum execution time: 22_004_000 picoseconds. + Weight::from_parts(22_225_000, 0) } fn expect_asset() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_953_000 picoseconds. - Weight::from_parts(11_274_000, 0) + // Minimum execution time: 7_361_000 picoseconds. + Weight::from_parts(7_610_000, 0) } fn expect_origin() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_748_000 picoseconds. - Weight::from_parts(2_892_000, 0) + // Minimum execution time: 640_000 picoseconds. + Weight::from_parts(678_000, 0) } fn expect_error() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_719_000 picoseconds. - Weight::from_parts(2_803_000, 0) + // Minimum execution time: 644_000 picoseconds. + Weight::from_parts(668_000, 0) } fn expect_transact_status() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_899_000 picoseconds. - Weight::from_parts(3_010_000, 0) + // Minimum execution time: 801_000 picoseconds. + Weight::from_parts(844_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -370,356 +363,19 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn query_pallet() -> Weight { // Proof Size summary in bytes: - // Measured: `145` - // Estimated: `3610` - // Minimum execution time: 27_788_000 picoseconds. - Weight::from_parts(28_127_000, 3610) + // Measured: `200` + // Estimated: `3665` + // Minimum execution time: 25_797_000 picoseconds. + Weight::from_parts(26_201_000, 3665) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn report_transact_status() -> Weight { - // Proof Size summary in bytes: - // Measured: `145` - // Estimated: `3610` - // Minimum execution time: 22_250_000 picoseconds. - Weight::from_parts(22_723_000, 3610) - .saturating_add(T::DbWeight::get().reads(4_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - } - fn clear_transact_status() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_697_000 picoseconds. - Weight::from_parts(2_892_000, 0) - } - fn set_topic() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_632_000 picoseconds. - Weight::from_parts(2_811_000, 0) - } - fn clear_topic() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_727_000 picoseconds. - Weight::from_parts(2_809_000, 0) - } - fn set_fees_mode() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_779_000 picoseconds. - Weight::from_parts(2_861_000, 0) - } - fn unpaid_execution() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_915_000 picoseconds. - Weight::from_parts(3_021_000, 0) - } -} - -// For backwards compatibility and tests -impl WeightInfo for () { - /// Storage: `XcAssetConfig::AssetLocationUnitsPerSecond` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationUnitsPerSecond` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn buy_execution() -> Weight { - // Proof Size summary in bytes: - // Measured: `2468` - // Estimated: `5933` - // Minimum execution time: 102_493_000 picoseconds. - Weight::from_parts(104_977_000, 5933) - .saturating_add(RocksDbWeight::get().reads(5_u64)) - .saturating_add(RocksDbWeight::get().writes(3_u64)) - } fn expect_pallet() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 7_274_000 picoseconds. - Weight::from_parts(7_430_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn exchange_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn export_message() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn lock_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn unlock_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn note_unlockable() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn request_unlock() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn universal_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn alias_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn report_holding() -> Weight { - // Proof Size summary in bytes: - // Measured: `145` - // Estimated: `3610` - // Minimum execution time: 342_348_000 picoseconds. - Weight::from_parts(348_266_000, 3610) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - /// Storage: `PolkadotXcm::Queries` (r:1 w:0) - /// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn query_response() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `3465` - // Minimum execution time: 8_733_000 picoseconds. - Weight::from_parts(8_933_000, 3465) - .saturating_add(RocksDbWeight::get().reads(1_u64)) - } - fn transact() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 11_175_000 picoseconds. - Weight::from_parts(11_392_000, 0) - } - fn refund_surplus() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 4_765_000 picoseconds. - Weight::from_parts(4_855_000, 0) - } - fn set_error_handler() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_766_000 picoseconds. - Weight::from_parts(2_882_000, 0) - } - fn set_appendix() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_808_000 picoseconds. - Weight::from_parts(2_906_000, 0) - } - fn clear_error() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_750_000 picoseconds. - Weight::from_parts(2_810_000, 0) - } - fn descend_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 3_345_000 picoseconds. - Weight::from_parts(3_463_000, 0) - } - fn clear_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_741_000 picoseconds. - Weight::from_parts(2_828_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn report_error() -> Weight { - // Proof Size summary in bytes: - // Measured: `145` - // Estimated: `3610` - // Minimum execution time: 21_978_000 picoseconds. - Weight::from_parts(22_563_000, 3610) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - /// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1) - /// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn claim_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `23` - // Estimated: `3488` - // Minimum execution time: 12_387_000 picoseconds. - Weight::from_parts(12_607_000, 3488) - .saturating_add(RocksDbWeight::get().reads(1_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - fn trap() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_722_000 picoseconds. - Weight::from_parts(2_779_000, 0) - } - /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1) - /// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn subscribe_version() -> Weight { - // Proof Size summary in bytes: - // Measured: `42` - // Estimated: `3507` - // Minimum execution time: 22_260_000 picoseconds. - Weight::from_parts(22_897_000, 3507) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(2_u64)) - } - /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:0 w:1) - /// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn unsubscribe_version() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 4_742_000 picoseconds. - Weight::from_parts(4_843_000, 0) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - fn burn_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 119_879_000 picoseconds. - Weight::from_parts(124_068_000, 0) - } - fn expect_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 10_953_000 picoseconds. - Weight::from_parts(11_274_000, 0) - } - fn expect_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_748_000 picoseconds. - Weight::from_parts(2_892_000, 0) - } - fn expect_error() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_719_000 picoseconds. - Weight::from_parts(2_803_000, 0) - } - fn expect_transact_status() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_899_000 picoseconds. - Weight::from_parts(3_010_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn query_pallet() -> Weight { - // Proof Size summary in bytes: - // Measured: `145` - // Estimated: `3610` - // Minimum execution time: 27_788_000 picoseconds. - Weight::from_parts(28_127_000, 3610) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) + // Minimum execution time: 5_902_000 picoseconds. + Weight::from_parts(6_002_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -731,46 +387,46 @@ impl WeightInfo for () { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn report_transact_status() -> Weight { // Proof Size summary in bytes: - // Measured: `145` - // Estimated: `3610` - // Minimum execution time: 22_250_000 picoseconds. - Weight::from_parts(22_723_000, 3610) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) + // Measured: `200` + // Estimated: `3665` + // Minimum execution time: 19_075_000 picoseconds. + Weight::from_parts(19_298_000, 3665) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn clear_transact_status() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_697_000 picoseconds. - Weight::from_parts(2_892_000, 0) + // Minimum execution time: 634_000 picoseconds. + Weight::from_parts(674_000, 0) } fn set_topic() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_632_000 picoseconds. - Weight::from_parts(2_811_000, 0) + // Minimum execution time: 584_000 picoseconds. + Weight::from_parts(647_000, 0) } fn clear_topic() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_727_000 picoseconds. - Weight::from_parts(2_809_000, 0) + // Minimum execution time: 589_000 picoseconds. + Weight::from_parts(615_000, 0) } fn set_fees_mode() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_779_000 picoseconds. - Weight::from_parts(2_861_000, 0) + // Minimum execution time: 589_000 picoseconds. + Weight::from_parts(604_000, 0) } fn unpaid_execution() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_915_000 picoseconds. - Weight::from_parts(3_021_000, 0) + // Minimum execution time: 643_000 picoseconds. + Weight::from_parts(663_000, 0) } } diff --git a/runtime/shibuya/src/xcm_config.rs b/runtime/shibuya/src/xcm_config.rs index 9bd00a698..beb5f76f4 100644 --- a/runtime/shibuya/src/xcm_config.rs +++ b/runtime/shibuya/src/xcm_config.rs @@ -143,7 +143,7 @@ parameter_types! { // For the PoV size, we estimate 4 kB per instruction. This will be changed when we benchmark the instructions. pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 4 * 1024); pub const MaxInstructions: u32 = 100; - pub const MaxAssetsIntoHolding: u32 = MAX_ASSETS; + pub const MaxAssetsIntoHolding: u32 = MAX_ASSETS as u32; } pub struct ParentOrParentsPlurality; @@ -208,6 +208,10 @@ impl xcm_executor::Config for XcmConfig { type SafeCallFilter = Everything; type Aliasers = Nothing; type TransactionalProcessor = FrameTransactionalProcessor; + + type HrmpNewChannelOpenRequestHandler = (); + type HrmpChannelAcceptedHandler = (); + type HrmpChannelClosingHandler = (); } /// Local origins on this chain are allowed to dispatch XCM sends/executions. @@ -266,16 +270,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight; } -parameter_types! { - pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent; -} - -impl cumulus_pallet_dmp_queue::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type DmpSink = frame_support::traits::EnqueueWithOrigin; - type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight; -} - parameter_types! { /// The absolute location in perspective of the whole network. pub ShibuyaLocationAbsolute: Location = Location { diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml index 56fddfdee..d141238e9 100644 --- a/runtime/shiden/Cargo.toml +++ b/runtime/shiden/Cargo.toml @@ -92,6 +92,7 @@ polkadot-runtime-common = { workspace = true } xcm = { workspace = true } xcm-builder = { workspace = true } xcm-executor = { workspace = true } +xcm-fee-payment-runtime-api = { workspace = true } # orml dependencies orml-oracle = { workspace = true } @@ -177,6 +178,7 @@ std = [ "pallet-evm-precompile-dispatch-lockdrop/std", "pallet-evm-precompile-ed25519/std", "pallet-evm-precompile-modexp/std", + "xcm-fee-payment-runtime-api/std", "pallet-evm-precompile-sha3fips/std", "pallet-dapp-staking-v3/std", "pallet-dapp-staking-migration/std", diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index ef219c5a7..eb45eecec 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -26,18 +26,19 @@ use cumulus_primitives_core::AggregateMessageOrigin; use frame_support::{ construct_runtime, dispatch::DispatchClass, - genesis_builder_helper::{build_config, create_default_config}, + genesis_builder_helper::{build_state, get_preset}, parameter_types, traits::{ - AsEnsureOriginWithArg, ConstBool, ConstU32, Contains, Currency, FindAuthor, Get, Imbalance, + fungible::{Balanced, Credit}, + AsEnsureOriginWithArg, ConstBool, ConstU32, ConstU64, Contains, FindAuthor, Get, Imbalance, InstanceFilter, Nothing, OnFinalize, OnUnbalanced, WithdrawReasons, }, weights::{ constants::{ BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, }, - ConstantMultiplier, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, - WeightToFeePolynomial, + ConstantMultiplier, Weight, WeightToFee as WeightToFeeT, WeightToFeeCoefficient, + WeightToFeeCoefficients, WeightToFeePolynomial, }, ConsensusEngineId, PalletId, }; @@ -66,6 +67,11 @@ use sp_runtime::{ ApplyExtrinsicResult, FixedPointNumber, FixedU128, Perbill, Permill, Perquintill, RuntimeDebug, }; use sp_std::{collections::btree_map::BTreeMap, prelude::*}; +use xcm::{ + v4::{AssetId as XcmAssetId, Location as XcmLocation}, + IntoVersion, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm, +}; +use xcm_fee_payment_runtime_api::Error as XcmPaymentApiError; use astar_primitives::{ dapp_staking::{ @@ -133,6 +139,7 @@ pub const fn contracts_deposit(items: u32, bytes: u32) -> Balance { /// Change this to adjust the block time. pub const MILLISECS_PER_BLOCK: u64 = 12000; pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK; + // Time is measured by number of blocks. pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber); pub const HOURS: BlockNumber = MINUTES * 60; @@ -326,6 +333,7 @@ impl pallet_message_queue::Config for Runtime { type HeapSize = ConstU32<{ 128 * 1048 }>; type MaxStale = ConstU32<8>; type ServiceWeight = MessageQueueServiceWeight; + type IdleMaxServiceWeight = MessageQueueServiceWeight; } impl pallet_insecure_randomness_collective_flip::Config for Runtime {} @@ -450,12 +458,12 @@ impl pallet_dapp_staking_v3::Config for Runtime { } pub struct InflationPayoutPerBlock; -impl pallet_inflation::PayoutPerBlock for InflationPayoutPerBlock { - fn treasury(reward: NegativeImbalance) { - Balances::resolve_creating(&TreasuryPalletId::get().into_account_truncating(), reward); +impl pallet_inflation::PayoutPerBlock> for InflationPayoutPerBlock { + fn treasury(reward: Credit) { + let _ = Balances::resolve(&TreasuryPalletId::get().into_account_truncating(), reward); } - fn collators(reward: NegativeImbalance) { + fn collators(reward: Credit) { ToStakingPot::on_unbalanced(reward); } } @@ -528,6 +536,7 @@ impl pallet_aura::Config for Runtime { type DisabledValidators = (); type MaxAuthorities = ConstU32<250>; type AllowMultipleBlocksPerSlot = ConstBool; + type SlotDuration = ConstU64; } impl cumulus_pallet_aura_ext::Config for Runtime {} @@ -594,13 +603,11 @@ parameter_types! { pub TreasuryAccountId: AccountId = TreasuryPalletId::get().into_account_truncating(); } -type NegativeImbalance = >::NegativeImbalance; - pub struct ToStakingPot; -impl OnUnbalanced for ToStakingPot { - fn on_nonzero_unbalanced(amount: NegativeImbalance) { +impl OnUnbalanced> for ToStakingPot { + fn on_nonzero_unbalanced(amount: Credit) { let staking_pot = PotId::get().into_account_truncating(); - Balances::resolve_creating(&staking_pot, amount); + let _ = Balances::resolve(&staking_pot, amount); } } @@ -739,7 +746,7 @@ impl pallet_contracts::Config for Runtime { type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; type Debug = (); type Environment = (); - type Migrations = (); + type Migrations = (pallet_contracts::migration::v16::Migration,); type Xcm = (); type UploadOrigin = EnsureSigned<::AccountId>; type InstantiateOrigin = EnsureSigned<::AccountId>; @@ -785,7 +792,7 @@ impl WeightToFeePolynomial for WeightToFee { /// /// Similar to standard `WeightToFee` handler, but force uses the minimum multiplier. pub struct XcmWeightToFee; -impl frame_support::weights::WeightToFee for XcmWeightToFee { +impl WeightToFeeT for XcmWeightToFee { type Balance = Balance; fn weight_to_fee(n: &Weight) -> Self::Balance { @@ -794,11 +801,10 @@ impl frame_support::weights::WeightToFee for XcmWeightToFee { } pub struct DealWithFees; -impl OnUnbalanced for DealWithFees { - /// Payout tips but burn all the fees - fn on_unbalanceds(mut fees_then_tips: impl Iterator) { +impl OnUnbalanced> for DealWithFees { + fn on_unbalanceds(mut fees_then_tips: impl Iterator>) { if let Some(fees) = fees_then_tips.next() { - // Burn 80% of fees, rest goes to the collator, including 100% of the tips. + // Burn 80% of fees, rest goes to collator, including 100% of the tips. let (to_burn, mut collator) = fees.ration(80, 20); if let Some(tips) = fees_then_tips.next() { tips.merge_into(&mut collator); @@ -815,7 +821,7 @@ impl OnUnbalanced for DealWithFees { impl pallet_transaction_payment::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; + type OnChargeTransaction = pallet_transaction_payment::FungibleAdapter; type WeightToFee = WeightToFee; type OperationalFeeMultiplier = OperationalFeeMultiplier; type FeeMultiplierUpdate = TargetedFeeAdjustment< @@ -871,7 +877,8 @@ impl> FindAuthor for FindAuthorTruncated { I: 'a + IntoIterator, { if let Some(author_index) = F::find_author(digests) { - let authority_id = Aura::authorities()[author_index as usize].clone(); + let authority_id = + pallet_aura::Authorities::::get()[author_index as usize].clone(); return Some(H160::from_slice(&authority_id.encode()[4..24])); } @@ -914,7 +921,7 @@ impl pallet_evm::Config for Runtime { type PrecompilesType = Precompiles; type PrecompilesValue = PrecompilesValue; type ChainId = ChainId; - type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter; + type OnChargeTransaction = pallet_evm::EVMFungibleAdapter; type BlockGasLimit = BlockGasLimit; type Timestamp = Timestamp; type OnCreate = (); @@ -1017,7 +1024,6 @@ impl InstanceFilter for ProxyType { | RuntimeCall::XcmpQueue(..) | RuntimeCall::PolkadotXcm(..) | RuntimeCall::CumulusXcm(..) - | RuntimeCall::DmpQueue(..) | RuntimeCall::XcAssetConfig(..) // Skip entire EVM pallet // Skip entire Ethereum pallet @@ -1218,7 +1224,6 @@ construct_runtime!( XcmpQueue: cumulus_pallet_xcmp_queue = 50, PolkadotXcm: pallet_xcm = 51, CumulusXcm: cumulus_pallet_xcm = 52, - DmpQueue: cumulus_pallet_dmp_queue = 53, XcAssetConfig: pallet_xc_asset_config = 54, XTokens: orml_xtokens = 55, MessageQueue: pallet_message_queue = 56, @@ -1290,18 +1295,22 @@ parameter_types! { ]; } +parameter_types! { + pub const DmpQueuePalletName: &'static str = "DmpQueue"; +} + /// All migrations that will run on the next runtime upgrade. /// /// Once done, migrations should be removed from the tuple. pub type Migrations = ( - cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4, - // permanent migration, do not remove pallet_xcm::migration::MigrateToLatestXcmVersion, - // XCM V3 -> V4 - pallet_xc_asset_config::migrations::versioned::V2ToV3, - pallet_identity::migration::versioned::V0ToV1, // dapp-staking dyn tier threshold migrations pallet_dapp_staking_v3::migration::versioned_migrations::V7ToV8, + frame_support::migrations::RemovePallet< + DmpQueuePalletName, + ::DbWeight, + >, + pallet_contracts::Migration, ); type EventRecord = frame_system::EventRecord< @@ -1388,7 +1397,6 @@ mod benches { [xcm_benchmarks_generic, XcmGeneric] [xcm_benchmarks_fungible, XcmFungible] [pallet_price_aggregator, PriceAggregator] - [pallet_membership, OracleMembership] [orml_oracle, Oracle] ); } @@ -1428,7 +1436,7 @@ impl_runtime_apis! { } fn authorities() -> Vec { - Aura::authorities().into_inner() + pallet_aura::Authorities::::get().into_inner() } } @@ -1878,13 +1886,76 @@ impl_runtime_apis! { } } + impl xcm_fee_payment_runtime_api::XcmPaymentApi for Runtime { + fn query_acceptable_payment_assets(xcm_version: xcm::Version) -> Result, XcmPaymentApiError> { + if !matches!(xcm_version, xcm::v3::VERSION | xcm::v4::VERSION) { + return Err(XcmPaymentApiError::UnhandledXcmVersion); + } + + // Native asset is always supported + let native_asset_location: XcmLocation = XcmLocation::try_from(xcm_config::ShidenLocation::get()) + .map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + + Ok([VersionedAssetId::V4(native_asset_location.into())] + .into_iter() + // Acquire foreign assets which have 'units per second' configured + .chain( + pallet_xc_asset_config::AssetLocationUnitsPerSecond::::iter_keys().filter_map(|asset_location| { + + match XcmLocation::try_from(asset_location) { + Ok(asset) => Some(VersionedAssetId::V4(asset.into())), + Err(_) => None, + } + }) + ).filter_map(|asset| asset.into_version(xcm_version).ok()).collect()) + } + + fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result { + let native_asset_location = XcmLocation::try_from(xcm_config::ShidenLocation::get()) + .map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + let native_asset = VersionedAssetId::V4(native_asset_location.into()); + + let asset = asset + .into_version(xcm::v4::VERSION) + .map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + + if native_asset == asset { + Ok(XcmWeightToFee::weight_to_fee(&weight)) + } else { + let asset_id: XcmAssetId = asset.try_into().map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?; + let versioned_location = VersionedLocation::V4(asset_id.0); + + match pallet_xc_asset_config::AssetLocationUnitsPerSecond::::get(versioned_location) { + Some(units_per_sec) => { + Ok(units_per_sec.saturating_mul(weight.ref_time() as u128) + / (WEIGHT_REF_TIME_PER_SECOND as u128)) + } + None => Err(XcmPaymentApiError::AssetNotFound), + } + } + } + + fn query_xcm_weight(message: VersionedXcm<()>) -> Result { + PolkadotXcm::query_xcm_weight(message) + } + + fn query_delivery_fees(destination: VersionedLocation, message: VersionedXcm<()>) -> Result { + PolkadotXcm::query_delivery_fees(destination, message) + } + } + impl sp_genesis_builder::GenesisBuilder for Runtime { - fn create_default_config() -> Vec { - create_default_config::() + + fn build_state(config: Vec) -> sp_genesis_builder::Result { + build_state::(config) + } + + fn get_preset(id: &Option) -> Option> { + get_preset::(id, |_| None) } - fn build_config(config: Vec) -> sp_genesis_builder::Result { - build_config::(config) + fn preset_names() -> Vec { + vec![] } } @@ -1993,6 +2064,7 @@ impl_runtime_apis! { // destination location to be used in benchmarks fn valid_destination() -> Result { + assert_ok!(PolkadotXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(Location::parent()), xcm::v4::VERSION)); Ok(Location::parent()) } fn worst_case_holding(_depositable_count: u32) -> Assets { @@ -2016,11 +2088,13 @@ impl_runtime_apis! { } fn transact_origin_and_runtime_call() -> Result<(Location, RuntimeCall), BenchmarkError> { + assert_ok!(PolkadotXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(Location::parent()), xcm::v4::VERSION)); Ok((Location::parent(), frame_system::Call::remark_with_event { remark: vec![] }.into())) } fn subscribe_origin() -> Result { + assert_ok!(PolkadotXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(Location::parent()), xcm::v4::VERSION)); Ok(Location::parent()) } fn claimable_asset() @@ -2043,7 +2117,7 @@ impl_runtime_apis! { Err(BenchmarkError::Skip) } fn fee_asset() -> Result { - Ok((AssetId(Here.into()), 100).into()) + Ok((AssetId(Here.into()), 1_000_000_000_000_000_000u128).into()) } } @@ -2180,6 +2254,84 @@ impl_runtime_apis! { Ok(()) } + + fn trace_call( + header: &::Header, + from: H160, + to: H160, + data: Vec, + value: U256, + gas_limit: U256, + max_fee_per_gas: Option, + max_priority_fee_per_gas: Option, + nonce: Option, + access_list: Option)>>, + ) -> Result<(), sp_runtime::DispatchError> { + use moonbeam_evm_tracer::tracer::EvmTracer; + + // Initialize block: calls the "on_initialize" hook on every pallet + // in AllPalletsWithSystem. + Executive::initialize_block(header); + + EvmTracer::new().trace(|| { + let is_transactional = false; + let validate = true; + let without_base_extrinsic_weight = true; + + + // Estimated encoded transaction size must be based on the heaviest transaction + // type (EIP1559Transaction) to be compatible with all transaction types. + let mut estimated_transaction_len = data.len() + + // pallet ethereum index: 1 + // transact call index: 1 + // Transaction enum variant: 1 + // chain_id 8 bytes + // nonce: 32 + // max_priority_fee_per_gas: 32 + // max_fee_per_gas: 32 + // gas_limit: 32 + // action: 21 (enum varianrt + call address) + // value: 32 + // access_list: 1 (empty vec size) + // 65 bytes signature + 258; + + if access_list.is_some() { + estimated_transaction_len += access_list.encoded_size(); + } + + let gas_limit = gas_limit.min(u64::MAX.into()).low_u64(); + + let (weight_limit, proof_size_base_cost) = + match ::GasWeightMapping::gas_to_weight( + gas_limit, + without_base_extrinsic_weight + ) { + weight_limit if weight_limit.proof_size() > 0 => { + (Some(weight_limit), Some(estimated_transaction_len as u64)) + } + _ => (None, None), + }; + + let _ = ::Runner::call( + from, + to, + data, + value, + gas_limit, + max_fee_per_gas, + max_priority_fee_per_gas, + nonce, + access_list.unwrap_or_default(), + is_transactional, + validate, + weight_limit, + proof_size_base_cost, + ::config(), + ); + }); + Ok(()) + } } #[cfg(feature = "evm-tracing")] diff --git a/runtime/shiden/src/weights/orml_oracle.rs b/runtime/shiden/src/weights/orml_oracle.rs index 3e75d78f7..81b7a0491 100644 --- a/runtime/shiden/src/weights/orml_oracle.rs +++ b/runtime/shiden/src/weights/orml_oracle.rs @@ -59,17 +59,19 @@ impl orml_oracle::WeightInfo for SubstrateWeight { /// Proof: `Oracle::RawValues` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`) /// Storage: `Oracle::Values` (r:1 w:0) /// Proof: `Oracle::Values` (`max_values`: None, `max_size`: Some(33), added: 2508, mode: `MaxEncodedLen`) - /// The range of component `x` is `[1, 2]`. + /// The range of component `x` is `[0, 2]`. fn feed_values(x: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `280` // Estimated: `8634` - // Minimum execution time: 23_928_000 picoseconds. - Weight::from_parts(17_432_536, 8634) - // Standard Error: 59_231 - .saturating_add(Weight::from_parts(7_374_981, 0).saturating_mul(x.into())) - .saturating_add(T::DbWeight::get().reads(7_u64)) - .saturating_add(T::DbWeight::get().writes(2_u64)) + // Minimum execution time: 14_545_000 picoseconds. + Weight::from_parts(15_206_594, 8634) + // Standard Error: 24_225 + .saturating_add(Weight::from_parts(9_173_537, 0).saturating_mul(x.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(x.into()))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(x.into()))) } /// Storage: `Oracle::HasDispatched` (r:0 w:1) /// Proof: `Oracle::HasDispatched` (`max_values`: Some(1), `max_size`: Some(257), added: 752, mode: `MaxEncodedLen`) @@ -77,8 +79,8 @@ impl orml_oracle::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 991_000 picoseconds. - Weight::from_parts(1_058_000, 0) + // Minimum execution time: 893_000 picoseconds. + Weight::from_parts(950_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/runtime/shiden/src/weights/pallet_assets.rs b/runtime/shiden/src/weights/pallet_assets.rs index 91e9431f0..2c4e9fcf2 100644 --- a/runtime/shiden/src/weights/pallet_assets.rs +++ b/runtime/shiden/src/weights/pallet_assets.rs @@ -59,8 +59,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `729` // Estimated: `4194` - // Minimum execution time: 32_201_000 picoseconds. - Weight::from_parts(32_640_000, 4194) + // Minimum execution time: 32_077_000 picoseconds. + Weight::from_parts(32_646_000, 4194) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -72,8 +72,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `589` // Estimated: `4054` - // Minimum execution time: 18_713_000 picoseconds. - Weight::from_parts(19_118_000, 4054) + // Minimum execution time: 19_086_000 picoseconds. + Weight::from_parts(19_458_000, 4054) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -83,8 +83,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `360` // Estimated: `3687` - // Minimum execution time: 13_233_000 picoseconds. - Weight::from_parts(13_624_000, 3687) + // Minimum execution time: 13_456_000 picoseconds. + Weight::from_parts(13_748_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -99,10 +99,10 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `360 + c * (208 ±0)` // Estimated: `3687 + c * (2621 ±0)` - // Minimum execution time: 14_861_000 picoseconds. - Weight::from_parts(14_957_000, 3687) - // Standard Error: 5_744 - .saturating_add(Weight::from_parts(10_900_837, 0).saturating_mul(c.into())) + // Minimum execution time: 14_367_000 picoseconds. + Weight::from_parts(14_467_000, 3687) + // Standard Error: 5_764 + .saturating_add(Weight::from_parts(11_042_747, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -118,10 +118,10 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `509 + a * (86 ±0)` // Estimated: `3687 + a * (2635 ±0)` - // Minimum execution time: 17_654_000 picoseconds. - Weight::from_parts(17_821_000, 3687) - // Standard Error: 4_162 - .saturating_add(Weight::from_parts(11_726_990, 0).saturating_mul(a.into())) + // Minimum execution time: 18_045_000 picoseconds. + Weight::from_parts(18_219_000, 3687) + // Standard Error: 4_468 + .saturating_add(Weight::from_parts(11_907_866, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -138,8 +138,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 13_391_000 picoseconds. - Weight::from_parts(13_579_000, 3687) + // Minimum execution time: 13_006_000 picoseconds. + Weight::from_parts(13_377_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -151,8 +151,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 20_329_000 picoseconds. - Weight::from_parts(20_509_000, 3687) + // Minimum execution time: 20_029_000 picoseconds. + Weight::from_parts(20_300_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -164,8 +164,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `446` // Estimated: `3687` - // Minimum execution time: 29_348_000 picoseconds. - Weight::from_parts(29_765_000, 3687) + // Minimum execution time: 28_483_000 picoseconds. + Weight::from_parts(29_465_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -179,8 +179,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `518` // Estimated: `6232` - // Minimum execution time: 39_679_000 picoseconds. - Weight::from_parts(40_190_000, 6232) + // Minimum execution time: 39_318_000 picoseconds. + Weight::from_parts(39_811_000, 6232) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -194,8 +194,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `518` // Estimated: `6232` - // Minimum execution time: 35_794_000 picoseconds. - Weight::from_parts(36_088_000, 6232) + // Minimum execution time: 35_029_000 picoseconds. + Weight::from_parts(35_882_000, 6232) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -209,8 +209,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `518` // Estimated: `6232` - // Minimum execution time: 39_690_000 picoseconds. - Weight::from_parts(40_176_000, 6232) + // Minimum execution time: 38_906_000 picoseconds. + Weight::from_parts(39_545_000, 6232) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -222,8 +222,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `446` // Estimated: `3687` - // Minimum execution time: 17_766_000 picoseconds. - Weight::from_parts(18_056_000, 3687) + // Minimum execution time: 16_891_000 picoseconds. + Weight::from_parts(17_280_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -235,8 +235,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `446` // Estimated: `3687` - // Minimum execution time: 17_501_000 picoseconds. - Weight::from_parts(17_943_000, 3687) + // Minimum execution time: 16_775_000 picoseconds. + Weight::from_parts(17_040_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -246,8 +246,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `360` // Estimated: `3687` - // Minimum execution time: 14_107_000 picoseconds. - Weight::from_parts(14_397_000, 3687) + // Minimum execution time: 13_031_000 picoseconds. + Weight::from_parts(13_389_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -257,8 +257,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `360` // Estimated: `3687` - // Minimum execution time: 13_916_000 picoseconds. - Weight::from_parts(14_193_000, 3687) + // Minimum execution time: 12_834_000 picoseconds. + Weight::from_parts(13_046_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -270,8 +270,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 12_166_000 picoseconds. - Weight::from_parts(12_434_000, 3687) + // Minimum execution time: 12_159_000 picoseconds. + Weight::from_parts(12_353_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -281,8 +281,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 10_896_000 picoseconds. - Weight::from_parts(11_100_000, 3687) + // Minimum execution time: 11_059_000 picoseconds. + Weight::from_parts(11_390_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -292,14 +292,12 @@ impl pallet_assets::WeightInfo for SubstrateWeight { /// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(152), added: 2627, mode: `MaxEncodedLen`) /// The range of component `n` is `[0, 50]`. /// The range of component `s` is `[0, 50]`. - fn set_metadata(_n: u32, s: u32, ) -> Weight { + fn set_metadata(_n: u32, _s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 25_359_000 picoseconds. - Weight::from_parts(26_282_808, 3687) - // Standard Error: 532 - .saturating_add(Weight::from_parts(1_160, 0).saturating_mul(s.into())) + // Minimum execution time: 25_054_000 picoseconds. + Weight::from_parts(26_389_577, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -311,8 +309,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `502` // Estimated: `3687` - // Minimum execution time: 26_608_000 picoseconds. - Weight::from_parts(27_063_000, 3687) + // Minimum execution time: 26_241_000 picoseconds. + Weight::from_parts(26_777_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -326,12 +324,12 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `165` // Estimated: `3687` - // Minimum execution time: 11_159_000 picoseconds. - Weight::from_parts(11_585_015, 3687) - // Standard Error: 267 - .saturating_add(Weight::from_parts(1_913, 0).saturating_mul(n.into())) - // Standard Error: 267 - .saturating_add(Weight::from_parts(2_415, 0).saturating_mul(s.into())) + // Minimum execution time: 11_103_000 picoseconds. + Weight::from_parts(11_564_920, 3687) + // Standard Error: 334 + .saturating_add(Weight::from_parts(456, 0).saturating_mul(n.into())) + // Standard Error: 334 + .saturating_add(Weight::from_parts(3_015, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -343,8 +341,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `502` // Estimated: `3687` - // Minimum execution time: 25_810_000 picoseconds. - Weight::from_parts(26_202_000, 3687) + // Minimum execution time: 25_828_000 picoseconds. + Weight::from_parts(26_257_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -354,8 +352,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 10_566_000 picoseconds. - Weight::from_parts(10_822_000, 3687) + // Minimum execution time: 10_314_000 picoseconds. + Weight::from_parts(10_551_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -367,8 +365,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `360` // Estimated: `3687` - // Minimum execution time: 28_479_000 picoseconds. - Weight::from_parts(28_737_000, 3687) + // Minimum execution time: 28_562_000 picoseconds. + Weight::from_parts(29_003_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -384,8 +382,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `751` // Estimated: `6232` - // Minimum execution time: 55_176_000 picoseconds. - Weight::from_parts(55_666_000, 6232) + // Minimum execution time: 55_044_000 picoseconds. + Weight::from_parts(55_628_000, 6232) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -397,8 +395,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `542` // Estimated: `3687` - // Minimum execution time: 30_702_000 picoseconds. - Weight::from_parts(31_155_000, 3687) + // Minimum execution time: 30_757_000 picoseconds. + Weight::from_parts(31_119_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -410,8 +408,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `542` // Estimated: `3687` - // Minimum execution time: 30_879_000 picoseconds. - Weight::from_parts(31_528_000, 3687) + // Minimum execution time: 31_027_000 picoseconds. + Weight::from_parts(31_389_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -421,8 +419,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 11_229_000 picoseconds. - Weight::from_parts(11_448_000, 3687) + // Minimum execution time: 11_280_000 picoseconds. + Weight::from_parts(11_593_000, 3687) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -436,8 +434,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `500` // Estimated: `3687` - // Minimum execution time: 29_572_000 picoseconds. - Weight::from_parts(30_304_000, 3687) + // Minimum execution time: 30_248_000 picoseconds. + Weight::from_parts(30_792_000, 3687) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -449,8 +447,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `326` // Estimated: `3687` - // Minimum execution time: 27_933_000 picoseconds. - Weight::from_parts(28_456_000, 3687) + // Minimum execution time: 27_781_000 picoseconds. + Weight::from_parts(28_339_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -464,8 +462,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `638` // Estimated: `3687` - // Minimum execution time: 29_103_000 picoseconds. - Weight::from_parts(29_793_000, 3687) + // Minimum execution time: 29_254_000 picoseconds. + Weight::from_parts(29_617_000, 3687) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -477,8 +475,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `497` // Estimated: `3687` - // Minimum execution time: 26_955_000 picoseconds. - Weight::from_parts(27_479_000, 3687) + // Minimum execution time: 27_649_000 picoseconds. + Weight::from_parts(27_917_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -490,8 +488,8 @@ impl pallet_assets::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `446` // Estimated: `3687` - // Minimum execution time: 17_764_000 picoseconds. - Weight::from_parts(18_088_000, 3687) + // Minimum execution time: 17_183_000 picoseconds. + Weight::from_parts(17_521_000, 3687) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/runtime/shiden/src/weights/pallet_dapp_staking_v3.rs b/runtime/shiden/src/weights/pallet_dapp_staking_v3.rs index cf2c9c01c..c6f7c4f9c 100644 --- a/runtime/shiden/src/weights/pallet_dapp_staking_v3.rs +++ b/runtime/shiden/src/weights/pallet_dapp_staking_v3.rs @@ -55,8 +55,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_476_000 picoseconds. - Weight::from_parts(6_714_000, 0) + // Minimum execution time: 5_968_000 picoseconds. + Weight::from_parts(6_128_000, 0) } /// Storage: `DappStaking::IntegratedDApps` (r:1 w:1) /// Proof: `DappStaking::IntegratedDApps` (`max_values`: Some(65535), `max_size`: Some(116), added: 2096, mode: `MaxEncodedLen`) @@ -68,8 +68,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `3086` - // Minimum execution time: 12_385_000 picoseconds. - Weight::from_parts(12_660_000, 3086) + // Minimum execution time: 12_156_000 picoseconds. + Weight::from_parts(12_383_000, 3086) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -79,8 +79,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `97` // Estimated: `3086` - // Minimum execution time: 11_393_000 picoseconds. - Weight::from_parts(11_638_000, 3086) + // Minimum execution time: 10_444_000 picoseconds. + Weight::from_parts(10_815_000, 3086) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -90,8 +90,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `97` // Estimated: `3086` - // Minimum execution time: 11_834_000 picoseconds. - Weight::from_parts(12_176_000, 3086) + // Minimum execution time: 10_370_000 picoseconds. + Weight::from_parts(10_652_000, 3086) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -105,8 +105,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `97` // Estimated: `3086` - // Minimum execution time: 15_262_000 picoseconds. - Weight::from_parts(15_764_000, 3086) + // Minimum execution time: 14_692_000 picoseconds. + Weight::from_parts(14_973_000, 3086) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -124,8 +124,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `138` // Estimated: `4764` - // Minimum execution time: 28_006_000 picoseconds. - Weight::from_parts(28_433_000, 4764) + // Minimum execution time: 27_703_000 picoseconds. + Weight::from_parts(28_088_000, 4764) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -141,8 +141,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `158` // Estimated: `4764` - // Minimum execution time: 31_943_000 picoseconds. - Weight::from_parts(32_807_000, 4764) + // Minimum execution time: 31_136_000 picoseconds. + Weight::from_parts(31_749_000, 4764) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -158,8 +158,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `158` // Estimated: `4764` - // Minimum execution time: 29_129_000 picoseconds. - Weight::from_parts(29_684_000, 4764) + // Minimum execution time: 28_484_000 picoseconds. + Weight::from_parts(28_994_000, 4764) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -176,10 +176,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `191` // Estimated: `4764` - // Minimum execution time: 29_012_000 picoseconds. - Weight::from_parts(30_362_943, 4764) - // Standard Error: 3_354 - .saturating_add(Weight::from_parts(102_645, 0).saturating_mul(x.into())) + // Minimum execution time: 28_418_000 picoseconds. + Weight::from_parts(29_649_616, 4764) + // Standard Error: 2_468 + .saturating_add(Weight::from_parts(117_983, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -195,8 +195,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `200` // Estimated: `4764` - // Minimum execution time: 26_355_000 picoseconds. - Weight::from_parts(26_725_000, 4764) + // Minimum execution time: 25_786_000 picoseconds. + Weight::from_parts(26_585_000, 4764) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -218,8 +218,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `274` // Estimated: `4764` - // Minimum execution time: 41_441_000 picoseconds. - Weight::from_parts(42_071_000, 4764) + // Minimum execution time: 38_893_000 picoseconds. + Weight::from_parts(39_246_000, 4764) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -241,8 +241,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `459` // Estimated: `4764` - // Minimum execution time: 45_924_000 picoseconds. - Weight::from_parts(46_305_000, 4764) + // Minimum execution time: 43_357_000 picoseconds. + Weight::from_parts(43_678_000, 4764) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -261,10 +261,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `541` // Estimated: `4764` - // Minimum execution time: 44_845_000 picoseconds. - Weight::from_parts(43_924_635, 4764) - // Standard Error: 4_382 - .saturating_add(Weight::from_parts(1_983_419, 0).saturating_mul(x.into())) + // Minimum execution time: 48_239_000 picoseconds. + Weight::from_parts(47_380_121, 4764) + // Standard Error: 3_818 + .saturating_add(Weight::from_parts(1_938_013, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -281,10 +281,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `519` // Estimated: `4764` - // Minimum execution time: 42_111_000 picoseconds. - Weight::from_parts(41_366_463, 4764) - // Standard Error: 4_231 - .saturating_add(Weight::from_parts(2_000_021, 0).saturating_mul(x.into())) + // Minimum execution time: 45_792_000 picoseconds. + Weight::from_parts(45_193_051, 4764) + // Standard Error: 5_334 + .saturating_add(Weight::from_parts(1_945_694, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -298,8 +298,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `275` // Estimated: `3775` - // Minimum execution time: 33_539_000 picoseconds. - Weight::from_parts(33_934_000, 3775) + // Minimum execution time: 35_426_000 picoseconds. + Weight::from_parts(35_776_000, 3775) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -311,8 +311,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `2672` // Estimated: `5113` - // Minimum execution time: 51_985_000 picoseconds. - Weight::from_parts(53_149_000, 5113) + // Minimum execution time: 48_587_000 picoseconds. + Weight::from_parts(49_645_000, 5113) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -332,8 +332,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `322` // Estimated: `4764` - // Minimum execution time: 36_691_000 picoseconds. - Weight::from_parts(37_929_000, 4764) + // Minimum execution time: 35_966_000 picoseconds. + Weight::from_parts(36_190_000, 4764) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -350,10 +350,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `256 + x * (73 ±0)` // Estimated: `4764 + x * (2653 ±0)` - // Minimum execution time: 36_617_000 picoseconds. - Weight::from_parts(33_285_190, 4764) - // Standard Error: 7_701 - .saturating_add(Weight::from_parts(5_001_871, 0).saturating_mul(x.into())) + // Minimum execution time: 35_797_000 picoseconds. + Weight::from_parts(32_229_929, 4764) + // Standard Error: 6_544 + .saturating_add(Weight::from_parts(4_898_852, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) @@ -366,8 +366,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `1486` - // Minimum execution time: 8_736_000 picoseconds. - Weight::from_parts(9_057_000, 1486) + // Minimum execution time: 8_530_000 picoseconds. + Weight::from_parts(8_785_000, 1486) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: `DappStaking::CurrentEraInfo` (r:1 w:1) @@ -384,8 +384,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `334` // Estimated: `4254` - // Minimum execution time: 24_552_000 picoseconds. - Weight::from_parts(25_267_000, 4254) + // Minimum execution time: 24_436_000 picoseconds. + Weight::from_parts(25_190_000, 4254) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -409,8 +409,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `843` // Estimated: `4254` - // Minimum execution time: 39_484_000 picoseconds. - Weight::from_parts(40_502_000, 4254) + // Minimum execution time: 39_979_000 picoseconds. + Weight::from_parts(41_027_000, 4254) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -430,8 +430,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `386` // Estimated: `4254` - // Minimum execution time: 27_598_000 picoseconds. - Weight::from_parts(28_216_000, 4254) + // Minimum execution time: 27_746_000 picoseconds. + Weight::from_parts(27_938_000, 4254) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -444,10 +444,10 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `152 + x * (32 ±0)` // Estimated: `3061 + x * (2071 ±0)` - // Minimum execution time: 6_648_000 picoseconds. - Weight::from_parts(11_329_597, 3061) - // Standard Error: 3_005 - .saturating_add(Weight::from_parts(2_383_797, 0).saturating_mul(x.into())) + // Minimum execution time: 6_531_000 picoseconds. + Weight::from_parts(10_637_970, 3061) + // Standard Error: 3_112 + .saturating_add(Weight::from_parts(2_395_087, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(Weight::from_parts(0, 2071).saturating_mul(x.into())) @@ -462,8 +462,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `293` // Estimated: `4254` - // Minimum execution time: 7_521_000 picoseconds. - Weight::from_parts(7_677_000, 4254) + // Minimum execution time: 8_145_000 picoseconds. + Weight::from_parts(8_379_000, 4254) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } diff --git a/runtime/shiden/src/weights/pallet_inflation.rs b/runtime/shiden/src/weights/pallet_inflation.rs index 37e560a58..d979ead7e 100644 --- a/runtime/shiden/src/weights/pallet_inflation.rs +++ b/runtime/shiden/src/weights/pallet_inflation.rs @@ -51,44 +51,44 @@ use pallet_inflation::WeightInfo; /// Weights for pallet_inflation using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { - /// Storage: Inflation InflationParams (r:0 w:1) - /// Proof: Inflation InflationParams (max_values: Some(1), max_size: Some(64), added: 559, mode: MaxEncodedLen) + /// Storage: `Inflation::InflationParams` (r:0 w:1) + /// Proof: `Inflation::InflationParams` (`max_values`: Some(1), `max_size`: Some(64), added: 559, mode: `MaxEncodedLen`) fn force_set_inflation_params() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 9_034_000 picoseconds. - Weight::from_parts(9_303_000, 0) + // Minimum execution time: 6_154_000 picoseconds. + Weight::from_parts(6_333_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: Inflation InflationParams (r:1 w:0) - /// Proof: Inflation InflationParams (max_values: Some(1), max_size: Some(64), added: 559, mode: MaxEncodedLen) + /// Storage: `Inflation::InflationParams` (r:1 w:0) + /// Proof: `Inflation::InflationParams` (`max_values`: Some(1), `max_size`: Some(64), added: 559, mode: `MaxEncodedLen`) fn force_inflation_recalculation() -> Weight { // Proof Size summary in bytes: // Measured: `40` // Estimated: `1549` - // Minimum execution time: 13_548_000 picoseconds. - Weight::from_parts(13_796_000, 1549) + // Minimum execution time: 9_204_000 picoseconds. + Weight::from_parts(9_536_000, 1549) .saturating_add(T::DbWeight::get().reads(1_u64)) } - /// Storage: Inflation InflationParams (r:1 w:0) - /// Proof: Inflation InflationParams (max_values: Some(1), max_size: Some(64), added: 559, mode: MaxEncodedLen) + /// Storage: `Inflation::InflationParams` (r:1 w:0) + /// Proof: `Inflation::InflationParams` (`max_values`: Some(1), `max_size`: Some(64), added: 559, mode: `MaxEncodedLen`) fn recalculation() -> Weight { // Proof Size summary in bytes: // Measured: `58` // Estimated: `1549` - // Minimum execution time: 13_421_000 picoseconds. - Weight::from_parts(13_808_000, 1549) + // Minimum execution time: 8_839_000 picoseconds. + Weight::from_parts(9_131_000, 1549) .saturating_add(T::DbWeight::get().reads(1_u64)) } - /// Storage: System Account (r:2 w:2) - /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) + /// Storage: `System::Account` (r:2 w:2) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn hooks_without_recalculation() -> Weight { // Proof Size summary in bytes: // Measured: `39` // Estimated: `6196` - // Minimum execution time: 40_566_000 picoseconds. - Weight::from_parts(40_980_000, 6196) + // Minimum execution time: 35_308_000 picoseconds. + Weight::from_parts(35_701_000, 6196) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/runtime/shiden/src/weights/pallet_xcm.rs b/runtime/shiden/src/weights/pallet_xcm.rs index 992c82a0c..03711a214 100644 --- a/runtime/shiden/src/weights/pallet_xcm.rs +++ b/runtime/shiden/src/weights/pallet_xcm.rs @@ -60,8 +60,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `76` // Estimated: `3541` - // Minimum execution time: 16_689_000 picoseconds. - Weight::from_parts(17_027_000, 3541) + // Minimum execution time: 17_270_000 picoseconds. + Weight::from_parts(17_559_000, 3541) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -90,8 +90,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `278` // Estimated: `3743` - // Minimum execution time: 74_657_000 picoseconds. - Weight::from_parts(75_395_000, 3743) + // Minimum execution time: 79_849_000 picoseconds. + Weight::from_parts(80_526_000, 3743) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -119,16 +119,16 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 7_254_000 picoseconds. - Weight::from_parts(7_446_000, 0) + // Minimum execution time: 7_356_000 picoseconds. + Weight::from_parts(7_595_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } fn force_default_xcm_version() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_110_000 picoseconds. - Weight::from_parts(2_285_000, 0) + // Minimum execution time: 2_195_000 picoseconds. + Weight::from_parts(2_316_000, 0) } /// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1) /// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`) @@ -146,8 +146,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `76` // Estimated: `3541` - // Minimum execution time: 21_109_000 picoseconds. - Weight::from_parts(21_573_000, 3541) + // Minimum execution time: 21_789_000 picoseconds. + Weight::from_parts(22_204_000, 3541) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -165,8 +165,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `135` // Estimated: `3600` - // Minimum execution time: 21_012_000 picoseconds. - Weight::from_parts(21_464_000, 3600) + // Minimum execution time: 21_820_000 picoseconds. + Weight::from_parts(22_168_000, 3600) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -176,8 +176,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_134_000 picoseconds. - Weight::from_parts(2_320_000, 0) + // Minimum execution time: 2_145_000 picoseconds. + Weight::from_parts(2_310_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2) @@ -186,8 +186,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `23` // Estimated: `13388` - // Minimum execution time: 13_529_000 picoseconds. - Weight::from_parts(13_854_000, 13388) + // Minimum execution time: 13_892_000 picoseconds. + Weight::from_parts(14_164_000, 13388) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -197,8 +197,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `27` // Estimated: `13392` - // Minimum execution time: 13_764_000 picoseconds. - Weight::from_parts(14_087_000, 13392) + // Minimum execution time: 14_164_000 picoseconds. + Weight::from_parts(14_503_000, 13392) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -208,8 +208,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `38` // Estimated: `15878` - // Minimum execution time: 15_562_000 picoseconds. - Weight::from_parts(15_862_000, 15878) + // Minimum execution time: 15_856_000 picoseconds. + Weight::from_parts(16_153_000, 15878) .saturating_add(T::DbWeight::get().reads(6_u64)) } /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1) @@ -224,8 +224,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `110` // Estimated: `6050` - // Minimum execution time: 20_198_000 picoseconds. - Weight::from_parts(20_705_000, 6050) + // Minimum execution time: 21_337_000 picoseconds. + Weight::from_parts(21_632_000, 6050) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -235,8 +235,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `70` // Estimated: `10960` - // Minimum execution time: 9_756_000 picoseconds. - Weight::from_parts(10_041_000, 10960) + // Minimum execution time: 9_657_000 picoseconds. + Weight::from_parts(10_016_000, 10960) .saturating_add(T::DbWeight::get().reads(4_u64)) } /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2) @@ -245,8 +245,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `34` // Estimated: `13399` - // Minimum execution time: 14_197_000 picoseconds. - Weight::from_parts(14_530_000, 13399) + // Minimum execution time: 14_455_000 picoseconds. + Weight::from_parts(14_759_000, 13399) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -262,8 +262,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `110` // Estimated: `13475` - // Minimum execution time: 27_491_000 picoseconds. - Weight::from_parts(27_977_000, 13475) + // Minimum execution time: 28_354_000 picoseconds. + Weight::from_parts(28_693_000, 13475) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -275,8 +275,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `1485` - // Minimum execution time: 2_169_000 picoseconds. - Weight::from_parts(2_286_000, 1485) + // Minimum execution time: 2_079_000 picoseconds. + Weight::from_parts(2_182_000, 1485) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -286,8 +286,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `7576` // Estimated: `11041` - // Minimum execution time: 21_612_000 picoseconds. - Weight::from_parts(21_860_000, 11041) + // Minimum execution time: 22_134_000 picoseconds. + Weight::from_parts(22_429_000, 11041) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -297,8 +297,8 @@ impl pallet_xcm::WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `24` // Estimated: `3489` - // Minimum execution time: 31_753_000 picoseconds. - Weight::from_parts(32_081_000, 3489) + // Minimum execution time: 36_295_000 picoseconds. + Weight::from_parts(36_883_000, 3489) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/runtime/shiden/src/weights/xcm/fungible.rs b/runtime/shiden/src/weights/xcm/fungible.rs index 47a769f23..bc1f32685 100644 --- a/runtime/shiden/src/weights/xcm/fungible.rs +++ b/runtime/shiden/src/weights/xcm/fungible.rs @@ -72,10 +72,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn transfer_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `508` + // Measured: `542` // Estimated: `6232` - // Minimum execution time: 47_024_000 picoseconds. - Weight::from_parts(47_577_000, 6232) + // Minimum execution time: 42_405_000 picoseconds. + Weight::from_parts(42_967_000, 6232) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -97,10 +97,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn transfer_reserve_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `582` + // Measured: `650` // Estimated: `6232` - // Minimum execution time: 64_871_000 picoseconds. - Weight::from_parts(65_519_000, 6232) + // Minimum execution time: 59_467_000 picoseconds. + Weight::from_parts(60_482_000, 6232) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -132,10 +132,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn withdraw_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `1919` - // Estimated: `5384` - // Minimum execution time: 52_014_000 picoseconds. - Weight::from_parts(52_827_000, 5384) + // Measured: `1952` + // Estimated: `5417` + // Minimum execution time: 51_737_000 picoseconds. + Weight::from_parts(52_660_000, 5417) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -143,8 +143,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_725_000 picoseconds. - Weight::from_parts(3_809_000, 0) + // Minimum execution time: 1_076_000 picoseconds. + Weight::from_parts(1_116_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -156,10 +156,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn initiate_reserve_withdraw() -> Weight { // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 409_889_000 picoseconds. - Weight::from_parts(418_197_000, 3539) + // Measured: `108` + // Estimated: `3573` + // Minimum execution time: 49_874_000 picoseconds. + Weight::from_parts(50_300_000, 3573) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -173,160 +173,17 @@ impl WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn deposit_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `1659` - // Estimated: `5124` - // Minimum execution time: 42_715_000 picoseconds. - Weight::from_parts(43_305_000, 5124) + // Measured: `1692` + // Estimated: `5157` + // Minimum execution time: 39_598_000 picoseconds. + Weight::from_parts(40_283_000, 5157) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn deposit_reserve_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `1733` - // Estimated: `5198` - // Minimum execution time: 65_407_000 picoseconds. - Weight::from_parts(65_819_000, 5198) - .saturating_add(T::DbWeight::get().reads(8_u64)) - .saturating_add(T::DbWeight::get().writes(4_u64)) - } -} - -// For backwards compatibility and tests -impl WeightInfo for () { - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:2 w:2) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn transfer_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `508` - // Estimated: `6232` - // Minimum execution time: 47_024_000 picoseconds. - Weight::from_parts(47_577_000, 6232) - .saturating_add(RocksDbWeight::get().reads(5_u64)) - .saturating_add(RocksDbWeight::get().writes(4_u64)) - } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:2 w:2) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn transfer_reserve_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `582` - // Estimated: `6232` - // Minimum execution time: 64_871_000 picoseconds. - Weight::from_parts(65_519_000, 6232) - .saturating_add(RocksDbWeight::get().reads(9_u64)) - .saturating_add(RocksDbWeight::get().writes(5_u64)) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn receive_teleported_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn initiate_teleport() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn withdraw_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `1919` - // Estimated: `5384` - // Minimum execution time: 52_014_000 picoseconds. - Weight::from_parts(52_827_000, 5384) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(3_u64)) - } - fn reserve_asset_deposited() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 3_725_000 picoseconds. - Weight::from_parts(3_809_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn initiate_reserve_withdraw() -> Weight { - // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 409_889_000 picoseconds. - Weight::from_parts(418_197_000, 3539) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn deposit_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `1659` - // Estimated: `5124` - // Minimum execution time: 42_715_000 picoseconds. - Weight::from_parts(43_305_000, 5124) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(3_u64)) - } /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `Assets::Asset` (r:1 w:1) @@ -335,21 +192,17 @@ impl WeightInfo for () { /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn deposit_reserve_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `1733` - // Estimated: `5198` - // Minimum execution time: 65_407_000 picoseconds. - Weight::from_parts(65_819_000, 5198) - .saturating_add(RocksDbWeight::get().reads(8_u64)) - .saturating_add(RocksDbWeight::get().writes(4_u64)) + // Measured: `1800` + // Estimated: `5265` + // Minimum execution time: 72_264_000 picoseconds. + Weight::from_parts(73_132_000, 5265) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } } diff --git a/runtime/shiden/src/weights/xcm/generic.rs b/runtime/shiden/src/weights/xcm/generic.rs index 6b0f846ad..74c41864b 100644 --- a/runtime/shiden/src/weights/xcm/generic.rs +++ b/runtime/shiden/src/weights/xcm/generic.rs @@ -101,20 +101,13 @@ impl WeightInfo for SubstrateWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn buy_execution() -> Weight { // Proof Size summary in bytes: - // Measured: `2296` - // Estimated: `5761` - // Minimum execution time: 108_274_000 picoseconds. - Weight::from_parts(109_048_000, 5761) + // Measured: `717` + // Estimated: `4182` + // Minimum execution time: 15_176_000 picoseconds. + Weight::from_parts(15_528_000, 4182) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } - fn expect_pallet() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 6_389_000 picoseconds. - Weight::from_parts(6_599_000, 0) - } /// Storage: `Benchmark::Override` (r:0 w:0) /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) fn exchange_asset() -> Weight { @@ -197,10 +190,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn report_holding() -> Weight { // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 349_689_000 picoseconds. - Weight::from_parts(350_903_000, 3539) + // Measured: `131` + // Estimated: `3596` + // Minimum execution time: 46_312_000 picoseconds. + Weight::from_parts(47_575_000, 3596) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -210,58 +203,58 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `3465` - // Minimum execution time: 8_882_000 picoseconds. - Weight::from_parts(9_271_000, 3465) + // Minimum execution time: 4_873_000 picoseconds. + Weight::from_parts(5_014_000, 3465) .saturating_add(T::DbWeight::get().reads(1_u64)) } fn transact() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 12_668_000 picoseconds. - Weight::from_parts(12_976_000, 0) + // Minimum execution time: 7_311_000 picoseconds. + Weight::from_parts(7_544_000, 0) } fn refund_surplus() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_937_000 picoseconds. - Weight::from_parts(5_033_000, 0) + // Minimum execution time: 3_850_000 picoseconds. + Weight::from_parts(3_939_000, 0) } fn set_error_handler() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_841_000 picoseconds. - Weight::from_parts(2_934_000, 0) + // Minimum execution time: 729_000 picoseconds. + Weight::from_parts(748_000, 0) } fn set_appendix() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_803_000 picoseconds. - Weight::from_parts(2_906_000, 0) + // Minimum execution time: 712_000 picoseconds. + Weight::from_parts(779_000, 0) } fn clear_error() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_739_000 picoseconds. - Weight::from_parts(2_800_000, 0) + // Minimum execution time: 628_000 picoseconds. + Weight::from_parts(666_000, 0) } fn descend_origin() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_492_000 picoseconds. - Weight::from_parts(3_583_000, 0) + // Minimum execution time: 680_000 picoseconds. + Weight::from_parts(726_000, 0) } fn clear_origin() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_748_000 picoseconds. - Weight::from_parts(2_849_000, 0) + // Minimum execution time: 647_000 picoseconds. + Weight::from_parts(673_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -273,10 +266,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn report_error() -> Weight { // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 21_986_000 picoseconds. - Weight::from_parts(22_188_000, 3539) + // Measured: `131` + // Estimated: `3596` + // Minimum execution time: 14_630_000 picoseconds. + Weight::from_parts(14_994_000, 3596) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -284,10 +277,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`) fn claim_asset() -> Weight { // Proof Size summary in bytes: - // Measured: `23` - // Estimated: `3488` - // Minimum execution time: 12_774_000 picoseconds. - Weight::from_parts(13_092_000, 3488) + // Measured: `24` + // Estimated: `3489` + // Minimum execution time: 7_651_000 picoseconds. + Weight::from_parts(7_788_000, 3489) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -295,8 +288,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_764_000 picoseconds. - Weight::from_parts(2_858_000, 0) + // Minimum execution time: 645_000 picoseconds. + Weight::from_parts(679_000, 0) } /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1) /// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`) @@ -308,10 +301,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn subscribe_version() -> Weight { // Proof Size summary in bytes: - // Measured: `42` - // Estimated: `3507` - // Minimum execution time: 23_088_000 picoseconds. - Weight::from_parts(23_502_000, 3507) + // Measured: `99` + // Estimated: `3564` + // Minimum execution time: 16_334_000 picoseconds. + Weight::from_parts(16_765_000, 3564) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -321,44 +314,44 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_869_000 picoseconds. - Weight::from_parts(5_006_000, 0) + // Minimum execution time: 2_448_000 picoseconds. + Weight::from_parts(2_586_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } fn burn_asset() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 124_093_000 picoseconds. - Weight::from_parts(124_768_000, 0) + // Minimum execution time: 21_633_000 picoseconds. + Weight::from_parts(21_809_000, 0) } fn expect_asset() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_802_000 picoseconds. - Weight::from_parts(12_064_000, 0) + // Minimum execution time: 7_381_000 picoseconds. + Weight::from_parts(7_465_000, 0) } fn expect_origin() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_816_000 picoseconds. - Weight::from_parts(2_925_000, 0) + // Minimum execution time: 688_000 picoseconds. + Weight::from_parts(720_000, 0) } fn expect_error() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_756_000 picoseconds. - Weight::from_parts(2_873_000, 0) + // Minimum execution time: 665_000 picoseconds. + Weight::from_parts(702_000, 0) } fn expect_transact_status() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_880_000 picoseconds. - Weight::from_parts(3_008_000, 0) + // Minimum execution time: 813_000 picoseconds. + Weight::from_parts(850_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -370,356 +363,19 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn query_pallet() -> Weight { // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 26_794_000 picoseconds. - Weight::from_parts(27_144_000, 3539) + // Measured: `131` + // Estimated: `3596` + // Minimum execution time: 19_997_000 picoseconds. + Weight::from_parts(20_585_000, 3596) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn report_transact_status() -> Weight { - // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 22_269_000 picoseconds. - Weight::from_parts(22_665_000, 3539) - .saturating_add(T::DbWeight::get().reads(4_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - } - fn clear_transact_status() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_763_000 picoseconds. - Weight::from_parts(2_868_000, 0) - } - fn set_topic() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_750_000 picoseconds. - Weight::from_parts(2_844_000, 0) - } - fn clear_topic() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_718_000 picoseconds. - Weight::from_parts(2_821_000, 0) - } - fn set_fees_mode() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_791_000 picoseconds. - Weight::from_parts(2_917_000, 0) - } - fn unpaid_execution() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_891_000 picoseconds. - Weight::from_parts(3_023_000, 0) - } -} - -// For backwards compatibility and tests -impl WeightInfo for () { - /// Storage: `XcAssetConfig::AssetLocationUnitsPerSecond` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationUnitsPerSecond` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `XcAssetConfig::AssetLocationToId` (r:1 w:0) - /// Proof: `XcAssetConfig::AssetLocationToId` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `Assets::Asset` (r:1 w:1) - /// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(222), added: 2697, mode: `MaxEncodedLen`) - /// Storage: `Assets::Account` (r:1 w:1) - /// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn buy_execution() -> Weight { - // Proof Size summary in bytes: - // Measured: `2296` - // Estimated: `5761` - // Minimum execution time: 108_274_000 picoseconds. - Weight::from_parts(109_048_000, 5761) - .saturating_add(RocksDbWeight::get().reads(5_u64)) - .saturating_add(RocksDbWeight::get().writes(3_u64)) - } fn expect_pallet() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_389_000 picoseconds. - Weight::from_parts(6_599_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn exchange_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn export_message() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn lock_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn unlock_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn note_unlockable() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn request_unlock() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn universal_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `Benchmark::Override` (r:0 w:0) - /// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn alias_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. - Weight::from_parts(18_446_744_073_709_551_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn report_holding() -> Weight { - // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 349_689_000 picoseconds. - Weight::from_parts(350_903_000, 3539) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - /// Storage: `PolkadotXcm::Queries` (r:1 w:0) - /// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn query_response() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `3465` - // Minimum execution time: 8_882_000 picoseconds. - Weight::from_parts(9_271_000, 3465) - .saturating_add(RocksDbWeight::get().reads(1_u64)) - } - fn transact() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 12_668_000 picoseconds. - Weight::from_parts(12_976_000, 0) - } - fn refund_surplus() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 4_937_000 picoseconds. - Weight::from_parts(5_033_000, 0) - } - fn set_error_handler() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_841_000 picoseconds. - Weight::from_parts(2_934_000, 0) - } - fn set_appendix() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_803_000 picoseconds. - Weight::from_parts(2_906_000, 0) - } - fn clear_error() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_739_000 picoseconds. - Weight::from_parts(2_800_000, 0) - } - fn descend_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 3_492_000 picoseconds. - Weight::from_parts(3_583_000, 0) - } - fn clear_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_748_000 picoseconds. - Weight::from_parts(2_849_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn report_error() -> Weight { - // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 21_986_000 picoseconds. - Weight::from_parts(22_188_000, 3539) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - /// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1) - /// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn claim_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `23` - // Estimated: `3488` - // Minimum execution time: 12_774_000 picoseconds. - Weight::from_parts(13_092_000, 3488) - .saturating_add(RocksDbWeight::get().reads(1_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - fn trap() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_764_000 picoseconds. - Weight::from_parts(2_858_000, 0) - } - /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1) - /// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn subscribe_version() -> Weight { - // Proof Size summary in bytes: - // Measured: `42` - // Estimated: `3507` - // Minimum execution time: 23_088_000 picoseconds. - Weight::from_parts(23_502_000, 3507) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(2_u64)) - } - /// Storage: `PolkadotXcm::VersionNotifyTargets` (r:0 w:1) - /// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`) - fn unsubscribe_version() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 4_869_000 picoseconds. - Weight::from_parts(5_006_000, 0) - .saturating_add(RocksDbWeight::get().writes(1_u64)) - } - fn burn_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 124_093_000 picoseconds. - Weight::from_parts(124_768_000, 0) - } - fn expect_asset() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 11_802_000 picoseconds. - Weight::from_parts(12_064_000, 0) - } - fn expect_origin() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_816_000 picoseconds. - Weight::from_parts(2_925_000, 0) - } - fn expect_error() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_756_000 picoseconds. - Weight::from_parts(2_873_000, 0) - } - fn expect_transact_status() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 2_880_000 picoseconds. - Weight::from_parts(3_008_000, 0) - } - /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) - /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0) - /// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) - /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1) - /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn query_pallet() -> Weight { - // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 26_794_000 picoseconds. - Weight::from_parts(27_144_000, 3539) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) + // Minimum execution time: 4_537_000 picoseconds. + Weight::from_parts(4_667_000, 0) } /// Storage: `ParachainInfo::ParachainId` (r:1 w:0) /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) @@ -731,46 +387,46 @@ impl WeightInfo for () { /// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) fn report_transact_status() -> Weight { // Proof Size summary in bytes: - // Measured: `74` - // Estimated: `3539` - // Minimum execution time: 22_269_000 picoseconds. - Weight::from_parts(22_665_000, 3539) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) + // Measured: `131` + // Estimated: `3596` + // Minimum execution time: 15_081_000 picoseconds. + Weight::from_parts(15_277_000, 3596) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn clear_transact_status() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_763_000 picoseconds. - Weight::from_parts(2_868_000, 0) + // Minimum execution time: 668_000 picoseconds. + Weight::from_parts(700_000, 0) } fn set_topic() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_750_000 picoseconds. - Weight::from_parts(2_844_000, 0) + // Minimum execution time: 635_000 picoseconds. + Weight::from_parts(657_000, 0) } fn clear_topic() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_718_000 picoseconds. - Weight::from_parts(2_821_000, 0) + // Minimum execution time: 623_000 picoseconds. + Weight::from_parts(678_000, 0) } fn set_fees_mode() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_791_000 picoseconds. - Weight::from_parts(2_917_000, 0) + // Minimum execution time: 665_000 picoseconds. + Weight::from_parts(687_000, 0) } fn unpaid_execution() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_891_000 picoseconds. - Weight::from_parts(3_023_000, 0) + // Minimum execution time: 699_000 picoseconds. + Weight::from_parts(738_000, 0) } } diff --git a/runtime/shiden/src/xcm_config.rs b/runtime/shiden/src/xcm_config.rs index 71311cfe4..e4eac2340 100644 --- a/runtime/shiden/src/xcm_config.rs +++ b/runtime/shiden/src/xcm_config.rs @@ -279,6 +279,10 @@ impl xcm_executor::Config for XcmConfig { type SafeCallFilter = SafeCallFilter; type Aliasers = Nothing; type TransactionalProcessor = FrameTransactionalProcessor; + + type HrmpNewChannelOpenRequestHandler = (); + type HrmpChannelAcceptedHandler = (); + type HrmpChannelClosingHandler = (); } /// Local origins on this chain are allowed to dispatch XCM sends/executions. @@ -341,16 +345,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight; } -parameter_types! { - pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent; -} - -impl cumulus_pallet_dmp_queue::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type DmpSink = frame_support::traits::EnqueueWithOrigin; - type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight; -} - parameter_types! { /// The absolute location in perspective of the whole network. pub ShidenLocationAbsolute: Location = Location { diff --git a/scripts/run_benchmarks.sh b/scripts/run_benchmarks.sh index 9f991a2eb..c739e4762 100755 --- a/scripts/run_benchmarks.sh +++ b/scripts/run_benchmarks.sh @@ -126,7 +126,6 @@ for chain in ${chains//,/ }; do --repeat=20 \ --pallet="$PALLET" \ --extrinsic="*" \ - --execution=wasm \ --wasm-execution=compiled \ --heap-pages=4096 \ --output="$WEIGHT_FILE" \ diff --git a/tests/integration/Cargo.toml b/tests/integration/Cargo.toml index 65cf45152..daeb2402e 100644 --- a/tests/integration/Cargo.toml +++ b/tests/integration/Cargo.toml @@ -18,7 +18,7 @@ sha3 = { workspace = true } fp-evm = { workspace = true } pallet-evm = { workspace = true } -# frame dependencies +# polkadot-sdk dependencies cumulus-pallet-parachain-system = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-parachain-inherent = { workspace = true } @@ -27,6 +27,7 @@ frame-support = { workspace = true } frame-system = { workspace = true } orml-oracle = { workspace = true } pallet-assets = { workspace = true } +pallet-aura = { workspace = true } pallet-balances = { workspace = true } pallet-contracts = { workspace = true } pallet-contracts-uapi = { workspace = true } @@ -39,6 +40,8 @@ sp-core = { workspace = true } sp-io = { workspace = true } sp-runtime = { workspace = true } sp-trie = { workspace = true } +xcm = { workspace = true } +xcm-fee-payment-runtime-api = { workspace = true } # astar dependencies assets-chain-extension-types = { workspace = true } @@ -110,11 +113,14 @@ std = [ "pallet-utility/std", "parity-scale-codec/std", "precompile-utils/std", + "pallet-aura/std", "sha3/std", "sp-core/std", "sp-io/std", "sp-runtime/std", "unified-accounts-chain-extension-types/std", + "xcm/std", + "xcm-fee-payment-runtime-api/std", ] shibuya = ["shibuya-runtime"] shiden = ["shiden-runtime"] diff --git a/tests/integration/src/dapp_staking_v3.rs b/tests/integration/src/dapp_staking_v3.rs index 9fb03387a..3737c16d8 100644 --- a/tests/integration/src/dapp_staking_v3.rs +++ b/tests/integration/src/dapp_staking_v3.rs @@ -85,7 +85,7 @@ fn lock_not_possible_for_collator_candidate_account() { // Hacky approach but it works let candidate_info = CandidateInfo { who: ALICE.clone(), - deposit: CollatorSelection::candidacy_bond(), + deposit: pallet_collator_selection::CandidacyBond::::get(), }; Candidates::::mutate(|candidates| { candidates.push(candidate_info); diff --git a/tests/integration/src/evm_tracing.rs b/tests/integration/src/evm_tracing.rs index a6e1f59f4..ab34f4742 100644 --- a/tests/integration/src/evm_tracing.rs +++ b/tests/integration/src/evm_tracing.rs @@ -24,6 +24,7 @@ mod tests { use astar_primitives::Header; use fp_rpc::ConvertTransaction; use moonbeam_rpc_primitives_debug::runtime_decl_for_debug_runtime_api::DebugRuntimeApi; + use sp_core::U256; // A valid signed Alice transfer. pub const VALID_ETH_TX: &str = @@ -31,12 +32,6 @@ mod tests { 001a061087911e877a5802142a89a40d231d50913db399eb50839bb2d04e612b22ec8a01aa313efdf2\ 793bea76da6813bda611444af16a6207a8cfef2d9c8aa8f8012f7"; - // An invalid signed Alice transfer with a gas limit artifically set to 0. - pub const INVALID_ETH_TX: &str = - "f8628085174876e800809412cb274aad8251c875c0bf6872b67d9983e53fdd01801ba011110796057\ - 0e2d49fcc2afbc582e1abd3eeb027242b92abcebcec7cdefab63ea001732f6fac84acdd5b096554230\ - 75003e7f07430652c3d6722e18f50b3d34e29"; - pub struct TransactionConverter; impl ConvertTransaction for TransactionConverter { @@ -84,6 +79,7 @@ mod tests { assert_ok!(Runtime::trace_transaction( vec![non_eth_uxt.clone(), eth_uxt, non_eth_uxt.clone()], &transaction, + &block )); }); } @@ -111,6 +107,33 @@ mod tests { assert_ok!(Runtime::trace_block( vec![non_eth_uxt.clone(), eth_uxt.clone(), non_eth_uxt, eth_uxt], vec![eth_extrinsic_hash, eth_extrinsic_hash], + &block + )); + }); + } + + #[test] + fn debug_runtime_api_trace_call() { + new_test_ext().execute_with(|| { + let block = Header { + digest: Default::default(), + extrinsics_root: Default::default(), + number: 1, + parent_hash: Default::default(), + state_root: Default::default(), + }; + + assert_ok!(Runtime::trace_call( + &block, + H160::repeat_byte(0x01), + H160::repeat_byte(0x02), + vec![0x03, 0x04], + U256::from(0x12345678), + U256::from(0x123), + Some(U256::from(0x456)), + Some(U256::from(0x789)), + Some(U256::from(1)), + Some(vec![]), )); }); } diff --git a/tests/integration/src/lib.rs b/tests/integration/src/lib.rs index b66c0ecf7..1196eaa09 100644 --- a/tests/integration/src/lib.rs +++ b/tests/integration/src/lib.rs @@ -49,3 +49,6 @@ mod evm_tracing; #[cfg(any(feature = "shibuya"))] mod governance; + +#[cfg(any(feature = "shibuya", feature = "shiden", feature = "astar"))] +mod xcm_api; diff --git a/tests/integration/src/setup.rs b/tests/integration/src/setup.rs index a11b7a5a3..5235da21b 100644 --- a/tests/integration/src/setup.rs +++ b/tests/integration/src/setup.rs @@ -23,10 +23,8 @@ pub use frame_support::{ traits::{OnFinalize, OnIdle, OnInitialize}, weights::Weight, }; -pub use pallet_evm::AddressMapping; use parity_scale_codec::Encode; -pub use sp_core::{Get, H160, H256, U256}; -pub use sp_io::hashing::keccak_256; +pub use sp_core::{Get, H160}; pub use sp_runtime::{AccountId32, MultiAddress}; use cumulus_primitives_core::{relay_chain::HeadData, PersistedValidationData}; @@ -35,7 +33,6 @@ use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder; pub use astar_primitives::{ dapp_staking::CycleConfiguration, - evm::UnifiedAddressMapper, governance::{ CommunityCouncilMembershipInst, MainCouncilMembershipInst, OracleMembershipInst, TechnicalCommitteeMembershipInst, @@ -55,7 +52,7 @@ mod shibuya { pub const UNIT: Balance = SBY; pub fn alith_secret_key() -> libsecp256k1::SecretKey { - libsecp256k1::SecretKey::parse(&keccak_256(b"Alith")).unwrap() + libsecp256k1::SecretKey::parse(&sp_io::hashing::keccak_256(b"Alith")).unwrap() } /// H160 address mapped to `ALICE`. @@ -63,36 +60,6 @@ mod shibuya { UnifiedAccounts::eth_address(&alith_secret_key()) } - /// Convert `H160` to `AccountId32`. - pub fn account_id_from(address: H160) -> AccountId32 { - ::AddressMapping::into_account_id(address) - } - - /// Deploy an EVM contract with code via ALICE as origin. - pub fn deploy_evm_contract(code: &str) -> H160 { - assert_ok!(EVM::create2( - RuntimeOrigin::root(), - alith(), - hex::decode(code).expect("invalid code hex"), - H256::zero(), - U256::zero(), - 1_000_000, - U256::from(DefaultBaseFeePerGas::get()), - None, - None, - vec![], - )); - match System::events() - .iter() - .last() - .expect("no event found") - .event - { - RuntimeEvent::EVM(pallet_evm::Event::Created { address }) => address, - _ => panic!("Deploy failed."), - } - } - /// Build the signature payload for given native account and eth private key fn get_evm_signature(who: &AccountId32, secret: &libsecp256k1::SecretKey) -> [u8; 65] { // sign the payload @@ -312,12 +279,11 @@ pub fn run_to_block(n: BlockNumber) { b"ParachainSystem", b"UnincludedSegment", )); - if let Some((slot, _authored)) = AuraExt::slot_info() { - sp_io::storage::set( - &frame_support::storage::storage_prefix(b"AuraExt", b"SlotInfo"), - &(slot, 0u32).encode(), - ); - } + + sp_io::storage::set( + &frame_support::storage::storage_prefix(b"AuraExt", b"SlotInfo"), + &(pallet_aura::CurrentSlot::::get(), 0u32).encode(), + ); // initialize block System::set_block_number(block_number + 1); diff --git a/tests/integration/src/unified_accounts.rs b/tests/integration/src/unified_accounts.rs index 5849e8075..d6951c23e 100644 --- a/tests/integration/src/unified_accounts.rs +++ b/tests/integration/src/unified_accounts.rs @@ -46,6 +46,8 @@ fn transfer_to_h160_via_lookup() { #[test] fn unified_accounts_chain_extension_works() { + use astar_primitives::evm::UnifiedAddressMapper; + const GET_H160: [u8; 4] = [0x00, 0x00, 0x00, 0x2a]; const GET_H160_OR_DEFAULT: [u8; 4] = [0x00, 0x00, 0x00, 0x2b]; const GET_NATIVE: [u8; 4] = [0x00, 0x00, 0x00, 0x2c]; diff --git a/tests/integration/src/xcm_api.rs b/tests/integration/src/xcm_api.rs new file mode 100644 index 000000000..ddd406b30 --- /dev/null +++ b/tests/integration/src/xcm_api.rs @@ -0,0 +1,190 @@ +// This file is part of Astar. + +// Copyright (C) Stake Technologies Pte.Ltd. +// SPDX-License-Identifier: GPL-3.0-or-later + +// Astar is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Astar is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Astar. If not, see . + +use crate::setup::*; + +use sp_runtime::traits::Zero; +use xcm::{ + v4::{ + Asset as XcmAsset, AssetId as XcmAssetId, Fungibility, Junction, Junctions::*, Location, + Xcm, VERSION as V_4, + }, + VersionedLocation, VersionedXcm, +}; +use xcm_fee_payment_runtime_api::runtime_decl_for_xcm_payment_api::XcmPaymentApi; + +/// Register an asset into `pallet-assets` instance, and register as as cross-chain asset. +/// +/// If specified, also set _units-per-second_ to make the asset _payable_. +fn prepare_asset(asset_id: u128, location: VersionedLocation, units_per_second: Option) { + // 1. Create an asset representation + assert_ok!(Assets::force_create( + RuntimeOrigin::root(), + asset_id.into(), + MultiAddress::Id(ALICE), + true, + 1 + )); + + // 2. Register its location & bind it to the registered asset representation + assert_ok!(XcAssetConfig::register_asset_location( + RuntimeOrigin::root(), + Box::new(location.clone()), + asset_id.into(), + )); + + // 3. Maybe set the units per second + if let Some(units_per_second) = units_per_second { + assert_ok!(XcAssetConfig::set_asset_units_per_second( + RuntimeOrigin::root(), + Box::new(location), + units_per_second.into() + )); + } +} + +#[test] +fn query_acceptable_payment_assets_is_ok() { + new_test_ext().execute_with(|| { + // 0. Sanity check for unsupported version + { + assert!(Runtime::query_acceptable_payment_assets(2).is_err()); + } + + // 1. First check the return values without any foreign asset registered. + { + let assets = Runtime::query_acceptable_payment_assets(V_4) + .expect("Must return at least native currency."); + assert_eq!(assets, vec![XcmAssetId(Location::here()).into()]); + } + + // 2. Register two foreign assets - one payable, one not. + // Expect native asset & payable asset to be returned. + { + let payable_location = Location::new(1, Here); + let non_payable_location = Location::new(1, Junction::Parachain(2)); + + prepare_asset(1, payable_location.clone().into_versioned(), Some(1000)); + prepare_asset(2, non_payable_location.clone().into_versioned(), None); + + let assets = Runtime::query_acceptable_payment_assets(V_4) + .expect("Must return at least native currency."); + + assert_eq!(assets.len(), 2); + assert!(assets.contains(&XcmAssetId(Location::here()).into())); + assert!(assets.contains(&XcmAssetId(payable_location).into())); + } + }) +} + +#[test] +fn query_weight_to_asset_fee_is_ok() { + new_test_ext().execute_with(|| { + // 0. Sanity check for unsupported asset + { + let non_payable_location = Location::new(1, Here); + assert!(Runtime::query_weight_to_asset_fee( + Weight::from_parts(1000, 1000), + XcmAssetId(non_payable_location.clone()).into(), + ) + .is_err()); + + prepare_asset(1, non_payable_location.clone().into_versioned(), None); + assert!(Runtime::query_weight_to_asset_fee( + Weight::from_parts(1000, 1000), + XcmAssetId(non_payable_location).into(), + ) + .is_err()); + } + + // 1. Native asset payment + { + let weight = Weight::from_parts(1000, 1000); + let fee = + Runtime::query_weight_to_asset_fee(weight, XcmAssetId(Location::here()).into()) + .expect("Must return fee for native asset."); + + // TODO: improve the check later once _weight-to-fee_ code is more accessible. + assert!(!fee.is_zero(), "Fee must be greater than zero."); + } + + // 2. Foreign asset payment + { + let payable_location = Location::new(2, Here); + prepare_asset( + 2, + payable_location.clone().into_versioned(), + Some(1_000_000_000_000), + ); + + let weight = Weight::from_parts(1_000_000_000, 1_000_000); + let fee = + Runtime::query_weight_to_asset_fee(weight, XcmAssetId(payable_location).into()) + .expect("Must return fee for payable asset."); + + // TODO: improve the check later once _weight-to-fee_ code is more accessible. + assert!(!fee.is_zero(), "Fee must be greater than zero."); + } + }) +} + +#[test] +fn query_xcm_weight_is_ok() { + new_test_ext().execute_with(|| { + let native_asset: XcmAsset = + XcmAssetId(Location::here()).into_asset(Fungibility::Fungible(1_000_000_000)); + + // Prepare an xcm sequence + let xcm_sequence = Xcm::<()>::builder_unsafe() + .withdraw_asset(native_asset.clone()) + .deposit_asset( + native_asset, + Junction::AccountId32 { + network: None, + id: BOB.clone().into(), + }, + ) + .build(); + + let weight = + Runtime::query_xcm_weight(VersionedXcm::V4(xcm_sequence)).expect("Must return weight."); + assert!( + !weight.is_zero(), + "Weight must be non-zero since we're performing asset withdraw & deposit." + ); + }) +} + +#[test] +fn query_delivery_fees_is_ok() { + new_test_ext().execute_with(|| { + let location = Location::new(1, Here).into_versioned(); + + // Prepare a dummy xcm sequence + let xcm_sequence = Xcm::<()>::builder_unsafe() + .clear_error() + .unsubscribe_version() + .build(); + + // TODO: this is something we should revisit + assert!( + Runtime::query_delivery_fees(location, VersionedXcm::V4(xcm_sequence)).is_err(), + "At the moment, `PriceForMessageDelivery` is not implemented." + ); + }) +} diff --git a/tests/xcm-simulator/src/mocks/parachain.rs b/tests/xcm-simulator/src/mocks/parachain.rs index b9430c5ac..9346305cc 100644 --- a/tests/xcm-simulator/src/mocks/parachain.rs +++ b/tests/xcm-simulator/src/mocks/parachain.rs @@ -23,8 +23,8 @@ use frame_support::{ dispatch::DispatchClass, parameter_types, traits::{ - AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, Contains, Currency, - Everything, Imbalance, InstanceFilter, Nothing, OnUnbalanced, + AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, Contains, Everything, + InstanceFilter, Nothing, }, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND}, @@ -74,8 +74,6 @@ pub type AccountId = AccountId32; pub type Balance = u128; pub type AssetId = u128; -pub type NegativeImbalance = >::NegativeImbalance; - pub type ShidenAssetLocationIdConverter = AssetLocationIdConverter; parameter_types! { @@ -280,19 +278,6 @@ impl pallet_contracts::Config for Runtime { type ApiVersion = (); } -pub struct BurnFees; -impl OnUnbalanced for BurnFees { - /// Payout tips but burn all the fees - fn on_unbalanceds(mut fees_then_tips: impl Iterator) { - if let Some(mut fees_to_burn) = fees_then_tips.next() { - if let Some(tips) = fees_then_tips.next() { - fees_to_burn.subsume(tips) - } - drop(fees_to_burn); - } - } -} - /// The type used to represent the kinds of proxying allowed. #[derive( Copy, @@ -535,6 +520,9 @@ impl xcm_executor::Config for XcmConfig { type SafeCallFilter = Everything; type Aliasers = Nothing; type TransactionalProcessor = (); + type HrmpNewChannelOpenRequestHandler = (); + type HrmpChannelAcceptedHandler = (); + type HrmpChannelClosingHandler = (); } impl mock_msg_queue::Config for Runtime { diff --git a/tests/xcm-simulator/src/mocks/relay_chain.rs b/tests/xcm-simulator/src/mocks/relay_chain.rs index 77e3b90aa..3cba99b9d 100644 --- a/tests/xcm-simulator/src/mocks/relay_chain.rs +++ b/tests/xcm-simulator/src/mocks/relay_chain.rs @@ -167,6 +167,9 @@ impl xcm_executor::Config for XcmConfig { type SafeCallFilter = Everything; type Aliasers = Nothing; type TransactionalProcessor = (); + type HrmpNewChannelOpenRequestHandler = (); + type HrmpChannelAcceptedHandler = (); + type HrmpChannelClosingHandler = (); } pub type LocalOriginToLocation = SignedToAccountId32; @@ -243,11 +246,12 @@ impl pallet_message_queue::Config for Runtime { type Size = u32; type HeapSize = MessageQueueHeapSize; type MaxStale = MessageQueueMaxStale; - type ServiceWeight = MessageQueueServiceWeight; type MessageProcessor = MessageProcessor; type QueueChangeHandler = (); type WeightInfo = (); type QueuePausedQuery = (); + type ServiceWeight = MessageQueueServiceWeight; + type IdleMaxServiceWeight = MessageQueueServiceWeight; } construct_runtime!( diff --git a/tests/xcm-simulator/src/tests/fungible_assets.rs b/tests/xcm-simulator/src/tests/fungible_assets.rs index 96bb546de..0ab7bc04c 100644 --- a/tests/xcm-simulator/src/tests/fungible_assets.rs +++ b/tests/xcm-simulator/src/tests/fungible_assets.rs @@ -60,7 +60,7 @@ fn para_to_para_reserve_transfer_and_back_via_xtokens() { parachain::RuntimeOrigin::signed(ALICE), Box::new((Here, withdraw_amount).into()), Box::new(destination.into()), - WeightLimit::Unlimited + Unlimited )); // Parachain 2 sovereign account should have it's balance increased, while Alice balance should be decreased. @@ -105,7 +105,7 @@ fn para_to_para_reserve_transfer_and_back_via_xtokens() { parachain::RuntimeOrigin::signed(ALICE), Box::new((para_a_multiloc, remaining).into()), Box::new(destination.into()), - WeightLimit::Unlimited + Unlimited )); }); @@ -440,12 +440,13 @@ fn receive_relay_asset_from_relay_and_send_them_back_via_xtokens() { // Next step is to send some of relay native asset to parachain A. let withdraw_amount = 567; Relay::execute_with(|| { - assert_ok!(RelayChainPalletXcm::reserve_transfer_assets( + assert_ok!(RelayChainPalletXcm::limited_reserve_transfer_assets( relay_chain::RuntimeOrigin::signed(ALICE), Box::new(Parachain(1).into()), Box::new(alice.into()), Box::new((Here, withdraw_amount).into()), 0, + Unlimited, )); // Parachain A sovereign account should have it's balance increased, while Alice balance should be decreased. @@ -492,7 +493,7 @@ fn receive_relay_asset_from_relay_and_send_them_back_via_xtokens() { parachain::RuntimeOrigin::signed(ALICE), Box::new((Parent, para_a_alice_expected_balance).into()), Box::new(destination.into()), - WeightLimit::Unlimited, + Unlimited, )); }); @@ -538,12 +539,13 @@ fn receive_relay_asset_from_relay_and_send_them_back() { // Next step is to send some of relay native asset to parachain A. let withdraw_amount = 567; Relay::execute_with(|| { - assert_ok!(RelayChainPalletXcm::reserve_transfer_assets( + assert_ok!(RelayChainPalletXcm::limited_reserve_transfer_assets( relay_chain::RuntimeOrigin::signed(ALICE), Box::new(Parachain(1).into()), Box::new(alice.into()), Box::new((Here, withdraw_amount).into()), 0, + Unlimited, )); // Parachain A sovereign account should have it's balance increased, while Alice balance should be decreased. @@ -624,7 +626,7 @@ fn para_a_send_relay_asset_to_para_b() { source_location, parent_account_id(), Some(true), - Some(123), + Some(1), // free execution Some(0) )); @@ -638,7 +640,7 @@ fn para_a_send_relay_asset_to_para_b() { source_location, parent_account_id(), Some(true), - Some(123), + Some(1), Some(1_000_000_000_000) )); }); @@ -647,12 +649,13 @@ fn para_a_send_relay_asset_to_para_b() { // same as previous test let withdraw_amount = 54321; Relay::execute_with(|| { - assert_ok!(RelayChainPalletXcm::reserve_transfer_assets( + assert_ok!(RelayChainPalletXcm::limited_reserve_transfer_assets( relay_chain::RuntimeOrigin::signed(ALICE), Box::new(Parachain(1).into()), Box::new(alice.into_location().into_versioned()), Box::new((Here, withdraw_amount).into()), 0, + Unlimited, )); }); @@ -748,12 +751,13 @@ fn send_relay_asset_to_para_b_with_extra_native() { // same as previous test let withdraw_amount = 54321; Relay::execute_with(|| { - assert_ok!(RelayChainPalletXcm::reserve_transfer_assets( + assert_ok!(RelayChainPalletXcm::limited_reserve_transfer_assets( relay_chain::RuntimeOrigin::signed(ALICE), Box::new(Parachain(1).into()), Box::new(alice.into_location().into_versioned()), Box::new((Here, withdraw_amount).into()), 0, + Unlimited, )); }); @@ -829,7 +833,7 @@ fn receive_asset_with_no_sufficients_not_possible_if_non_existent_account() { // Next step is to send some of relay native asset to parachain A. let withdraw_amount = 123; Relay::execute_with(|| { - assert_ok!(RelayChainPalletXcm::reserve_transfer_assets( + assert_ok!(RelayChainPalletXcm::limited_reserve_transfer_assets( relay_chain::RuntimeOrigin::signed(ALICE), Box::new(Parachain(1).into()), Box::new( @@ -841,6 +845,7 @@ fn receive_asset_with_no_sufficients_not_possible_if_non_existent_account() { ), Box::new((Here, withdraw_amount).into()), 0, + Unlimited, )); }); @@ -863,7 +868,7 @@ fn receive_asset_with_no_sufficients_not_possible_if_non_existent_account() { // Re-send tokens Relay::execute_with(|| { - assert_ok!(RelayChainPalletXcm::reserve_transfer_assets( + assert_ok!(RelayChainPalletXcm::limited_reserve_transfer_assets( relay_chain::RuntimeOrigin::signed(ALICE), Box::new(Parachain(1).into()), Box::new( @@ -875,6 +880,7 @@ fn receive_asset_with_no_sufficients_not_possible_if_non_existent_account() { ), Box::new((Here, withdraw_amount).into()), 0, + Unlimited, )); }); @@ -914,7 +920,7 @@ fn receive_assets_with_sufficients_true_allows_non_funded_account_to_receive_ass // Since min balance is configured to 1, 123 should be fine let withdraw_amount = 123; Relay::execute_with(|| { - assert_ok!(RelayChainPalletXcm::reserve_transfer_assets( + assert_ok!(RelayChainPalletXcm::limited_reserve_transfer_assets( relay_chain::RuntimeOrigin::signed(ALICE), Box::new(Parachain(1).into()), Box::new( @@ -926,6 +932,7 @@ fn receive_assets_with_sufficients_true_allows_non_funded_account_to_receive_ass ), Box::new((Here, withdraw_amount).into()), 0, + Unlimited, )); }); diff --git a/tests/xcm-simulator/src/tests/general.rs b/tests/xcm-simulator/src/tests/general.rs index 3e2f599d0..cf67a2752 100644 --- a/tests/xcm-simulator/src/tests/general.rs +++ b/tests/xcm-simulator/src/tests/general.rs @@ -159,12 +159,13 @@ fn error_when_not_paying_enough() { // We are sending 99 tokens from relay. // we know the buy_execution will spend 4 * 25 = 100 Relay::execute_with(|| { - assert_ok!(RelayChainPalletXcm::reserve_transfer_assets( + assert_ok!(RelayChainPalletXcm::limited_reserve_transfer_assets( relay_chain::RuntimeOrigin::signed(ALICE), Box::new(Parachain(1).into()), Box::new(VersionedLocation::V4(dest).clone().into()), Box::new((Here, 99).into()), 0, + WeightLimit::Unlimited, )); }); diff --git a/vendor/primitives/debug/src/lib.rs b/vendor/primitives/debug/src/lib.rs index 4f222fa1a..da9f7da44 100644 --- a/vendor/primitives/debug/src/lib.rs +++ b/vendor/primitives/debug/src/lib.rs @@ -17,7 +17,7 @@ #![cfg_attr(not(feature = "std"), no_std)] use ethereum::{TransactionV0 as LegacyTransaction, TransactionV2 as Transaction}; -use ethereum_types::H256; +use ethereum_types::{H160, H256, U256}; use parity_scale_codec::{Decode, Encode}; use sp_std::vec::Vec; @@ -30,7 +30,7 @@ sp_api::decl_runtime_apis! { // In order to be able to use ApiExt as part of the RPC handler logic we need to be always // above the version that exists on chain for this Api, even if this Api is only meant // to be used overridden. - #[api_version(5)] + #[api_version(6)] pub trait DebugRuntimeApi { #[changed_in(5)] fn trace_transaction( @@ -61,6 +61,19 @@ sp_api::decl_runtime_apis! { known_transactions: Vec, header: &Block::Header, ) -> Result<(), sp_runtime::DispatchError>; + + fn trace_call( + header: &Block::Header, + from: H160, + to: H160, + data: Vec, + value: U256, + gas_limit: U256, + max_fee_per_gas: Option, + max_priority_fee_per_gas: Option, + nonce: Option, + access_list: Option)>>, + ) -> Result<(), sp_runtime::DispatchError>; } } diff --git a/vendor/rpc-core/debug/Cargo.toml b/vendor/rpc-core/debug/Cargo.toml index dca0ddc94..ff840ac88 100644 --- a/vendor/rpc-core/debug/Cargo.toml +++ b/vendor/rpc-core/debug/Cargo.toml @@ -8,6 +8,7 @@ repository = "https://github.com/PureStake/moonbeam/" version = "0.1.0" [dependencies] +ethereum = { workspace = true, features = ["with-codec"] } ethereum-types = { workspace = true, features = ["std"] } futures = { workspace = true, features = ["compat"] } jsonrpsee = { workspace = true, features = ["macros", "server"] } @@ -16,4 +17,5 @@ moonbeam-rpc-core-types = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } +fc-rpc-core = { workspace = true } sp-core = { workspace = true, features = ["std"] } diff --git a/vendor/rpc-core/debug/src/lib.rs b/vendor/rpc-core/debug/src/lib.rs index 2f9bd2416..b0f898516 100644 --- a/vendor/rpc-core/debug/src/lib.rs +++ b/vendor/rpc-core/debug/src/lib.rs @@ -13,7 +13,9 @@ // You should have received a copy of the GNU General Public License // along with Moonbeam. If not, see . -use ethereum_types::H256; +use ethereum::AccessListItem; +use ethereum_types::{H160, H256, U256}; +use fc_rpc_core::types::Bytes; use jsonrpsee::{core::RpcResult, proc_macros::rpc}; use moonbeam_client_evm_tracing::types::single; use moonbeam_rpc_core_types::RequestBlockId; @@ -30,6 +32,34 @@ pub struct TraceParams { pub timeout: Option, } +#[derive(Debug, Clone, Default, Eq, PartialEq, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct TraceCallParams { + /// Sender + pub from: Option, + /// Recipient + pub to: H160, + /// Gas Price, legacy. + pub gas_price: Option, + /// Max BaseFeePerGas the user is willing to pay. + pub max_fee_per_gas: Option, + /// The miner's tip. + pub max_priority_fee_per_gas: Option, + /// Gas + pub gas: Option, + /// Value of transaction in wei + pub value: Option, + /// Additional data sent with transaction + pub data: Option, + /// Nonce + pub nonce: Option, + /// EIP-2930 access list + pub access_list: Option>, + /// EIP-2718 type + #[serde(rename = "type")] + pub transaction_type: Option, +} + #[rpc(server)] #[jsonrpsee::core::async_trait] pub trait Debug { @@ -39,6 +69,13 @@ pub trait Debug { transaction_hash: H256, params: Option, ) -> RpcResult; + #[method(name = "debug_traceCall")] + async fn trace_call( + &self, + call_params: TraceCallParams, + id: RequestBlockId, + params: Option, + ) -> RpcResult; #[method(name = "debug_traceBlockByNumber", aliases = ["debug_traceBlockByHash"])] async fn trace_block( &self, diff --git a/vendor/rpc/debug/Cargo.toml b/vendor/rpc/debug/Cargo.toml index 9fcd9d940..2affab209 100644 --- a/vendor/rpc/debug/Cargo.toml +++ b/vendor/rpc/debug/Cargo.toml @@ -36,5 +36,6 @@ fc-api = { workspace = true } fc-consensus = { workspace = true } fc-db = { workspace = true } fc-rpc = { workspace = true, features = ["rpc-binary-search-estimate"] } +fc-rpc-core = { workspace = true } fc-storage = { workspace = true } fp-rpc = { workspace = true, features = ["std"] } diff --git a/vendor/rpc/debug/src/lib.rs b/vendor/rpc/debug/src/lib.rs index 7bd577752..af687a4ab 100644 --- a/vendor/rpc/debug/src/lib.rs +++ b/vendor/rpc/debug/src/lib.rs @@ -15,7 +15,7 @@ // along with Moonbeam. If not, see . use futures::StreamExt; use jsonrpsee::core::{async_trait, RpcResult}; -pub use moonbeam_rpc_core_debug::{DebugServer, TraceParams}; +pub use moonbeam_rpc_core_debug::{DebugServer, TraceCallParams, TraceParams}; use tokio::{ self, @@ -23,7 +23,8 @@ use tokio::{ }; use ethereum_types::H256; -use fc_rpc::{frontier_backend_client, internal_err, OverrideHandle}; +use fc_rpc::{frontier_backend_client, internal_err}; +use fc_storage::StorageOverride; use fp_rpc::EthereumRuntimeRPCApi; use moonbeam_client_evm_tracing::{formatters::ResponseFormatter, types::single}; use moonbeam_rpc_core_types::{RequestBlockId, RequestBlockTag}; @@ -42,6 +43,7 @@ use sp_runtime::{ use std::{future::Future, marker::PhantomData, sync::Arc}; pub enum RequesterInput { + Call((RequestBlockId, TraceCallParams)), Transaction(H256), Block(RequestBlockId), } @@ -122,6 +124,36 @@ impl DebugServer for Debug { _ => unreachable!(), }) } + + /// Handler for `debug_traceCall` request. Communicates with the service-defined task + /// using channels. + async fn trace_call( + &self, + call_params: TraceCallParams, + id: RequestBlockId, + params: Option, + ) -> RpcResult { + let requester = self.requester.clone(); + + let (tx, rx) = oneshot::channel(); + // Send a message from the rpc handler to the service level task. + requester + .unbounded_send(((RequesterInput::Call((id, call_params)), params), tx)) + .map_err(|err| { + internal_err(format!( + "failed to send request to debug service : {:?}", + err + )) + })?; + + // Receive a message from the service level task and send the rpc response. + rx.await + .map_err(|err| internal_err(format!("debug service dropped the channel : {:?}", err)))? + .map(|res| match res { + Response::Single(res) => res, + _ => unreachable!(), + }) + } } pub struct DebugHandler(PhantomData<(B, C, BE)>); @@ -147,7 +179,7 @@ where backend: Arc, frontier_backend: Arc + Send + Sync>, permit_pool: Arc, - overrides: Arc>, + storage_override: Arc>, raw_max_memory_usage: usize, ) -> (impl Future, DebugRequester) { let (tx, mut rx): (DebugRequester, _) = @@ -164,7 +196,7 @@ where let backend = backend.clone(); let frontier_backend = frontier_backend.clone(); let permit_pool = permit_pool.clone(); - let overrides = overrides.clone(); + let storage_override = storage_override.clone(); tokio::task::spawn(async move { let _ = response_tx.send( @@ -177,7 +209,41 @@ where frontier_backend.clone(), transaction_hash, params, - overrides.clone(), + storage_override.clone(), + raw_max_memory_usage, + ) + }) + .await + .map_err(|e| { + internal_err(format!( + "Internal error on spawned task : {:?}", + e + )) + })? + } + .await, + ); + }); + } + Some(( + (RequesterInput::Call((request_block_id, call_params)), params), + response_tx, + )) => { + let client = client.clone(); + let frontier_backend = frontier_backend.clone(); + let permit_pool = permit_pool.clone(); + + tokio::task::spawn(async move { + let _ = response_tx.send( + async { + let _permit = permit_pool.acquire().await; + tokio::task::spawn_blocking(move || { + Self::handle_call_request( + client.clone(), + frontier_backend.clone(), + request_block_id, + call_params, + params, raw_max_memory_usage, ) }) @@ -198,7 +264,7 @@ where let backend = backend.clone(); let frontier_backend = frontier_backend.clone(); let permit_pool = permit_pool.clone(); - let overrides = overrides.clone(); + let storage_override = storage_override.clone(); tokio::task::spawn(async move { let _ = response_tx.send( @@ -212,7 +278,7 @@ where frontier_backend.clone(), request_block_id, params, - overrides.clone(), + storage_override.clone(), ) }) .await @@ -288,7 +354,7 @@ where frontier_backend: Arc + Send + Sync>, request_block_id: RequestBlockId, params: Option, - overrides: Arc>, + storage_override: Arc>, ) -> RpcResult { let (tracer_input, trace_type) = Self::handle_params(params)?; @@ -332,21 +398,9 @@ where // Get parent blockid. let parent_block_hash = *header.parent_hash(); - let schema = fc_storage::onchain_storage_schema::(client.as_ref(), hash); - - // Using storage overrides we align with `:ethereum_schema` which will result in proper - // SCALE decoding in case of migration. - let statuses = match overrides.schemas.get(&schema) { - Some(schema) => schema - .current_transaction_statuses(hash) - .unwrap_or_default(), - _ => { - return Err(internal_err(format!( - "No storage override at {:?}", - reference_id - ))) - } - }; + let statuses = storage_override + .current_transaction_statuses(hash) + .unwrap_or_default(); // Known ethereum transaction hashes. let eth_tx_hashes: Vec<_> = statuses.iter().map(|t| t.transaction_hash).collect(); @@ -445,7 +499,7 @@ where frontier_backend: Arc + Send + Sync>, transaction_hash: H256, params: Option, - overrides: Arc>, + storage_override: Arc>, raw_max_memory_usage: usize, ) -> RpcResult { let (tracer_input, trace_type) = Self::handle_params(params)?; @@ -504,20 +558,7 @@ where )); }; - let schema = - fc_storage::onchain_storage_schema::(client.as_ref(), reference_hash); - - // Get the block that contains the requested transaction. Using storage overrides we align - // with `:ethereum_schema` which will result in proper SCALE decoding in case of migration. - let reference_block = match overrides.schemas.get(&schema) { - Some(schema) => schema.current_block(reference_hash), - _ => { - return Err(internal_err(format!( - "No storage override at {:?}", - reference_hash - ))) - } - }; + let reference_block = storage_override.current_block(reference_hash); // Get the actual ethereum transaction. if let Some(block) = reference_block { @@ -633,4 +674,212 @@ where } Err(internal_err("Runtime block call failed".to_string())) } + + fn handle_call_request( + client: Arc, + frontier_backend: Arc + Send + Sync>, + request_block_id: RequestBlockId, + call_params: TraceCallParams, + trace_params: Option, + raw_max_memory_usage: usize, + ) -> RpcResult { + let (tracer_input, trace_type) = Self::handle_params(trace_params)?; + + let reference_id: BlockId = match request_block_id { + RequestBlockId::Number(n) => Ok(BlockId::Number(n.unique_saturated_into())), + RequestBlockId::Tag(RequestBlockTag::Latest) => { + Ok(BlockId::Number(client.info().best_number)) + } + RequestBlockId::Tag(RequestBlockTag::Earliest) => { + Ok(BlockId::Number(0u32.unique_saturated_into())) + } + RequestBlockId::Tag(RequestBlockTag::Pending) => { + Err(internal_err("'pending' blocks are not supported")) + } + RequestBlockId::Hash(eth_hash) => { + match futures::executor::block_on(frontier_backend_client::load_hash::( + client.as_ref(), + frontier_backend.as_ref(), + eth_hash, + )) { + Ok(Some(hash)) => Ok(BlockId::Hash(hash)), + Ok(_) => Err(internal_err("Block hash not found".to_string())), + Err(e) => Err(e), + } + } + }?; + + // Get ApiRef. This handle allow to keep changes between txs in an internal buffer. + let api = client.runtime_api(); + // Get the header I want to work with. + let Ok(hash) = client.expect_block_hash_from_id(&reference_id) else { + return Err(internal_err("Block header not found")); + }; + let header = match client.header(hash) { + Ok(Some(h)) => h, + _ => return Err(internal_err("Block header not found")), + }; + // Get parent blockid. + let parent_block_hash = *header.parent_hash(); + + // Get DebugRuntimeApi version + let trace_api_version = if let Ok(Some(api_version)) = + api.api_version::>(parent_block_hash) + { + api_version + } else { + return Err(internal_err( + "Runtime api version call failed (trace)".to_string(), + )); + }; + + if trace_api_version <= 5 { + return Err(internal_err( + "debug_traceCall not supported with old runtimes".to_string(), + )); + } + + let TraceCallParams { + from, + to, + gas_price, + max_fee_per_gas, + max_priority_fee_per_gas, + gas, + value, + data, + nonce, + access_list, + .. + } = call_params; + + let (max_fee_per_gas, max_priority_fee_per_gas) = + match (gas_price, max_fee_per_gas, max_priority_fee_per_gas) { + (gas_price, None, None) => { + // Legacy request, all default to gas price. + // A zero-set gas price is None. + let gas_price = if gas_price.unwrap_or_default().is_zero() { + None + } else { + gas_price + }; + (gas_price, gas_price) + } + (_, max_fee, max_priority) => { + // eip-1559 + // A zero-set max fee is None. + let max_fee = if max_fee.unwrap_or_default().is_zero() { + None + } else { + max_fee + }; + // Ensure `max_priority_fee_per_gas` is less or equal to `max_fee_per_gas`. + if let Some(max_priority) = max_priority { + let max_fee = max_fee.unwrap_or_default(); + if max_priority > max_fee { + return Err(internal_err( + "Invalid input: `max_priority_fee_per_gas` greater than `max_fee_per_gas`", + )); + } + } + (max_fee, max_priority) + } + }; + + let gas_limit = match gas { + Some(amount) => amount, + None => { + if let Some(block) = api + .current_block(parent_block_hash) + .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? + { + block.header.gas_limit + } else { + return Err(internal_err( + "block unavailable, cannot query gas limit".to_string(), + )); + } + } + }; + let data = data.map(|d| d.0).unwrap_or_default(); + + let access_list = access_list.unwrap_or_default(); + + let f = || -> RpcResult<_> { + let _result = api + .trace_call( + parent_block_hash, + &header, + from.unwrap_or_default(), + to, + data, + value.unwrap_or_default(), + gas_limit, + max_fee_per_gas, + max_priority_fee_per_gas, + nonce, + Some( + access_list + .into_iter() + .map(|item| (item.address, item.storage_keys)) + .collect(), + ), + ) + .map_err(|e| internal_err(format!("Runtime api access error: {:?}", e)))? + .map_err(|e| internal_err(format!("DispatchError: {:?}", e)))?; + + Ok(moonbeam_rpc_primitives_debug::Response::Single) + }; + + return match trace_type { + single::TraceType::Raw { + disable_storage, + disable_memory, + disable_stack, + } => { + let mut proxy = moonbeam_client_evm_tracing::listeners::Raw::new( + disable_storage, + disable_memory, + disable_stack, + raw_max_memory_usage, + ); + proxy.using(f)?; + Ok(Response::Single( + moonbeam_client_evm_tracing::formatters::Raw::format(proxy).ok_or( + internal_err( + "replayed transaction generated too much data. \ + try disabling memory or storage?", + ), + )?, + )) + } + single::TraceType::CallList => { + let mut proxy = moonbeam_client_evm_tracing::listeners::CallList::default(); + proxy.using(f)?; + proxy.finish_transaction(); + let response = match tracer_input { + TracerInput::Blockscout => { + moonbeam_client_evm_tracing::formatters::Blockscout::format(proxy) + .ok_or("Trace result is empty.") + .map_err(|e| internal_err(format!("{:?}", e))) + } + TracerInput::CallTracer => { + let mut res = + moonbeam_client_evm_tracing::formatters::CallTracer::format(proxy) + .ok_or("Trace result is empty.") + .map_err(|e| internal_err(format!("{:?}", e)))?; + Ok(res.pop().expect("Trace result is empty.")) + } + _ => Err(internal_err( + "Bug: failed to resolve the tracer format.".to_string(), + )), + }?; + Ok(Response::Single(response)) + } + not_supported => Err(internal_err(format!( + "Bug: `handle_call_request` does not support {:?}.", + not_supported + ))), + }; + } } diff --git a/vendor/rpc/trace/src/lib.rs b/vendor/rpc/trace/src/lib.rs index d44dd569c..fbef9bb26 100644 --- a/vendor/rpc/trace/src/lib.rs +++ b/vendor/rpc/trace/src/lib.rs @@ -45,7 +45,7 @@ use substrate_prometheus_endpoint::{ }; use ethereum_types::H256; -use fc_rpc::OverrideHandle; +use fc_storage::StorageOverride; use fp_rpc::EthereumRuntimeRPCApi; use moonbeam_client_evm_tracing::{ @@ -442,7 +442,7 @@ where backend: Arc, cache_duration: Duration, blocking_permits: Arc, - overrides: Arc>, + storage_override: Arc>, prometheus: Option, ) -> (impl Future, CacheRequester) { // Communication with the outside world : @@ -489,7 +489,7 @@ where match request { None => break, Some(CacheRequest::StartBatch {sender, blocks}) - => inner.request_start_batch(&blocking_tx, sender, blocks, overrides.clone()), + => inner.request_start_batch(&blocking_tx, sender, blocks, storage_override.clone()), Some(CacheRequest::GetTraces {sender, block}) => inner.request_get_traces(sender, block), Some(CacheRequest::StopBatch {batch_id}) => { @@ -529,13 +529,13 @@ where /// Handle the creation of a batch. /// Will start the tracing process for blocks that are not already in the cache. - #[instrument(skip(self, blocking_tx, sender, blocks, overrides))] + #[instrument(skip(self, blocking_tx, sender, blocks, storage_override))] fn request_start_batch( &mut self, blocking_tx: &mpsc::Sender, sender: oneshot::Sender, blocks: Vec, - overrides: Arc>, + storage_override: Arc>, ) { tracing::trace!("Starting batch {}", self.next_batch_id); self.batches.insert(self.next_batch_id, blocks.clone()); @@ -559,7 +559,7 @@ where let client = Arc::clone(&self.client); let backend = Arc::clone(&self.backend); let blocking_tx = blocking_tx.clone(); - let overrides = overrides.clone(); + let storage_override = storage_override.clone(); // Spawn all block caching asynchronously. // It will wait to obtain a permit, then spawn a blocking task. @@ -587,7 +587,7 @@ where // Perform block tracing in a tokio blocking task. let result = async { tokio::task::spawn_blocking(move || { - Self::cache_block(client, backend, block, overrides.clone()) + Self::cache_block(client, backend, block, storage_override.clone()) }) .await .map_err(|e| { @@ -787,12 +787,12 @@ where } /// (In blocking task) Use the Runtime API to trace the block. - #[instrument(skip(client, backend, overrides))] + #[instrument(skip(client, backend, storage_override))] fn cache_block( client: Arc, backend: Arc, substrate_hash: H256, - overrides: Arc>, + storage_override: Arc>, ) -> TxsTraceRes { // Get Subtrate block data. let api = client.runtime_api(); @@ -809,24 +809,18 @@ where let height = *block_header.number(); let substrate_parent_hash = *block_header.parent_hash(); - let schema = - fc_storage::onchain_storage_schema::(client.as_ref(), substrate_hash); - // Get Ethereum block data. - let (eth_block, eth_transactions) = match overrides.schemas.get(&schema) { - Some(schema) => match ( - schema.current_block(substrate_hash), - schema.current_transaction_statuses(substrate_hash), - ) { - (Some(a), Some(b)) => (a, b), - _ => { - return Err(format!( - "Failed to get Ethereum block data for Substrate block {}", - substrate_hash - )) - } - }, - _ => return Err(format!("No storage override at {:?}", substrate_hash)), + let (eth_block, eth_transactions) = match ( + storage_override.current_block(substrate_hash), + storage_override.current_transaction_statuses(substrate_hash), + ) { + (Some(a), Some(b)) => (a, b), + _ => { + return Err(format!( + "Failed to get Ethereum block data for Substrate block {}", + substrate_hash + )) + } }; let eth_block_hash = eth_block.header.hash(); @@ -894,37 +888,48 @@ where Ok(moonbeam_rpc_primitives_debug::Response::Block) }; + let eth_transactions_by_index: BTreeMap = eth_transactions + .iter() + .map(|t| (t.transaction_index, t.transaction_hash)) + .collect(); + let mut proxy = moonbeam_client_evm_tracing::listeners::CallList::default(); proxy.using(f)?; - let mut traces: Vec<_> = - moonbeam_client_evm_tracing::formatters::TraceFilter::format(proxy) - .ok_or("Fail to format proxy")?; - // Fill missing data. - for trace in traces.iter_mut() { - trace.block_hash = eth_block_hash; - trace.block_number = height; - trace.transaction_hash = eth_transactions - .get(trace.transaction_position as usize) - .ok_or_else(|| { - tracing::warn!( - "Bug: A transaction has been replayed while it shouldn't (in block {}).", - height - ); - format!( - "Bug: A transaction has been replayed while it shouldn't (in block {}).", - height - ) - })? - .transaction_hash; + let traces: Vec = + moonbeam_client_evm_tracing::formatters::TraceFilter::format(proxy) + .ok_or("Fail to format proxy")? + .into_iter() + .filter_map(|mut trace| { + match eth_transactions_by_index.get(&trace.transaction_position) { + Some(transaction_hash) => { + trace.block_hash = eth_block_hash; + trace.block_number = height; + trace.transaction_hash = *transaction_hash; + + // Reformat error messages. + if let block::TransactionTraceOutput::Error(ref mut error) = + trace.output + { + if error.as_slice() == b"execution reverted" { + *error = b"Reverted".to_vec(); + } + } + + Some(trace) + } + None => { + log::warn!( + "A trace in block {} does not map to any known ethereum transaction. Trace: {:?}", + height, + trace, + ); + None + } + } + }) + .collect(); - // Reformat error messages. - if let block::TransactionTraceOutput::Error(ref mut error) = trace.output { - if error.as_slice() == b"execution reverted" { - *error = b"Reverted".to_vec(); - } - } - } Ok(traces) } }