From 978a9c3d5d7d9b47822971cb9257c8de92361118 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev <45011053+ghzlatarev@users.noreply.github.com> Date: Sat, 15 Jul 2023 05:43:43 +0300 Subject: [PATCH] Release v4.3.1 (unfilter pallet-xcm send, configure xcm send origin, equalize Manta and Calamari randomness - 1 epoch ago) (#1216) * Bump spec version Signed-off-by: Georgi Zlatarev * Use 1 epoch ago randomness in calamari as well Signed-off-by: Georgi Zlatarev * bench only xcm pallets Signed-off-by: Georgi Zlatarev * bench only lotter Signed-off-by: Georgi Zlatarev * bench only lottery and dex Signed-off-by: Georgi Zlatarev * Revert Signed-off-by: Georgi Zlatarev * Bump client Signed-off-by: Georgi Zlatarev * Update changelog Signed-off-by: Georgi Zlatarev * Update xcm weights Signed-off-by: Georgi Zlatarev * Benc pallet-lottery only Signed-off-by: Georgi Zlatarev * recommit Signed-off-by: Georgi Zlatarev * Fix wrong reports of congestion test results (#1208) * print to congestion test Signed-off-by: Georgi Zlatarev * print to congestion test Signed-off-by: Georgi Zlatarev * Update check_tests.yml Signed-off-by: Georgi Zlatarev <45011053+ghzlatarev@users.noreply.github.com> * Update check_tests.yml Signed-off-by: Georgi Zlatarev <45011053+ghzlatarev@users.noreply.github.com> * Revert push branch Signed-off-by: Georgi Zlatarev * Update check_tests.yml update reported message Signed-off-by: Georgi Zlatarev <45011053+ghzlatarev@users.noreply.github.com> --------- Signed-off-by: Georgi Zlatarev Signed-off-by: Georgi Zlatarev <45011053+ghzlatarev@users.noreply.github.com> Signed-off-by: Georgi Zlatarev * Update changelog Signed-off-by: Georgi Zlatarev * Update lottery weights Signed-off-by: Georgi Zlatarev * Update DCO workflow Signed-off-by: Georgi Zlatarev * Update changelog Signed-off-by: Georgi Zlatarev * Add mantapay rpc tests to manta runtime (#1207) * Add mantapay rpc tests to manta runtiem Signed-off-by: Georgi Zlatarev * Add avg block time test to mocha tests Signed-off-by: Georgi Zlatarev * Fix avg block test| | Signed-off-by: Georgi Zlatarev * Add logs Signed-off-by: Georgi Zlatarev * Update average block time test Signed-off-by: Georgi Zlatarev * Don't await in lambda Signed-off-by: Georgi Zlatarev * Update stress_benchmark_test.ts Signed-off-by: Georgi Zlatarev <45011053+ghzlatarev@users.noreply.github.com> --------- Signed-off-by: Georgi Zlatarev Signed-off-by: Georgi Zlatarev <45011053+ghzlatarev@users.noreply.github.com> Signed-off-by: Georgi Zlatarev * Update changelog Signed-off-by: Georgi Zlatarev * Unfilter pallet-xcm send Signed-off-by: Georgi Zlatarev * Update xcmPallet send origin and mocks Signed-off-by: Georgi Zlatarev * Remove redundant comment Signed-off-by: Georgi Zlatarev * Update xcm execute filter Signed-off-by: Georgi Zlatarev --------- Signed-off-by: Georgi Zlatarev Signed-off-by: Georgi Zlatarev <45011053+ghzlatarev@users.noreply.github.com> --- .github/workflows/dco.yml | 2 +- CHANGELOG.md | 9 ++ Cargo.lock | 42 ++--- node/Cargo.toml | 2 +- pallets/asset-manager/Cargo.toml | 2 +- pallets/collator-selection/Cargo.toml | 2 +- pallets/farming/Cargo.toml | 2 +- pallets/farming/rpc/Cargo.toml | 2 +- pallets/farming/rpc/runtime-api/Cargo.toml | 2 +- pallets/manta-pay/Cargo.toml | 2 +- pallets/manta-sbt/Cargo.toml | 2 +- pallets/manta-support/Cargo.toml | 2 +- pallets/name-service/Cargo.toml | 2 +- pallets/pallet-lottery/Cargo.toml | 2 +- pallets/parachain-staking/Cargo.toml | 2 +- pallets/randomness/Cargo.toml | 2 +- pallets/tx-pause/Cargo.toml | 2 +- pallets/vesting/Cargo.toml | 2 +- primitives/manta/Cargo.toml | 2 +- primitives/session-keys/Cargo.toml | 2 +- runtime/calamari/Cargo.toml | 2 +- runtime/calamari/src/lib.rs | 7 +- .../calamari/src/weights/pallet_lottery.rs | 122 +++++++-------- .../xcm/pallet_xcm_benchmarks_fungible.rs | 18 +-- .../xcm/pallet_xcm_benchmarks_generic.rs | 36 ++--- runtime/calamari/src/xcm_config.rs | 11 +- runtime/common/Cargo.toml | 2 +- runtime/integration-tests/Cargo.toml | 2 +- .../src/xcm_mock/parachain.rs | 7 +- runtime/manta/Cargo.toml | 2 +- runtime/manta/src/lib.rs | 3 +- runtime/manta/src/weights/pallet_lottery.rs | 146 +++++++++--------- .../xcm/pallet_xcm_benchmarks_fungible.rs | 18 +-- .../xcm/pallet_xcm_benchmarks_generic.rs | 36 ++--- runtime/manta/src/xcm_config.rs | 11 +- 35 files changed, 260 insertions(+), 250 deletions(-) diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml index 54213a329..5d6db6806 100644 --- a/.github/workflows/dco.yml +++ b/.github/workflows/dco.yml @@ -32,7 +32,7 @@ jobs: `-s` = `Signed-off-by` `-S` = `Verify commit using gpg key` If there is more than one commit in your pull request and your git client is modern enough (2.13+), rebase the required number of commits with --signoff: - `git rebase --signoff HEAD~` + `git rebase --signoff -S HEAD~` Then, force push: `git push -f origin ` For instructions on managing gpg signature verification please visit: https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits diff --git a/CHANGELOG.md b/CHANGELOG.md index 600231e9a..834f095d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # CHANGELOG +## v4.3.1 +### Added +- [\#1197](https://github.com/Manta-Network/Manta/pull/1197) check-tests CI workflow benchmark tests for manta-dev +- [\#1055](https://github.com/Manta-Network/Manta/pull/1055) Allow xcm-transacts from all chains [MACADO] +- [\#1207](https://github.com/Manta-Network/Manta/pull/1207) Add mantapay rpc tests to manta runtime [MACA] + +### Fixed +- [\#1208](https://github.com/Manta-Network/Manta/pull/1208) Fix wrong reports of congestion test results + ## v4.3.0 ### Added - [\#1179](https://github.com/Manta-Network/Manta/pull/1179) Copy Name Service Pallet [CA] diff --git a/Cargo.lock b/Cargo.lock index cd585cccc..e0159eba2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1094,7 +1094,7 @@ dependencies = [ [[package]] name = "calamari-runtime" -version = "4.3.0" +version = "4.3.1" dependencies = [ "calamari-vesting", "cumulus-pallet-dmp-queue", @@ -1195,7 +1195,7 @@ dependencies = [ [[package]] name = "calamari-vesting" -version = "4.3.0" +version = "4.3.1" dependencies = [ "chrono", "frame-benchmarking", @@ -4148,7 +4148,7 @@ dependencies = [ [[package]] name = "integration-tests" -version = "4.3.0" +version = "4.3.1" dependencies = [ "calamari-runtime", "calamari-vesting", @@ -5276,7 +5276,7 @@ dependencies = [ [[package]] name = "manta" -version = "4.3.0" +version = "4.3.1" dependencies = [ "async-trait", "calamari-runtime", @@ -5383,7 +5383,7 @@ dependencies = [ [[package]] name = "manta-collator-selection" -version = "4.3.0" +version = "4.3.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5470,7 +5470,7 @@ dependencies = [ [[package]] name = "manta-primitives" -version = "4.3.0" +version = "4.3.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5491,7 +5491,7 @@ dependencies = [ [[package]] name = "manta-runtime" -version = "4.3.0" +version = "4.3.1" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -6469,7 +6469,7 @@ dependencies = [ [[package]] name = "pallet-asset-manager" -version = "4.3.0" +version = "4.3.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -6830,7 +6830,7 @@ dependencies = [ [[package]] name = "pallet-farming" -version = "4.3.0" +version = "4.3.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -6854,7 +6854,7 @@ dependencies = [ [[package]] name = "pallet-farming-rpc-api" -version = "4.3.0" +version = "4.3.1" dependencies = [ "jsonrpsee", "manta-primitives", @@ -6870,7 +6870,7 @@ dependencies = [ [[package]] name = "pallet-farming-rpc-runtime-api" -version = "4.3.0" +version = "4.3.1" dependencies = [ "manta-primitives", "parity-scale-codec", @@ -6974,7 +6974,7 @@ dependencies = [ [[package]] name = "pallet-lottery" -version = "4.3.0" +version = "4.3.1" dependencies = [ "calamari-runtime", "frame-benchmarking", @@ -7010,7 +7010,7 @@ dependencies = [ [[package]] name = "pallet-manta-pay" -version = "4.3.0" +version = "4.3.1" dependencies = [ "anyhow", "base64 0.20.0", @@ -7045,7 +7045,7 @@ dependencies = [ [[package]] name = "pallet-manta-sbt" -version = "4.3.0" +version = "4.3.1" dependencies = [ "anyhow", "base64 0.20.0", @@ -7084,7 +7084,7 @@ dependencies = [ [[package]] name = "pallet-manta-support" -version = "4.3.0" +version = "4.3.1" dependencies = [ "anyhow", "base64 0.20.0", @@ -7159,7 +7159,7 @@ dependencies = [ [[package]] name = "pallet-name-service" -version = "4.3.0" +version = "4.3.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -7281,7 +7281,7 @@ dependencies = [ [[package]] name = "pallet-parachain-staking" -version = "4.3.0" +version = "4.3.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -7338,7 +7338,7 @@ dependencies = [ [[package]] name = "pallet-randomness" -version = "4.3.0" +version = "4.3.1" dependencies = [ "derive_more", "frame-benchmarking", @@ -7653,7 +7653,7 @@ dependencies = [ [[package]] name = "pallet-tx-pause" -version = "4.3.0" +version = "4.3.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -10025,7 +10025,7 @@ dependencies = [ [[package]] name = "runtime-common" -version = "4.3.0" +version = "4.3.1" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -11631,7 +11631,7 @@ dependencies = [ [[package]] name = "session-key-primitives" -version = "4.3.0" +version = "4.3.1" dependencies = [ "async-trait", "manta-primitives", diff --git a/node/Cargo.toml b/node/Cargo.toml index f3c5ac413..94ba99b6f 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -9,7 +9,7 @@ license = 'GPL-3.0' name = 'manta' repository = 'https://github.com/Manta-Network/Manta/' rust-version = '1.62' -version = '4.3.0' +version = '4.3.1' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] diff --git a/pallets/asset-manager/Cargo.toml b/pallets/asset-manager/Cargo.toml index b57d3b878..bff7663c3 100644 --- a/pallets/asset-manager/Cargo.toml +++ b/pallets/asset-manager/Cargo.toml @@ -5,7 +5,7 @@ homepage = "https://manta.network" license = "GPL-3.0" name = "pallet-asset-manager" repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [dependencies] codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false } diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml index fd6b74694..6bfebc130 100644 --- a/pallets/collator-selection/Cargo.toml +++ b/pallets/collator-selection/Cargo.toml @@ -7,7 +7,7 @@ license = 'GPL-3.0' name = 'manta-collator-selection' readme = 'README.md' repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] diff --git a/pallets/farming/Cargo.toml b/pallets/farming/Cargo.toml index 779044c8b..e1b19311b 100644 --- a/pallets/farming/Cargo.toml +++ b/pallets/farming/Cargo.toml @@ -6,7 +6,7 @@ homepage = "https://manta.network" license = "GPL-3.0" name = "pallet-farming" repository = 'https://github.com/Manta-Network/Manta/' -version = "4.3.0" +version = "4.3.1" [dependencies] codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive"] } diff --git a/pallets/farming/rpc/Cargo.toml b/pallets/farming/rpc/Cargo.toml index a5c676895..1de209cb0 100644 --- a/pallets/farming/rpc/Cargo.toml +++ b/pallets/farming/rpc/Cargo.toml @@ -5,7 +5,7 @@ homepage = "https://manta.network" license = "GPL-3.0" name = "pallet-farming-rpc-api" repository = 'https://github.com/Manta-Network/Manta/' -version = "4.3.0" +version = "4.3.1" [dependencies] codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive"] } diff --git a/pallets/farming/rpc/runtime-api/Cargo.toml b/pallets/farming/rpc/runtime-api/Cargo.toml index 6f32af331..b84f0d049 100644 --- a/pallets/farming/rpc/runtime-api/Cargo.toml +++ b/pallets/farming/rpc/runtime-api/Cargo.toml @@ -5,7 +5,7 @@ homepage = "https://manta.network" license = "GPL-3.0" name = "pallet-farming-rpc-runtime-api" repository = 'https://github.com/Manta-Network/Manta/' -version = "4.3.0" +version = "4.3.1" [dependencies] codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive"] } diff --git a/pallets/manta-pay/Cargo.toml b/pallets/manta-pay/Cargo.toml index 00dcdbb22..93899012f 100644 --- a/pallets/manta-pay/Cargo.toml +++ b/pallets/manta-pay/Cargo.toml @@ -7,7 +7,7 @@ license = 'GPL-3.0' name = 'pallet-manta-pay' readme = 'README.md' repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [package.metadata.docs.rs] # To build locally: diff --git a/pallets/manta-sbt/Cargo.toml b/pallets/manta-sbt/Cargo.toml index 8d01bf96b..c8a70a21e 100644 --- a/pallets/manta-sbt/Cargo.toml +++ b/pallets/manta-sbt/Cargo.toml @@ -7,7 +7,7 @@ license = 'GPL-3.0' name = 'pallet-manta-sbt' readme = 'README.md' repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [[bin]] name = "precompute_coins" diff --git a/pallets/manta-support/Cargo.toml b/pallets/manta-support/Cargo.toml index c63e13853..efcc4f309 100644 --- a/pallets/manta-support/Cargo.toml +++ b/pallets/manta-support/Cargo.toml @@ -7,7 +7,7 @@ license = 'GPL-3.0' name = 'pallet-manta-support' readme = 'README.md' repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [dependencies] # utils diff --git a/pallets/name-service/Cargo.toml b/pallets/name-service/Cargo.toml index 7bba57c12..bf158b042 100644 --- a/pallets/name-service/Cargo.toml +++ b/pallets/name-service/Cargo.toml @@ -5,7 +5,7 @@ homepage = "https://manta.network" license = "GPL-3.0" name = "pallet-name-service" repository = "https://github.com/Manta-Network/Manta/" -version = "4.3.0" +version = "4.3.1" [dependencies] codec = { package = "parity-scale-codec", version = '3.4.0', default-features = false } diff --git a/pallets/pallet-lottery/Cargo.toml b/pallets/pallet-lottery/Cargo.toml index d13925c17..67862718b 100644 --- a/pallets/pallet-lottery/Cargo.toml +++ b/pallets/pallet-lottery/Cargo.toml @@ -6,7 +6,7 @@ homepage = 'https://manta.network' license = 'GPL-3.0' name = 'pallet-lottery' repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [dependencies] codec = { version = '3.4.0', default-features = false, features = ['derive'], package = 'parity-scale-codec' } diff --git a/pallets/parachain-staking/Cargo.toml b/pallets/parachain-staking/Cargo.toml index 0693bf4aa..0a26b2a68 100644 --- a/pallets/parachain-staking/Cargo.toml +++ b/pallets/parachain-staking/Cargo.toml @@ -6,7 +6,7 @@ homepage = 'https://manta.network' license = 'GPL-3.0' name = "pallet-parachain-staking" repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [dependencies] log = { version = "0.4", default-features = false } diff --git a/pallets/randomness/Cargo.toml b/pallets/randomness/Cargo.toml index e29e59a5e..69aa85131 100644 --- a/pallets/randomness/Cargo.toml +++ b/pallets/randomness/Cargo.toml @@ -6,7 +6,7 @@ homepage = 'https://manta.network' license = 'GPL-3.0' name = 'pallet-randomness' repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [dependencies] frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.37", default-features = false, optional = true } diff --git a/pallets/tx-pause/Cargo.toml b/pallets/tx-pause/Cargo.toml index 9c1ba1244..d4e8a7193 100644 --- a/pallets/tx-pause/Cargo.toml +++ b/pallets/tx-pause/Cargo.toml @@ -5,7 +5,7 @@ homepage = 'https://manta.network' license = 'GPL-3.0' name = "pallet-tx-pause" repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [dependencies] codec = { package = "parity-scale-codec", version = '3.4.0', default-features = false } diff --git a/pallets/vesting/Cargo.toml b/pallets/vesting/Cargo.toml index de3599c35..a7b8d0d30 100644 --- a/pallets/vesting/Cargo.toml +++ b/pallets/vesting/Cargo.toml @@ -5,7 +5,7 @@ homepage = 'https://manta.network' license = 'GPL-3.0' name = "calamari-vesting" repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [dependencies] codec = { package = "parity-scale-codec", version = '3.4.0', default-features = false, features = ["derive", "max-encoded-len"] } diff --git a/primitives/manta/Cargo.toml b/primitives/manta/Cargo.toml index be45f7615..6f69785b3 100644 --- a/primitives/manta/Cargo.toml +++ b/primitives/manta/Cargo.toml @@ -5,7 +5,7 @@ homepage = 'https://manta.network' license = 'GPL-3.0' name = "manta-primitives" repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] diff --git a/primitives/session-keys/Cargo.toml b/primitives/session-keys/Cargo.toml index 24b244148..2c9128119 100644 --- a/primitives/session-keys/Cargo.toml +++ b/primitives/session-keys/Cargo.toml @@ -4,7 +4,7 @@ description = "Primitives for session keys" edition = "2021" license = "GPL-3.0" name = "session-key-primitives" -version = '4.3.0' +version = '4.3.1' [dependencies] async-trait = { version = "0.1", optional = true } diff --git a/runtime/calamari/Cargo.toml b/runtime/calamari/Cargo.toml index 8f9f36c16..f1ab6eb13 100644 --- a/runtime/calamari/Cargo.toml +++ b/runtime/calamari/Cargo.toml @@ -5,7 +5,7 @@ homepage = 'https://manta.network' license = 'GPL-3.0' name = 'calamari-runtime' repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [dependencies] codec = { package = "parity-scale-codec", version = '3.4.0', default-features = false, features = ["derive", "max-encoded-len"] } diff --git a/runtime/calamari/src/lib.rs b/runtime/calamari/src/lib.rs index c8b9494cd..7f928a6d1 100644 --- a/runtime/calamari/src/lib.rs +++ b/runtime/calamari/src/lib.rs @@ -141,7 +141,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("calamari"), impl_name: create_runtime_str!("calamari"), authoring_version: 2, - spec_version: 4300, + spec_version: 4310, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 14, @@ -250,7 +250,7 @@ impl Contains for BaseFilter { | orml_xtokens::Call::transfer_multiasset_with_fee {..} | orml_xtokens::Call::transfer_multiassets {..}) // Filter callables from XCM pallets, we use XTokens exclusively - | RuntimeCall::XcmpQueue(_) | RuntimeCall::PolkadotXcm(_) | RuntimeCall::DmpQueue(_) => false, + | RuntimeCall::XcmpQueue(_) | RuntimeCall::DmpQueue(_) => false, // Explicitly ALLOWED calls | RuntimeCall::Authorship(_) @@ -312,6 +312,7 @@ impl Contains for BaseFilter { | RuntimeCall::ZenlinkProtocol(_) | RuntimeCall::Farming(_) | RuntimeCall::AssetManager(pallet_asset_manager::Call::update_outgoing_filtered_assets {..}) + | RuntimeCall::PolkadotXcm(pallet_xcm::Call::send {..}) | RuntimeCall::Utility(_) => true, // DISALLOW anything else @@ -402,7 +403,7 @@ impl pallet_randomness::GetBabeData> for BabeDataGetter { } relay_chain_state_proof() .read_optional_entry( - cumulus_primitives_core::relay_chain::well_known_keys::TWO_EPOCHS_AGO_RANDOMNESS, + cumulus_primitives_core::relay_chain::well_known_keys::ONE_EPOCH_AGO_RANDOMNESS, ) .ok() .flatten() diff --git a/runtime/calamari/src/weights/pallet_lottery.rs b/runtime/calamari/src/weights/pallet_lottery.rs index 18d953990..b6525e26a 100644 --- a/runtime/calamari/src/weights/pallet_lottery.rs +++ b/runtime/calamari/src/weights/pallet_lottery.rs @@ -17,7 +17,7 @@ //! Autogenerated weights for pallet_lottery //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-07-08, STEPS: `25`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-07-14, STEPS: `25`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("/home/runner/runners/2.280.1/_work/Manta/Manta/tests/data/fork.json"), DB CACHE: 1024 // Executed Command: @@ -85,10 +85,10 @@ impl pallet_lottery::WeightInfo for SubstrateWeight /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn deposit(x: u32, _y: u32, ) -> Weight { - // Minimum execution time: 173_719 nanoseconds. - Weight::from_ref_time(314_790_135) - // Standard Error: 9_780 - .saturating_add(Weight::from_ref_time(187_432).saturating_mul(x.into())) + // Minimum execution time: 176_496 nanoseconds. + Weight::from_ref_time(224_654_002) + // Standard Error: 9_941 + .saturating_add(Weight::from_ref_time(223_257).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(23)) .saturating_add(T::DbWeight::get().writes(13)) } @@ -111,10 +111,10 @@ impl pallet_lottery::WeightInfo for SubstrateWeight /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn request_withdraw(x: u32, _y: u32, ) -> Weight { - // Minimum execution time: 113_413 nanoseconds. - Weight::from_ref_time(145_503_071) - // Standard Error: 10_039 - .saturating_add(Weight::from_ref_time(131_226).saturating_mul(x.into())) + // Minimum execution time: 112_042 nanoseconds. + Weight::from_ref_time(140_492_952) + // Standard Error: 5_384 + .saturating_add(Weight::from_ref_time(98_103).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(17)) .saturating_add(T::DbWeight::get().writes(9)) } @@ -124,10 +124,10 @@ impl pallet_lottery::WeightInfo for SubstrateWeight // Storage: Lottery TotalUnclaimedWinnings (r:1 w:1) /// The range of component `y` is `[0, 63]`. fn claim_my_winnings(y: u32, ) -> Weight { - // Minimum execution time: 52_543 nanoseconds. - Weight::from_ref_time(55_733_062) - // Standard Error: 2_686 - .saturating_add(Weight::from_ref_time(141_791).saturating_mul(y.into())) + // Minimum execution time: 52_836 nanoseconds. + Weight::from_ref_time(55_863_826) + // Standard Error: 2_821 + .saturating_add(Weight::from_ref_time(141_309).saturating_mul(y.into())) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(4)) } @@ -139,16 +139,16 @@ impl pallet_lottery::WeightInfo for SubstrateWeight // Storage: Lottery GasReserve (r:1 w:0) // Storage: Scheduler Agenda (r:1 w:1) fn start_lottery() -> Weight { - // Minimum execution time: 91_113 nanoseconds. - Weight::from_ref_time(92_722_000) + // Minimum execution time: 91_112 nanoseconds. + Weight::from_ref_time(92_425_000) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn stop_lottery() -> Weight { - // Minimum execution time: 28_796 nanoseconds. - Weight::from_ref_time(42_348_000) + // Minimum execution time: 30_932 nanoseconds. + Weight::from_ref_time(43_149_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -166,12 +166,12 @@ impl pallet_lottery::WeightInfo for SubstrateWeight /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn draw_lottery(x: u32, y: u32, ) -> Weight { - // Minimum execution time: 77_755 nanoseconds. - Weight::from_ref_time(78_365_000) - // Standard Error: 84_572 - .saturating_add(Weight::from_ref_time(4_109_255).saturating_mul(x.into())) - // Standard Error: 1_345_540 - .saturating_add(Weight::from_ref_time(819_291).saturating_mul(y.into())) + // Minimum execution time: 78_500 nanoseconds. + Weight::from_ref_time(79_402_000) + // Standard Error: 76_280 + .saturating_add(Weight::from_ref_time(3_873_493).saturating_mul(x.into())) + // Standard Error: 1_213_620 + .saturating_add(Weight::from_ref_time(713_631).saturating_mul(y.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(T::DbWeight::get().writes(2)) @@ -180,28 +180,28 @@ impl pallet_lottery::WeightInfo for SubstrateWeight // Storage: Lottery WithdrawalRequestQueue (r:1 w:0) // Storage: Lottery UnlockedUnstakingFunds (r:1 w:0) fn process_matured_withdrawals() -> Weight { - // Minimum execution time: 13_551 nanoseconds. - Weight::from_ref_time(13_771_000) + // Minimum execution time: 13_097 nanoseconds. + Weight::from_ref_time(13_516_000) .saturating_add(T::DbWeight::get().reads(3)) } // Storage: Lottery MinWithdraw (r:1 w:0) // Storage: Lottery MinDeposit (r:0 w:1) fn set_min_deposit() -> Weight { - // Minimum execution time: 25_043 nanoseconds. - Weight::from_ref_time(26_070_000) + // Minimum execution time: 8_558 nanoseconds. + Weight::from_ref_time(8_711_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Lottery MinWithdraw (r:0 w:1) fn set_min_withdraw() -> Weight { - // Minimum execution time: 9_657 nanoseconds. - Weight::from_ref_time(14_980_000) + // Minimum execution time: 4_501 nanoseconds. + Weight::from_ref_time(4_620_000) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Lottery GasReserve (r:0 w:1) fn set_gas_reserve() -> Weight { - // Minimum execution time: 9_195 nanoseconds. - Weight::from_ref_time(9_761_000) + // Minimum execution time: 13_573 nanoseconds. + Weight::from_ref_time(14_326_000) .saturating_add(T::DbWeight::get().writes(1)) } } @@ -232,10 +232,10 @@ impl WeightInfo for () { /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn deposit(x: u32, _y: u32, ) -> Weight { - // Minimum execution time: 173_719 nanoseconds. - Weight::from_ref_time(314_790_135) - // Standard Error: 9_780 - .saturating_add(Weight::from_ref_time(187_432).saturating_mul(x.into())) + // Minimum execution time: 176_496 nanoseconds. + Weight::from_ref_time(224_654_002) + // Standard Error: 9_941 + .saturating_add(Weight::from_ref_time(223_257).saturating_mul(x.into())) .saturating_add(RocksDbWeight::get().reads(23)) .saturating_add(RocksDbWeight::get().writes(13)) } @@ -258,10 +258,10 @@ impl WeightInfo for () { /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn request_withdraw(x: u32, _y: u32, ) -> Weight { - // Minimum execution time: 113_413 nanoseconds. - Weight::from_ref_time(145_503_071) - // Standard Error: 10_039 - .saturating_add(Weight::from_ref_time(131_226).saturating_mul(x.into())) + // Minimum execution time: 112_042 nanoseconds. + Weight::from_ref_time(140_492_952) + // Standard Error: 5_384 + .saturating_add(Weight::from_ref_time(98_103).saturating_mul(x.into())) .saturating_add(RocksDbWeight::get().reads(17)) .saturating_add(RocksDbWeight::get().writes(9)) } @@ -271,10 +271,10 @@ impl WeightInfo for () { // Storage: Lottery TotalUnclaimedWinnings (r:1 w:1) /// The range of component `y` is `[0, 63]`. fn claim_my_winnings(y: u32, ) -> Weight { - // Minimum execution time: 52_543 nanoseconds. - Weight::from_ref_time(55_733_062) - // Standard Error: 2_686 - .saturating_add(Weight::from_ref_time(141_791).saturating_mul(y.into())) + // Minimum execution time: 52_836 nanoseconds. + Weight::from_ref_time(55_863_826) + // Standard Error: 2_821 + .saturating_add(Weight::from_ref_time(141_309).saturating_mul(y.into())) .saturating_add(RocksDbWeight::get().reads(5)) .saturating_add(RocksDbWeight::get().writes(4)) } @@ -286,16 +286,16 @@ impl WeightInfo for () { // Storage: Lottery GasReserve (r:1 w:0) // Storage: Scheduler Agenda (r:1 w:1) fn start_lottery() -> Weight { - // Minimum execution time: 91_113 nanoseconds. - Weight::from_ref_time(92_722_000) + // Minimum execution time: 91_112 nanoseconds. + Weight::from_ref_time(92_425_000) .saturating_add(RocksDbWeight::get().reads(7)) .saturating_add(RocksDbWeight::get().writes(2)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn stop_lottery() -> Weight { - // Minimum execution time: 28_796 nanoseconds. - Weight::from_ref_time(42_348_000) + // Minimum execution time: 30_932 nanoseconds. + Weight::from_ref_time(43_149_000) .saturating_add(RocksDbWeight::get().reads(2)) .saturating_add(RocksDbWeight::get().writes(2)) } @@ -313,12 +313,12 @@ impl WeightInfo for () { /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn draw_lottery(x: u32, y: u32, ) -> Weight { - // Minimum execution time: 77_755 nanoseconds. - Weight::from_ref_time(78_365_000) - // Standard Error: 84_572 - .saturating_add(Weight::from_ref_time(4_109_255).saturating_mul(x.into())) - // Standard Error: 1_345_540 - .saturating_add(Weight::from_ref_time(819_291).saturating_mul(y.into())) + // Minimum execution time: 78_500 nanoseconds. + Weight::from_ref_time(79_402_000) + // Standard Error: 76_280 + .saturating_add(Weight::from_ref_time(3_873_493).saturating_mul(x.into())) + // Standard Error: 1_213_620 + .saturating_add(Weight::from_ref_time(713_631).saturating_mul(y.into())) .saturating_add(RocksDbWeight::get().reads(4)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(RocksDbWeight::get().writes(2)) @@ -327,28 +327,28 @@ impl WeightInfo for () { // Storage: Lottery WithdrawalRequestQueue (r:1 w:0) // Storage: Lottery UnlockedUnstakingFunds (r:1 w:0) fn process_matured_withdrawals() -> Weight { - // Minimum execution time: 13_551 nanoseconds. - Weight::from_ref_time(13_771_000) + // Minimum execution time: 13_097 nanoseconds. + Weight::from_ref_time(13_516_000) .saturating_add(RocksDbWeight::get().reads(3)) } // Storage: Lottery MinWithdraw (r:1 w:0) // Storage: Lottery MinDeposit (r:0 w:1) fn set_min_deposit() -> Weight { - // Minimum execution time: 25_043 nanoseconds. - Weight::from_ref_time(26_070_000) + // Minimum execution time: 8_558 nanoseconds. + Weight::from_ref_time(8_711_000) .saturating_add(RocksDbWeight::get().reads(1)) .saturating_add(RocksDbWeight::get().writes(1)) } // Storage: Lottery MinWithdraw (r:0 w:1) fn set_min_withdraw() -> Weight { - // Minimum execution time: 9_657 nanoseconds. - Weight::from_ref_time(14_980_000) + // Minimum execution time: 4_501 nanoseconds. + Weight::from_ref_time(4_620_000) .saturating_add(RocksDbWeight::get().writes(1)) } // Storage: Lottery GasReserve (r:0 w:1) fn set_gas_reserve() -> Weight { - // Minimum execution time: 9_195 nanoseconds. - Weight::from_ref_time(9_761_000) + // Minimum execution time: 13_573 nanoseconds. + Weight::from_ref_time(14_326_000) .saturating_add(RocksDbWeight::get().writes(1)) } } diff --git a/runtime/calamari/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/runtime/calamari/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs index ee9c2fcf2..a0c5f6db9 100644 --- a/runtime/calamari/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs +++ b/runtime/calamari/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs @@ -17,8 +17,8 @@ //! Autogenerated weights for `pallet_xcm_benchmarks::fungible` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-07-07, STEPS: `50`, REPEAT: 40, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `ip-172-31-87-73`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz` +//! DATE: 2023-07-14, STEPS: `50`, REPEAT: 40, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `ip-172-31-83-77`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("/home/runner/runners/2.280.1/_work/Manta/Manta/tests/data/fork.json"), DB CACHE: 1024 // Executed Command: @@ -50,7 +50,7 @@ impl WeightInfo { // Storage: AssetManager LocationAssetId (r:1 w:0) // Storage: System Account (r:1 w:1) pub(crate) fn withdraw_asset() -> Weight { - Weight::from_ref_time(50_974_000) + Weight::from_ref_time(50_380_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -58,7 +58,7 @@ impl WeightInfo { // Storage: AssetManager LocationAssetId (r:1 w:0) // Storage: System Account (r:2 w:2) pub(crate) fn transfer_asset() -> Weight { - Weight::from_ref_time(63_304_000) + Weight::from_ref_time(63_920_000) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -71,18 +71,18 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn transfer_reserve_asset() -> Weight { - Weight::from_ref_time(80_363_000) + Weight::from_ref_time(76_459_000) .saturating_add(T::DbWeight::get().reads(9)) .saturating_add(T::DbWeight::get().writes(4)) } pub(crate) fn reserve_asset_deposited() -> Weight { - Weight::from_ref_time(2_166_000) + Weight::from_ref_time(2_240_000) } // Storage: ParachainInfo ParachainId (r:1 w:0) // Storage: AssetManager LocationAssetId (r:1 w:0) // Storage: System Account (r:1 w:1) pub(crate) fn deposit_asset() -> Weight { - Weight::from_ref_time(51_014_000) + Weight::from_ref_time(50_799_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -95,7 +95,7 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn deposit_reserve_asset() -> Weight { - Weight::from_ref_time(72_758_000) + Weight::from_ref_time(74_284_000) .saturating_add(T::DbWeight::get().reads(8)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -106,7 +106,7 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn initiate_teleport() -> Weight { - Weight::from_ref_time(30_639_000) + Weight::from_ref_time(29_705_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(2)) } diff --git a/runtime/calamari/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/runtime/calamari/src/weights/xcm/pallet_xcm_benchmarks_generic.rs index db18463eb..6e078ab30 100644 --- a/runtime/calamari/src/weights/xcm/pallet_xcm_benchmarks_generic.rs +++ b/runtime/calamari/src/weights/xcm/pallet_xcm_benchmarks_generic.rs @@ -17,8 +17,8 @@ //! Autogenerated weights for `pallet_xcm_benchmarks::generic` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-07-07, STEPS: `50`, REPEAT: 40, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `ip-172-31-87-73`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz` +//! DATE: 2023-07-14, STEPS: `50`, REPEAT: 40, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `ip-172-31-83-77`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("/home/runner/runners/2.280.1/_work/Manta/Manta/tests/data/fork.json"), DB CACHE: 1024 // Executed Command: @@ -53,38 +53,38 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn query_holding() -> Weight { - Weight::from_ref_time(1_147_785_000) + Weight::from_ref_time(1_091_449_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(2)) } pub(crate) fn buy_execution() -> Weight { - Weight::from_ref_time(4_545_000) + Weight::from_ref_time(4_748_000) } // Storage: PolkadotXcm Queries (r:1 w:0) pub(crate) fn query_response() -> Weight { - Weight::from_ref_time(14_951_000) + Weight::from_ref_time(15_324_000) .saturating_add(T::DbWeight::get().reads(1)) } pub(crate) fn transact() -> Weight { - Weight::from_ref_time(17_537_000) + Weight::from_ref_time(17_751_000) } pub(crate) fn refund_surplus() -> Weight { - Weight::from_ref_time(4_421_000) + Weight::from_ref_time(4_818_000) } pub(crate) fn set_error_handler() -> Weight { - Weight::from_ref_time(1_062_000) + Weight::from_ref_time(1_197_000) } pub(crate) fn set_appendix() -> Weight { - Weight::from_ref_time(3_196_000) + Weight::from_ref_time(1_174_000) } pub(crate) fn clear_error() -> Weight { - Weight::from_ref_time(2_357_000) + Weight::from_ref_time(1_134_000) } pub(crate) fn descend_origin() -> Weight { - Weight::from_ref_time(4_376_000) + Weight::from_ref_time(2_852_000) } pub(crate) fn clear_origin() -> Weight { - Weight::from_ref_time(1_710_000) + Weight::from_ref_time(3_473_000) } // Storage: PolkadotXcm SupportedVersion (r:1 w:0) // Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1) @@ -92,18 +92,18 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn report_error() -> Weight { - Weight::from_ref_time(16_549_000) + Weight::from_ref_time(25_291_000) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: PolkadotXcm AssetTraps (r:1 w:1) pub(crate) fn claim_asset() -> Weight { - Weight::from_ref_time(20_628_000) + Weight::from_ref_time(24_910_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } pub(crate) fn trap() -> Weight { - Weight::from_ref_time(1_078_000) + Weight::from_ref_time(1_148_000) } // Storage: PolkadotXcm VersionNotifyTargets (r:1 w:1) // Storage: PolkadotXcm SupportedVersion (r:1 w:0) @@ -112,13 +112,13 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn subscribe_version() -> Weight { - Weight::from_ref_time(36_512_000) + Weight::from_ref_time(36_432_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: PolkadotXcm VersionNotifyTargets (r:0 w:1) pub(crate) fn unsubscribe_version() -> Weight { - Weight::from_ref_time(3_673_000) + Weight::from_ref_time(3_984_000) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: ParachainInfo ParachainId (r:1 w:0) @@ -128,7 +128,7 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn initiate_reserve_withdraw() -> Weight { - Weight::from_ref_time(1_335_268_000) + Weight::from_ref_time(1_341_950_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(2)) } diff --git a/runtime/calamari/src/xcm_config.rs b/runtime/calamari/src/xcm_config.rs index 0944e9346..72d6dfe6f 100644 --- a/runtime/calamari/src/xcm_config.rs +++ b/runtime/calamari/src/xcm_config.rs @@ -48,8 +48,8 @@ use xcm_builder::{ AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, ConvertedConcreteAssetId, EnsureXcmOrigin, FixedRateOfFungible, LocationInverter, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountId32AsNative, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, - WeightInfoBounds, + SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, + TakeWeightCredit, WeightInfoBounds, }; use xcm_executor::{traits::JustTry, Config, XcmExecutor}; @@ -251,8 +251,8 @@ impl Config for XcmExecutorConfig { type SubscriptionService = PolkadotXcm; } -/// No one is allowed to dispatch XCM sends/executions. -pub type LocalOriginToLocation = (); +/// Converts a Signed Local Origin into a MultiLocation +pub type LocalOriginToLocation = SignedToAccountId32; /// The means for routing XCM messages which are not for local execution into the right message /// queues. @@ -271,9 +271,8 @@ impl pallet_xcm::Config for Runtime { type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; - type ExecuteXcmOrigin = EnsureXcmOrigin; + type ExecuteXcmOrigin = EnsureXcmOrigin; /// This means that no location will pass XcmExecuteFilter, so a dispatched `execute` message will be filtered. - /// This shouldn't be reachable since `LocalOriginToLocation = ();`, but let's be on the safe side. type XcmExecuteFilter = Nothing; type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Nothing; diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 4ca3f5bbd..e308d5613 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -5,7 +5,7 @@ homepage = 'https://manta.network' license = 'GPL-3.0' name = "runtime-common" repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [dependencies] # Substrate dependencies diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index 3b3573ab3..f830f7711 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -5,7 +5,7 @@ homepage = "https://manta.network" license = "GPL-3.0" name = "integration-tests" repository = "https://github.com/Manta-Network/Manta/" -version = "4.3.0" +version = "4.3.1" [dependencies] calamari-runtime = { path = "../calamari", optional = true } diff --git a/runtime/integration-tests/src/xcm_mock/parachain.rs b/runtime/integration-tests/src/xcm_mock/parachain.rs index 9a2de5350..1a8ea16d5 100644 --- a/runtime/integration-tests/src/xcm_mock/parachain.rs +++ b/runtime/integration-tests/src/xcm_mock/parachain.rs @@ -60,7 +60,8 @@ use xcm_builder::{ AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, ConvertedConcreteAssetId, EnsureXcmOrigin, FixedRateOfFungible, LocationInverter, ParentIsPreset, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, - SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, WeightInfoBounds, + SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, + WeightInfoBounds, }; use xcm_executor::{traits::JustTry, Config, XcmExecutor}; use xcm_simulator::{DmpMessageHandlerT, Get, TestExt, XcmpMessageHandlerT}; @@ -507,13 +508,13 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; } -pub type LocalOriginToLocation = (); +pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; - type ExecuteXcmOrigin = EnsureXcmOrigin; + type ExecuteXcmOrigin = EnsureXcmOrigin; type XcmExecuteFilter = Nothing; type XcmExecutor = XcmExecutor; // Do not allow teleports diff --git a/runtime/manta/Cargo.toml b/runtime/manta/Cargo.toml index 10115c30b..b65f3579c 100644 --- a/runtime/manta/Cargo.toml +++ b/runtime/manta/Cargo.toml @@ -5,7 +5,7 @@ homepage = 'https://manta.network' license = 'GPL-3.0' name = 'manta-runtime' repository = 'https://github.com/Manta-Network/Manta/' -version = '4.3.0' +version = '4.3.1' [dependencies] codec = { package = "parity-scale-codec", version = '3.4.0', default-features = false, features = ["derive", "max-encoded-len"] } diff --git a/runtime/manta/src/lib.rs b/runtime/manta/src/lib.rs index 1a54548ed..e2f650129 100644 --- a/runtime/manta/src/lib.rs +++ b/runtime/manta/src/lib.rs @@ -143,7 +143,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("manta"), impl_name: create_runtime_str!("manta"), authoring_version: 1, - spec_version: 4300, + spec_version: 4310, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 3, @@ -276,6 +276,7 @@ impl Contains for MantaFilter { | RuntimeCall::TransactionPause(_) | RuntimeCall::ZenlinkProtocol(_) | RuntimeCall::Farming(_) + | RuntimeCall::PolkadotXcm(pallet_xcm::Call::send {..}) | RuntimeCall::AssetManager(pallet_asset_manager::Call::update_outgoing_filtered_assets {..}) | RuntimeCall::Utility(_) => true, diff --git a/runtime/manta/src/weights/pallet_lottery.rs b/runtime/manta/src/weights/pallet_lottery.rs index 2b41cdea6..806094154 100644 --- a/runtime/manta/src/weights/pallet_lottery.rs +++ b/runtime/manta/src/weights/pallet_lottery.rs @@ -17,7 +17,7 @@ //! Autogenerated weights for pallet_lottery //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-07-08, STEPS: `25`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-07-14, STEPS: `25`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("/home/runner/runners/2.280.1/_work/Manta/Manta/tests/data/fork.json"), DB CACHE: 1024 // Executed Command: @@ -85,12 +85,12 @@ impl pallet_lottery::WeightInfo for SubstrateWeight /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn deposit(x: u32, y: u32, ) -> Weight { - // Minimum execution time: 176_888 nanoseconds. - Weight::from_ref_time(196_996_194) - // Standard Error: 1_167 - .saturating_add(Weight::from_ref_time(159_092).saturating_mul(x.into())) - // Standard Error: 18_388 - .saturating_add(Weight::from_ref_time(228_320).saturating_mul(y.into())) + // Minimum execution time: 175_374 nanoseconds. + Weight::from_ref_time(148_054_298) + // Standard Error: 9_310 + .saturating_add(Weight::from_ref_time(232_689).saturating_mul(x.into())) + // Standard Error: 146_674 + .saturating_add(Weight::from_ref_time(629_540).saturating_mul(y.into())) .saturating_add(T::DbWeight::get().reads(23)) .saturating_add(T::DbWeight::get().writes(13)) } @@ -113,12 +113,12 @@ impl pallet_lottery::WeightInfo for SubstrateWeight /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn request_withdraw(x: u32, y: u32, ) -> Weight { - // Minimum execution time: 115_236 nanoseconds. - Weight::from_ref_time(118_905_620) - // Standard Error: 631 - .saturating_add(Weight::from_ref_time(95_494).saturating_mul(x.into())) - // Standard Error: 9_946 - .saturating_add(Weight::from_ref_time(160_283).saturating_mul(y.into())) + // Minimum execution time: 114_748 nanoseconds. + Weight::from_ref_time(118_941_924) + // Standard Error: 11_664 + .saturating_add(Weight::from_ref_time(156_400).saturating_mul(x.into())) + // Standard Error: 183_753 + .saturating_add(Weight::from_ref_time(90_652).saturating_mul(y.into())) .saturating_add(T::DbWeight::get().reads(17)) .saturating_add(T::DbWeight::get().writes(9)) } @@ -128,10 +128,10 @@ impl pallet_lottery::WeightInfo for SubstrateWeight // Storage: Lottery TotalUnclaimedWinnings (r:1 w:1) /// The range of component `y` is `[0, 63]`. fn claim_my_winnings(y: u32, ) -> Weight { - // Minimum execution time: 53_702 nanoseconds. - Weight::from_ref_time(56_592_923) - // Standard Error: 2_539 - .saturating_add(Weight::from_ref_time(142_800).saturating_mul(y.into())) + // Minimum execution time: 52_765 nanoseconds. + Weight::from_ref_time(55_740_117) + // Standard Error: 2_939 + .saturating_add(Weight::from_ref_time(148_756).saturating_mul(y.into())) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(4)) } @@ -143,16 +143,16 @@ impl pallet_lottery::WeightInfo for SubstrateWeight // Storage: Lottery GasReserve (r:1 w:0) // Storage: Scheduler Agenda (r:1 w:1) fn start_lottery() -> Weight { - // Minimum execution time: 87_273 nanoseconds. - Weight::from_ref_time(88_247_000) + // Minimum execution time: 44_535 nanoseconds. + Weight::from_ref_time(46_463_000) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn stop_lottery() -> Weight { - // Minimum execution time: 30_336 nanoseconds. - Weight::from_ref_time(40_791_000) + // Minimum execution time: 30_873 nanoseconds. + Weight::from_ref_time(31_365_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -170,42 +170,42 @@ impl pallet_lottery::WeightInfo for SubstrateWeight /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn draw_lottery(x: u32, y: u32, ) -> Weight { - // Minimum execution time: 78_712 nanoseconds. - Weight::from_ref_time(79_416_000) - // Standard Error: 83_399 - .saturating_add(Weight::from_ref_time(939_914).saturating_mul(x.into())) - // Standard Error: 1_326_874 - .saturating_add(Weight::from_ref_time(16_139_385).saturating_mul(y.into())) - .saturating_add(T::DbWeight::get().reads(12)) - .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(y.into()))) + // Minimum execution time: 78_448 nanoseconds. + Weight::from_ref_time(79_450_000) + // Standard Error: 78_175 + .saturating_add(Weight::from_ref_time(3_908_724).saturating_mul(x.into())) + // Standard Error: 1_243_759 + .saturating_add(Weight::from_ref_time(759_212).saturating_mul(y.into())) + .saturating_add(T::DbWeight::get().reads(4)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Lottery UnstakingCollators (r:1 w:0) // Storage: Lottery WithdrawalRequestQueue (r:1 w:0) // Storage: Lottery UnlockedUnstakingFunds (r:1 w:0) fn process_matured_withdrawals() -> Weight { - // Minimum execution time: 13_732 nanoseconds. - Weight::from_ref_time(13_974_000) + // Minimum execution time: 39_644 nanoseconds. + Weight::from_ref_time(40_370_000) .saturating_add(T::DbWeight::get().reads(3)) } // Storage: Lottery MinWithdraw (r:1 w:0) // Storage: Lottery MinDeposit (r:0 w:1) fn set_min_deposit() -> Weight { - // Minimum execution time: 8_864 nanoseconds. - Weight::from_ref_time(9_049_000) + // Minimum execution time: 17_539 nanoseconds. + Weight::from_ref_time(17_935_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Lottery MinWithdraw (r:0 w:1) fn set_min_withdraw() -> Weight { - // Minimum execution time: 4_706 nanoseconds. - Weight::from_ref_time(4_928_000) + // Minimum execution time: 9_210 nanoseconds. + Weight::from_ref_time(9_540_000) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Lottery GasReserve (r:0 w:1) fn set_gas_reserve() -> Weight { - // Minimum execution time: 13_971 nanoseconds. - Weight::from_ref_time(14_447_000) + // Minimum execution time: 6_272 nanoseconds. + Weight::from_ref_time(6_477_000) .saturating_add(T::DbWeight::get().writes(1)) } } @@ -236,12 +236,12 @@ impl WeightInfo for () { /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn deposit(x: u32, y: u32, ) -> Weight { - // Minimum execution time: 176_888 nanoseconds. - Weight::from_ref_time(196_996_194) - // Standard Error: 1_167 - .saturating_add(Weight::from_ref_time(159_092).saturating_mul(x.into())) - // Standard Error: 18_388 - .saturating_add(Weight::from_ref_time(228_320).saturating_mul(y.into())) + // Minimum execution time: 175_374 nanoseconds. + Weight::from_ref_time(148_054_298) + // Standard Error: 9_310 + .saturating_add(Weight::from_ref_time(232_689).saturating_mul(x.into())) + // Standard Error: 146_674 + .saturating_add(Weight::from_ref_time(629_540).saturating_mul(y.into())) .saturating_add(RocksDbWeight::get().reads(23)) .saturating_add(RocksDbWeight::get().writes(13)) } @@ -264,12 +264,12 @@ impl WeightInfo for () { /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn request_withdraw(x: u32, y: u32, ) -> Weight { - // Minimum execution time: 115_236 nanoseconds. - Weight::from_ref_time(118_905_620) - // Standard Error: 631 - .saturating_add(Weight::from_ref_time(95_494).saturating_mul(x.into())) - // Standard Error: 9_946 - .saturating_add(Weight::from_ref_time(160_283).saturating_mul(y.into())) + // Minimum execution time: 114_748 nanoseconds. + Weight::from_ref_time(118_941_924) + // Standard Error: 11_664 + .saturating_add(Weight::from_ref_time(156_400).saturating_mul(x.into())) + // Standard Error: 183_753 + .saturating_add(Weight::from_ref_time(90_652).saturating_mul(y.into())) .saturating_add(RocksDbWeight::get().reads(17)) .saturating_add(RocksDbWeight::get().writes(9)) } @@ -279,10 +279,10 @@ impl WeightInfo for () { // Storage: Lottery TotalUnclaimedWinnings (r:1 w:1) /// The range of component `y` is `[0, 63]`. fn claim_my_winnings(y: u32, ) -> Weight { - // Minimum execution time: 53_702 nanoseconds. - Weight::from_ref_time(56_592_923) - // Standard Error: 2_539 - .saturating_add(Weight::from_ref_time(142_800).saturating_mul(y.into())) + // Minimum execution time: 52_765 nanoseconds. + Weight::from_ref_time(55_740_117) + // Standard Error: 2_939 + .saturating_add(Weight::from_ref_time(148_756).saturating_mul(y.into())) .saturating_add(RocksDbWeight::get().reads(5)) .saturating_add(RocksDbWeight::get().writes(4)) } @@ -294,16 +294,16 @@ impl WeightInfo for () { // Storage: Lottery GasReserve (r:1 w:0) // Storage: Scheduler Agenda (r:1 w:1) fn start_lottery() -> Weight { - // Minimum execution time: 87_273 nanoseconds. - Weight::from_ref_time(88_247_000) + // Minimum execution time: 44_535 nanoseconds. + Weight::from_ref_time(46_463_000) .saturating_add(RocksDbWeight::get().reads(7)) .saturating_add(RocksDbWeight::get().writes(2)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn stop_lottery() -> Weight { - // Minimum execution time: 30_336 nanoseconds. - Weight::from_ref_time(40_791_000) + // Minimum execution time: 30_873 nanoseconds. + Weight::from_ref_time(31_365_000) .saturating_add(RocksDbWeight::get().reads(2)) .saturating_add(RocksDbWeight::get().writes(2)) } @@ -321,42 +321,42 @@ impl WeightInfo for () { /// The range of component `x` is `[0, 1000]`. /// The range of component `y` is `[0, 63]`. fn draw_lottery(x: u32, y: u32, ) -> Weight { - // Minimum execution time: 78_712 nanoseconds. - Weight::from_ref_time(79_416_000) - // Standard Error: 83_399 - .saturating_add(Weight::from_ref_time(939_914).saturating_mul(x.into())) - // Standard Error: 1_326_874 - .saturating_add(Weight::from_ref_time(16_139_385).saturating_mul(y.into())) - .saturating_add(RocksDbWeight::get().reads(12)) - .saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(y.into()))) + // Minimum execution time: 78_448 nanoseconds. + Weight::from_ref_time(79_450_000) + // Standard Error: 78_175 + .saturating_add(Weight::from_ref_time(3_908_724).saturating_mul(x.into())) + // Standard Error: 1_243_759 + .saturating_add(Weight::from_ref_time(759_212).saturating_mul(y.into())) + .saturating_add(RocksDbWeight::get().reads(4)) + .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(x.into()))) .saturating_add(RocksDbWeight::get().writes(2)) } // Storage: Lottery UnstakingCollators (r:1 w:0) // Storage: Lottery WithdrawalRequestQueue (r:1 w:0) // Storage: Lottery UnlockedUnstakingFunds (r:1 w:0) fn process_matured_withdrawals() -> Weight { - // Minimum execution time: 13_732 nanoseconds. - Weight::from_ref_time(13_974_000) + // Minimum execution time: 39_644 nanoseconds. + Weight::from_ref_time(40_370_000) .saturating_add(RocksDbWeight::get().reads(3)) } // Storage: Lottery MinWithdraw (r:1 w:0) // Storage: Lottery MinDeposit (r:0 w:1) fn set_min_deposit() -> Weight { - // Minimum execution time: 8_864 nanoseconds. - Weight::from_ref_time(9_049_000) + // Minimum execution time: 17_539 nanoseconds. + Weight::from_ref_time(17_935_000) .saturating_add(RocksDbWeight::get().reads(1)) .saturating_add(RocksDbWeight::get().writes(1)) } // Storage: Lottery MinWithdraw (r:0 w:1) fn set_min_withdraw() -> Weight { - // Minimum execution time: 4_706 nanoseconds. - Weight::from_ref_time(4_928_000) + // Minimum execution time: 9_210 nanoseconds. + Weight::from_ref_time(9_540_000) .saturating_add(RocksDbWeight::get().writes(1)) } // Storage: Lottery GasReserve (r:0 w:1) fn set_gas_reserve() -> Weight { - // Minimum execution time: 13_971 nanoseconds. - Weight::from_ref_time(14_447_000) + // Minimum execution time: 6_272 nanoseconds. + Weight::from_ref_time(6_477_000) .saturating_add(RocksDbWeight::get().writes(1)) } } diff --git a/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs index bdb80747b..ffe9eba67 100644 --- a/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs +++ b/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs @@ -17,8 +17,8 @@ //! Autogenerated weights for `pallet_xcm_benchmarks::fungible` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-07-07, STEPS: `50`, REPEAT: 40, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `ip-172-31-87-232`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz` +//! DATE: 2023-07-14, STEPS: `50`, REPEAT: 40, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `ip-172-31-91-234`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("/home/runner/runners/2.280.1/_work/Manta/Manta/tests/data/fork.json"), DB CACHE: 1024 // Executed Command: @@ -50,7 +50,7 @@ impl WeightInfo { // Storage: AssetManager LocationAssetId (r:1 w:0) // Storage: System Account (r:1 w:1) pub(crate) fn withdraw_asset() -> Weight { - Weight::from_ref_time(46_244_000) + Weight::from_ref_time(46_165_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -58,7 +58,7 @@ impl WeightInfo { // Storage: AssetManager LocationAssetId (r:1 w:0) // Storage: System Account (r:2 w:2) pub(crate) fn transfer_asset() -> Weight { - Weight::from_ref_time(58_459_000) + Weight::from_ref_time(58_508_000) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -71,18 +71,18 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn transfer_reserve_asset() -> Weight { - Weight::from_ref_time(76_603_000) + Weight::from_ref_time(76_196_000) .saturating_add(T::DbWeight::get().reads(9)) .saturating_add(T::DbWeight::get().writes(4)) } pub(crate) fn reserve_asset_deposited() -> Weight { - Weight::from_ref_time(2_108_000) + Weight::from_ref_time(1_747_000) } // Storage: ParachainInfo ParachainId (r:1 w:0) // Storage: AssetManager LocationAssetId (r:1 w:0) // Storage: System Account (r:1 w:1) pub(crate) fn deposit_asset() -> Weight { - Weight::from_ref_time(45_276_000) + Weight::from_ref_time(45_637_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -95,7 +95,7 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn deposit_reserve_asset() -> Weight { - Weight::from_ref_time(66_258_000) + Weight::from_ref_time(68_746_000) .saturating_add(T::DbWeight::get().reads(8)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -106,7 +106,7 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn initiate_teleport() -> Weight { - Weight::from_ref_time(30_181_000) + Weight::from_ref_time(28_369_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(2)) } diff --git a/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_generic.rs index 6d80195ee..8ebd81da8 100644 --- a/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_generic.rs +++ b/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_generic.rs @@ -17,8 +17,8 @@ //! Autogenerated weights for `pallet_xcm_benchmarks::generic` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-07-07, STEPS: `50`, REPEAT: 40, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `ip-172-31-87-232`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz` +//! DATE: 2023-07-14, STEPS: `50`, REPEAT: 40, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `ip-172-31-91-234`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("/home/runner/runners/2.280.1/_work/Manta/Manta/tests/data/fork.json"), DB CACHE: 1024 // Executed Command: @@ -53,38 +53,38 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn query_holding() -> Weight { - Weight::from_ref_time(1_095_842_000) + Weight::from_ref_time(866_984_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(2)) } pub(crate) fn buy_execution() -> Weight { - Weight::from_ref_time(4_778_000) + Weight::from_ref_time(4_905_000) } // Storage: PolkadotXcm Queries (r:1 w:0) pub(crate) fn query_response() -> Weight { - Weight::from_ref_time(15_073_000) + Weight::from_ref_time(15_050_000) .saturating_add(T::DbWeight::get().reads(1)) } pub(crate) fn transact() -> Weight { - Weight::from_ref_time(17_860_000) + Weight::from_ref_time(17_399_000) } pub(crate) fn refund_surplus() -> Weight { - Weight::from_ref_time(4_666_000) + Weight::from_ref_time(4_856_000) } pub(crate) fn set_error_handler() -> Weight { - Weight::from_ref_time(1_046_000) + Weight::from_ref_time(934_000) } pub(crate) fn set_appendix() -> Weight { - Weight::from_ref_time(1_075_000) + Weight::from_ref_time(942_000) } pub(crate) fn clear_error() -> Weight { - Weight::from_ref_time(1_112_000) + Weight::from_ref_time(2_673_000) } pub(crate) fn descend_origin() -> Weight { - Weight::from_ref_time(2_806_000) + Weight::from_ref_time(6_850_000) } pub(crate) fn clear_origin() -> Weight { - Weight::from_ref_time(3_191_000) + Weight::from_ref_time(1_173_000) } // Storage: PolkadotXcm SupportedVersion (r:1 w:0) // Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1) @@ -92,18 +92,18 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn report_error() -> Weight { - Weight::from_ref_time(26_556_000) + Weight::from_ref_time(18_959_000) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: PolkadotXcm AssetTraps (r:1 w:1) pub(crate) fn claim_asset() -> Weight { - Weight::from_ref_time(24_965_000) + Weight::from_ref_time(19_238_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } pub(crate) fn trap() -> Weight { - Weight::from_ref_time(1_029_000) + Weight::from_ref_time(894_000) } // Storage: PolkadotXcm VersionNotifyTargets (r:1 w:1) // Storage: PolkadotXcm SupportedVersion (r:1 w:0) @@ -112,13 +112,13 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn subscribe_version() -> Weight { - Weight::from_ref_time(17_925_000) + Weight::from_ref_time(18_502_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: PolkadotXcm VersionNotifyTargets (r:0 w:1) pub(crate) fn unsubscribe_version() -> Weight { - Weight::from_ref_time(2_842_000) + Weight::from_ref_time(2_759_000) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: ParachainInfo ParachainId (r:1 w:0) @@ -128,7 +128,7 @@ impl WeightInfo { // Storage: ParachainSystem HostConfiguration (r:1 w:0) // Storage: ParachainSystem PendingUpwardMessages (r:1 w:1) pub(crate) fn initiate_reserve_withdraw() -> Weight { - Weight::from_ref_time(1_338_369_000) + Weight::from_ref_time(1_162_215_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(2)) } diff --git a/runtime/manta/src/xcm_config.rs b/runtime/manta/src/xcm_config.rs index d03b2cc08..34625e501 100644 --- a/runtime/manta/src/xcm_config.rs +++ b/runtime/manta/src/xcm_config.rs @@ -48,8 +48,8 @@ use xcm_builder::{ AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, ConvertedConcreteAssetId, EnsureXcmOrigin, FixedRateOfFungible, LocationInverter, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountId32AsNative, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, - WeightInfoBounds, + SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, + TakeWeightCredit, WeightInfoBounds, }; use xcm_executor::{traits::JustTry, Config, XcmExecutor}; @@ -234,8 +234,8 @@ impl Config for XcmExecutorConfig { type SubscriptionService = PolkadotXcm; } -/// No one is allowed to dispatch XCM sends/executions. -pub type LocalOriginToLocation = (); +/// Converts a Signed Local Origin into a MultiLocation +pub type LocalOriginToLocation = SignedToAccountId32; /// The means for routing XCM messages which are not for local execution into the right message /// queues. @@ -253,9 +253,8 @@ impl pallet_xcm::Config for Runtime { type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; - type ExecuteXcmOrigin = EnsureXcmOrigin; + type ExecuteXcmOrigin = EnsureXcmOrigin; /// This means that no location will pass XcmExecuteFilter, so a dispatched `execute` message will be filtered. - /// This shouldn't be reachable since `LocalOriginToLocation = ();`, but let's be on the safe side. type XcmExecuteFilter = Nothing; type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Nothing;