mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 12:51:02 +00:00
XCM v3 (#4097)
* cargo fmt * Create benchmarks for XCM instructions introduced in v3 (#4564) * Create benchmarks for BurnAsset and ExpectAsset * Add benchmarks for ExpectOrigin and ExpectError * Add benchmarks for QueryPallet and ExpectPallet * Add benchmarks for ReportTransactStatus and ClearTransactStatus * cargo fmt * Use AllPalletsWithSystem in mocks * Update XCM generic benchmarks for westend * Remove default impls for some XCM weight functions * Fix compilation error * Add weight_args helper attribute * Remove manually written XcmWeightInfo * Parse trailing comma * Revert "Add weight_args helper attribute" This reverts commit 3b7c47a6182e1b9227036c38b406d494c3fcf6fd. * Fixes * Fixes * XCM v3: Introduce querier field into `QueryReponse` (#4732) * Introduce querier field into QueryReponse * Convert &Option<MultiLocation> to Option<&MultiLocation> &Option<T> is almost always never quite useful, most of the time it still gets converted to an Option<&T> via `as_ref`, so we should simply make functions that accept Option<&T> instead. * Fix tests * cargo fmt * Fix benchmarks * Appease spellchecker * Fix test * Fix tests * Fix test * Fix mock * Fixes * Fix tests * Add test for response queriers * Update xcm/pallet-xcm/src/lib.rs * Test for non-existence of querier Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Fixes * Fixes * Add `starts_with` function to `MultiLocation` and `Junctions` (#4835) * add matches_prefix function to MultiLocation and Junctions * rename matches_prefix to starts_with * remove unnecessary main in doc comment Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Make use of starts_with in match_and_split Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * XCM v3: Bridge infrastructure (#4681) * XCM bridge infrastructure * Missing bit of cherry-pick * Revamped XCM proc macros; new NetworkIds * Fixes * Formatting * ExportMessage instruction and config type * Add MessageExporter definitions * Formatting * Missing files * Fixes * Initial bridging config API * Allow for two-stage XCM execution * Update xcm/src/v3/mod.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * XCM crate building again * Initial bridging primitive * Docs * Docs * More work * More work * Merge branch 'gav-xcm-v3' into gav-xcm-v3-bridging * Make build * WithComputedOrigin and SovereignPaidRemoteExporter * Remove TODOs * Slim bridge API and tests. * Fixes * More work * First bridge test passing * Formatting * Another test * Next round of bridging tests * Repot tests * Cleanups * Paid bridging * Formatting * Tests * Spelling * Formatting * Fees and refactoring * Fixes * Formatting * Refactor SendXcm to become two-phase * Fix tests * Refactoring of SendXcm and ExportXcm complete * Formatting * Rename CannotReachDestination -> NotApplicable * Remove XCM v0 * Minor grumbles * Formatting * Formatting * Fixes * Fixes * Cleanup XCM config * Fee handling * Fixes * Formatting * Fixes * Bump Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Bump Substrate * XCM v3: `ExchangeAsset` and Remote-locking (#4945) * Asset Exchange and Locks * Make sure XCM typers impl MaxEncodedLen * Basic implementation for locks * Bump Substrate * Missing files * Use new API * Introduce instruction * Big refactor * Docs * Remove deprecated struct * Remove deprecated struct * Repot XCM builder tests * ExchangeAsset test * Exchange tests * Locking tests * Locking tests * Fixes and tests * Fixes * Formatting * Spelling * Add simulator test for remote locking * Fix tests * Bump * XCM v3: Support for non-fungibles (#4950) * NFT support and a test * New files. * Integration tests for sending NFTs * Formatting * Broken Cargo features * Use 2021 edition * Fixes * Formatting * Formatting * Update xcm/xcm-builder/src/asset_conversion.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Update xcm/xcm-builder/src/nonfungibles_adapter.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Update xcm/xcm-executor/src/lib.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Fixes * Fixes * Fixes * Formatting * Fixes Co-authored-by: Bastian Köcher <info@kchr.de> Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * XCM v3: Context & ID hash (#4756) * send_xcm returns message hash * cargo fmt * Create topic register and instructions * Fix weights * Use tabs * Sketch out XcmContext * Fix doc test * Add the XCM context as a parameter to executor trait fns * Fixes * Add XcmContext parameter * Revert adding context as an arg to SendXcm trait methods * Revert adding context argument to ConvertOrigin trait methods * cargo fmt * Do not change the API of XcmExecutor::execute * Fixes * Fixes * Fixes * Fixes * Remove convenience method * Fixes * Fixes * cargo fmt * Fixes * Add benchmarks for XCM topic instructions * cargo run --quiet --profile=production --features=runtime-benchmarks -- benchmark --chain=westend-dev --steps=50 --repeat=20 --pallet=pallet_xcm_benchmarks::generic --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --template=./xcm/pallet-xcm-benchmarks/template.hbs --output=./runtime/westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs * Remove context argument on FilterAssetLocation * Fixes * Remove unused import * Fixes * Fixes * Fixes * Accept XCM hash parameter in ExecuteXcm trait methods * cargo fmt * Properly enable sp-io/std * Fixes * default-features = false * Fixes * Fixes * Fixes * Make XcmContext optional in withdraw_asset * Fixes * Fixes * Fixes * Modify tests to check for the correct XCM hash * Small refactor * cargo fmt * Check for expected hash in xcm-builder unit tests * Add doc comment for the optionality of the XCM context in withdraw_asset * Update xcm/src/v3/traits.rs * Update xcm/src/v3/traits.rs * Store XcmContext and avoid rebuilding * Use ref for XcmContext * Formatting * Fix incorrect hash CC @KiChjang * Refactor and make clear fake hashes * Fixes * Fixes * Fixes * Fix broken hashing * Docs * Fixes * Fixes * Fixes * Formatting * Fixes * Fixes * Fixes * Remove unknowable hash * Formatting * Use message hash for greater identifiability * Formatting * Fixes * Formatting Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> Co-authored-by: Parity Bot <admin@parity.io> * Fixes * Fixes * Fixes * Fixes * Formatting * Fixes * Formatting * Fixes * Fixes * Formatting * Formatting * Remove horrible names * Bump * Remove InvertLocation trait (#5092) * Remove InvertLocation trait * Remove unneeded functions * Formatting * Fixes * Remove XCMv1 (#5094) * Remove XCMv1 * Remove XCMv1 * Formatting * Fixes * Fixes * Formatting * derive serialize/deserialize for xcm primitives (#5036) * derive serialize/deserialize for xcm primitives * derive serialize/deserialize for xcm primitives * update v3 * update v2 Co-authored-by: Gav Wood <gavin@parity.io> * Update lock * Fixes * Add benchmarks for the ExchangeAsset instruction * `AliasOrigin` instruction stub (#5122) * AliasOrigin instruction stub * Fixes * Fixes * Update substrate * Fixes * Ensure same array length before using copy_from_slice * Fixes * Add benchmarks for the UniversalOrigin instruction * Remove unused import * Remove unused import * Add benchmarks for SetFeesMode instruction * Add benchmarks for asset (un)locking instructions * Leave AliasOrigin unbenchmarked * Fixes after merge * cargo fmt * Fixes * Fixes * Set TrustedReserves to None on both Kusama and Westend * Remove extraneous reserve_asset_deposited benchmark * Fix universal_origin benchmark * cargo run --quiet --profile=production --features=runtime-benchmarks -- benchmark pallet --chain=westend-dev --steps=50 --repeat=20 --pallet=pallet_xcm_benchmarks::generic --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --template=./xcm/pallet-xcm-benchmarks/template.hbs --output=./runtime/westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs * Don't rely on skipped benchmark functions * Fixes * cargo run --quiet --profile=production --features=runtime-benchmarks -- benchmark pallet --chain=kusama-dev --steps=50 --repeat=20 --pallet=pallet_xcm_benchmarks::generic --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --template=./xcm/pallet-xcm-benchmarks/template.hbs --output=./runtime/kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs * Fix unused variables * Fixes * Spelling * Fixes * Fix codec index of VersionedXcm * Allows to customize how calls are dispatched from XCM (#5657) * CallDispatcher trait * fmt * unused import * fix test-runtime * remove JustDispatch type * fix typo in test-runtime * missing CallDispatcher * more missing CallDispatcher * Update comment `NoteAssetLocked` -> `NoteUnlockable` * Fixes * Fixes * Adjust MultiAssets weights based on new wild card variants * Fixes * Fixes * Fixes * Fixes * Fixes * Some late fixes for XCMv3 (#5237) * Maximise chances that trapped assets can be reclaimed * Do origin check as part of ExportMessage for security * Formatting * Fixes * Cleanup export XCM APIs * Formatting * Update xcm/src/v3/junctions.rs * UnpaidExecution instruction and associated barrier. * Tighten barriers (ClearOrigin/QueryResponse) * Allow only 1 ClearOrigin instruction in AllowTopLevelPaidExecutionFrom * Bi-directional teleport accounting * Revert other fix * Build fixes] * Tests build * Benchmark fixes Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Update Substrate * Re-export `pub` stuff from universal_exports.rs + removed unecessary clone (#6145) * Re-export `pub` stuff from universal_exports.rs * Removed unnecessary clone * Use 2D weights in XCM v3 (#6134) * Depend upon sp-core instead of sp-runtime * Make sp-io a dev-dependency * Use 2D weights in XCM v3 * cargo fmt * Add XCM pallet migration to runtimes * Use from_parts * cargo fmt * Fixes * cargo fmt * Remove XCMWeight import * Fixes * Fixes * Fixes * Fixes * Use translate in migration * Increase max upward message size in tests * Fix doc test * Remove most uses of from_ref_time * cargo fmt * Fixes * Fixes * Add extrinsic benchmarking to XCM pallet * cargo fmt * Fixes * Use old syntax * cargo fmt * Fixes * Remove hardcoded weights * Add XCM pallet to benchmarks * Use successful origin * Fix weird type parameter compilation issue * Fixes * ".git/.scripts/bench-bot.sh" runtime westend-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime rococo-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime polkadot-dev pallet_xcm * Use benchmarked XCM pallet weights * Fixes * Fixes * Use override instead of skip * Fixes * Fixes * Fixes * Fixes * ".git/.scripts/bench-bot.sh" runtime polkadot-dev pallet_xcm * Fixes * ".git/.scripts/bench-bot.sh" runtime polkadot-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime westend-dev pallet_xcm Co-authored-by: command-bot <> * Replace Weight::MAX with 100b weight units * Add test to ensure all_gte in barriers is correct * Update xcm/src/v3/junction.rs Co-authored-by: asynchronous rob <rphmeier@gmail.com> * Add more weight tests * cargo fmt * Create thread_local in XCM executor to limit recursion depth (#6304) * Create thread_local in XCM executor to limit recursion depth * Add unit test for recursion limit * Fix statefulness in tests * Remove panic * Use defer and environmental macro * Fix the implementation * Use nicer interface * Change ThisNetwork to AnyNetwork * Move recursion check up to top level * cargo fmt * Update comment Co-authored-by: Bastian Köcher <info@kchr.de> * Add upper limit on the number of overweight messages in the queue (#6298) * Add upper limit on the number of ovwerweight messages in the queue * Add newline * Introduce whitelist for Transact and limit UMP processing to 10 messages per block (#6280) * Add SafeCallFilter to XcmConfig * Limit UMP to receive 10 messages every block * Place 10 message limit on processing instead of receiving * Always increment the message_processed count whenever a message is processed * Add as_derivative to the Transact whitelist * cargo fmt * Fixes * Update xcm/xcm-builder/src/universal_exports.rs Co-authored-by: Branislav Kontur <bkontur@gmail.com> * Fixes * Fixes * Remove topic register and instead use the topic field in XcmContext * Derive some common traits for DispatchBlobError * Fixes * cargo fmt * Fixes * Fixes * Fix comments * Fixes * Introduce WithOriginFilter and apply it as the CallDispatcher for runtimes * Fixes * Appease clippy and fixes * Fixes * Fix more clippy issues * Fixes * ".git/.scripts/bench-bot.sh" runtime polkadot-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime westend-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime westend-dev pallet_xcm * Add benchmark function for ExportMessage * Fix comment * Add upper limit to DownwardMessageQueues size * Add max size check for queue in can_queue_downward_message * Fixes * Make Transact runtime call configurable * Return Weight::MAX when there is no successful send XCM origin * Update substrate * Fixes * Fixes * Remove ExportMessage benchmark * Remove assertion on Transact instruction benchmark * Make reachable destination configurable in XCM pallet benchmarks * Fixes * Fixes * Remove cfg attribute in fuzzer * Fixes * Remove cfg attribute for XCM pallet in test runtime * Fixes * Use ReachableDest where possible * Fixes * Add benchmark for UnpaidExecution * Update substrate * Ensure benchmark functions pass filters * Add runtime-benchmarks feature to fuzzer * Ensure FixedRateOfFungible accounts for proof size weights * cargo fmt * Whitelist remark_with_event when runtime-benchmarks feature is enabled * Use remark_with_event for Transact benchmarks * Fix Cargo.lock * Allow up to 3 DescendOrigin instructions before UnpaidExecution * cargo fmt * Edit code comment * Check check_origin for unpaid execution privilege * Fixes * Small nits for xcm-v3 (#6408) * Add possibility to skip benchmark for export_message * ".git/.scripts/bench-bot.sh" xcm westend-dev pallet_xcm_benchmarks::generic * Revert * ".git/.scripts/bench-bot.sh" xcm westend-dev pallet_xcm_benchmarks::generic * Add HaulBlobError to `fn haul_blob` * ".git/.scripts/bench-bot.sh" xcm westend-dev pallet_xcm_benchmarks::generic Co-authored-by: command-bot <> * Revert changes to UnpaidExecution * Change AllowUnpaidExecutionFrom to be explicit * Fix log text * cargo fmt * Add benchmarks for XCM pallet version migration (#6448) * Add benchmarks for XCM pallet version migration * cargo fmt * Fixes * Fixes * Fixes * ".git/.scripts/bench-bot.sh" runtime westend-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime rococo-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime polkadot-dev pallet_xcm * Fix benchmarks * Fix benchmarks * ".git/.scripts/bench-bot.sh" runtime westend-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime rococo-dev pallet_xcm * ".git/.scripts/bench-bot.sh" runtime polkadot-dev pallet_xcm Co-authored-by: command-bot <> * Merge remote-tracking branch 'origin/master' into gav-xcm-v3 * Fixes * Fix comments (#6470) * Specify Ethereum networks by their chain id (#6286) Co-authored-by: Squirrel <gilescope@gmail.com> * Use for Kusama * Use WithComputedOrigin for Polkadot, Rococo and Westend * Update lock * Fix warning * Update xcm/pallet-xcm/src/tests.rs Co-authored-by: Squirrel <gilescope@gmail.com> * Update runtime/parachains/src/ump/migration.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update xcm/pallet-xcm/src/migration.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fixes * cargo fmt * Typo * Update xcm/src/v3/mod.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Docs * Docs * Docs * Docs * Docs * Update xcm/src/v3/multiasset.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add tests for MultiAssets::from_sorted_and_deduplicated * Fail gracefully when same instance NFTs are detected during push * Update Substrate to fix benchmarks * Apply suggestions from code review * Update runtime/kusama/src/xcm_config.rs * Rename arguments * Attempt to fix benchmark * ".git/.scripts/commands/bench/bench.sh" runtime polkadot-dev runtime_parachains::ump * Use actual weights for UMP pallet in Polkadot * ".git/.scripts/commands/bench/bench.sh" runtime kusama-dev runtime_parachains::ump * ".git/.scripts/commands/bench/bench.sh" runtime westend-dev runtime_parachains::ump * ".git/.scripts/commands/bench/bench.sh" runtime rococo-dev runtime_parachains::ump Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> Co-authored-by: Alexander Popiak <alexander.popiak@parity.io> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: Bastian Köcher <info@kchr.de> Co-authored-by: Parity Bot <admin@parity.io> Co-authored-by: stanly-johnson <stanlyjohnson@outlook.com> Co-authored-by: nanocryk <6422796+nanocryk@users.noreply.github.com> Co-authored-by: Branislav Kontur <bkontur@gmail.com> Co-authored-by: asynchronous rob <rphmeier@gmail.com> Co-authored-by: command-bot <> Co-authored-by: Vincent Geddes <vincent.geddes@hey.com> Co-authored-by: Squirrel <gilescope@gmail.com> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
Gavin Wood
@@ -20,27 +20,33 @@ use codec::Encode;
|
||||
use frame_benchmarking::{benchmarks, BenchmarkError};
|
||||
use frame_support::dispatch::GetDispatchInfo;
|
||||
use sp_std::vec;
|
||||
use xcm::{latest::prelude::*, DoubleEncoded};
|
||||
use xcm::{
|
||||
latest::{prelude::*, MaybeErrorCode, Weight},
|
||||
DoubleEncoded,
|
||||
};
|
||||
use xcm_executor::{ExecutorError, FeesMode};
|
||||
|
||||
benchmarks! {
|
||||
query_holding {
|
||||
let holding = T::worst_case_holding();
|
||||
report_holding {
|
||||
let holding = T::worst_case_holding(0);
|
||||
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.holding = holding.clone().into();
|
||||
executor.set_holding(holding.clone().into());
|
||||
|
||||
let instruction = Instruction::<XcmCallOf<T>>::QueryHolding {
|
||||
query_id: Default::default(),
|
||||
dest: T::valid_destination()?,
|
||||
let instruction = Instruction::<XcmCallOf<T>>::ReportHolding {
|
||||
response_info: QueryResponseInfo {
|
||||
destination: T::valid_destination()?,
|
||||
query_id: Default::default(),
|
||||
max_weight: Weight::MAX,
|
||||
},
|
||||
// Worst case is looking through all holdings for every asset explicitly.
|
||||
assets: Definite(holding),
|
||||
max_response_weight: u64::MAX,
|
||||
};
|
||||
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
|
||||
} : {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
// The completion of execution above is enough to validate this is completed.
|
||||
}
|
||||
@@ -48,21 +54,21 @@ benchmarks! {
|
||||
// This benchmark does not use any additional orders or instructions. This should be managed
|
||||
// by the `deep` and `shallow` implementation.
|
||||
buy_execution {
|
||||
let holding = T::worst_case_holding().into();
|
||||
let holding = T::worst_case_holding(0).into();
|
||||
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.holding = holding;
|
||||
executor.set_holding(holding);
|
||||
|
||||
let fee_asset = Concrete(Here.into());
|
||||
|
||||
let instruction = Instruction::<XcmCallOf<T>>::BuyExecution {
|
||||
fees: (fee_asset, 100_000_000).into(), // should be something inside of holding
|
||||
fees: (fee_asset, 100_000_000u128).into(), // should be something inside of holding
|
||||
weight_limit: WeightLimit::Unlimited,
|
||||
};
|
||||
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
} : {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
|
||||
}
|
||||
@@ -70,11 +76,12 @@ benchmarks! {
|
||||
query_response {
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
let (query_id, response) = T::worst_case_response();
|
||||
let max_weight = u64::MAX;
|
||||
let instruction = Instruction::QueryResponse { query_id, response, max_weight };
|
||||
let max_weight = Weight::MAX;
|
||||
let querier: Option<MultiLocation> = Some(Here.into());
|
||||
let instruction = Instruction::QueryResponse { query_id, response, max_weight, querier };
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
// The assert above is enough to show this XCM succeeded
|
||||
}
|
||||
@@ -83,43 +90,38 @@ benchmarks! {
|
||||
// and included in the final weight calculation. So this is just the overhead of submitting
|
||||
// a noop call.
|
||||
transact {
|
||||
let origin = T::transact_origin()?;
|
||||
let (origin, noop_call) = T::transact_origin_and_runtime_call()?;
|
||||
let mut executor = new_executor::<T>(origin);
|
||||
let noop_call: <T as Config>::RuntimeCall = frame_system::Call::remark_with_event {
|
||||
remark: Default::default()
|
||||
}.into();
|
||||
let double_encoded_noop_call: DoubleEncoded<_> = noop_call.encode().into();
|
||||
|
||||
let instruction = Instruction::Transact {
|
||||
origin_type: OriginKind::SovereignAccount,
|
||||
require_weight_at_most: noop_call.get_dispatch_info().weight.ref_time(),
|
||||
origin_kind: OriginKind::SovereignAccount,
|
||||
require_weight_at_most: noop_call.get_dispatch_info().weight,
|
||||
call: double_encoded_noop_call,
|
||||
};
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
|
||||
let num_events = frame_system::Pallet::<T>::events().len();
|
||||
}: {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
// TODO make better assertion? #4426
|
||||
let num_events2 = frame_system::Pallet::<T>::events().len();
|
||||
assert_eq!(num_events + 1, num_events2);
|
||||
// TODO Make the assertion configurable?
|
||||
}
|
||||
|
||||
refund_surplus {
|
||||
let holding = T::worst_case_holding().into();
|
||||
let holding = T::worst_case_holding(0).into();
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.holding = holding;
|
||||
executor.total_surplus = 1337;
|
||||
executor.total_refunded = 0;
|
||||
executor.set_holding(holding);
|
||||
executor.set_total_surplus(Weight::from_parts(1337, 1337));
|
||||
executor.set_total_refunded(Weight::zero());
|
||||
|
||||
let instruction = Instruction::<XcmCallOf<T>>::RefundSurplus;
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
} : {
|
||||
let result = executor.execute(xcm)?;
|
||||
let result = executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert_eq!(executor.total_surplus, 1337);
|
||||
assert_eq!(executor.total_refunded, 1337);
|
||||
assert_eq!(executor.total_surplus(), &Weight::from_parts(1337, 1337));
|
||||
assert_eq!(executor.total_refunded(), &Weight::from_parts(1337, 1337));
|
||||
}
|
||||
|
||||
set_error_handler {
|
||||
@@ -127,9 +129,9 @@ benchmarks! {
|
||||
let instruction = Instruction::<XcmCallOf<T>>::SetErrorHandler(Xcm(vec![]));
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
} : {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert_eq!(executor.error_handler, Xcm(vec![]));
|
||||
assert_eq!(executor.error_handler(), &Xcm(vec![]));
|
||||
}
|
||||
|
||||
set_appendix {
|
||||
@@ -138,20 +140,20 @@ benchmarks! {
|
||||
let instruction = Instruction::<XcmCallOf<T>>::SetAppendix(appendix);
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
} : {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert_eq!(executor.appendix, Xcm(vec![]));
|
||||
assert_eq!(executor.appendix(), &Xcm(vec![]));
|
||||
}
|
||||
|
||||
clear_error {
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.error = Some((5u32, XcmError::Overflow));
|
||||
executor.set_error(Some((5u32, XcmError::Overflow)));
|
||||
let instruction = Instruction::<XcmCallOf<T>>::ClearError;
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
} : {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert!(executor.error.is_none())
|
||||
assert!(executor.error().is_none())
|
||||
}
|
||||
|
||||
descend_origin {
|
||||
@@ -160,11 +162,11 @@ benchmarks! {
|
||||
let instruction = Instruction::DescendOrigin(who.clone());
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
} : {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert_eq!(
|
||||
executor.origin,
|
||||
Some(MultiLocation {
|
||||
executor.origin(),
|
||||
&Some(MultiLocation {
|
||||
parents: 0,
|
||||
interior: who,
|
||||
}),
|
||||
@@ -176,22 +178,24 @@ benchmarks! {
|
||||
let instruction = Instruction::ClearOrigin;
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
} : {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert_eq!(executor.origin, None);
|
||||
assert_eq!(executor.origin(), &None);
|
||||
}
|
||||
|
||||
report_error {
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.error = Some((0u32, XcmError::Unimplemented));
|
||||
executor.set_error(Some((0u32, XcmError::Unimplemented)));
|
||||
let query_id = Default::default();
|
||||
let dest = T::valid_destination().map_err(|_| BenchmarkError::Skip)?;
|
||||
let max_response_weight = Default::default();
|
||||
let destination = T::valid_destination().map_err(|_| BenchmarkError::Skip)?;
|
||||
let max_weight = Default::default();
|
||||
|
||||
let instruction = Instruction::ReportError { query_id, dest, max_response_weight };
|
||||
let instruction = Instruction::ReportError(QueryResponseInfo {
|
||||
query_id, destination, max_weight
|
||||
});
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
// the execution succeeding is all we need to verify this xcm was successful
|
||||
}
|
||||
@@ -205,6 +209,11 @@ benchmarks! {
|
||||
<T::XcmConfig as xcm_executor::Config>::AssetTrap::drop_assets(
|
||||
&origin,
|
||||
assets.clone().into(),
|
||||
&XcmContext {
|
||||
origin: Some(origin.clone()),
|
||||
message_hash: [0; 32],
|
||||
topic: None,
|
||||
},
|
||||
);
|
||||
|
||||
// Assets should be in the trap now.
|
||||
@@ -213,9 +222,9 @@ benchmarks! {
|
||||
let instruction = Instruction::ClaimAsset { assets: assets.clone(), ticket };
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
} :{
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert!(executor.holding.ensure_contains(&assets).is_ok());
|
||||
assert!(executor.holding().ensure_contains(&assets).is_ok());
|
||||
}
|
||||
|
||||
trap {
|
||||
@@ -225,14 +234,12 @@ benchmarks! {
|
||||
// In order to access result in the verification below, it needs to be defined here.
|
||||
let mut _result = Ok(());
|
||||
} : {
|
||||
_result = executor.execute(xcm);
|
||||
_result = executor.bench_process(xcm);
|
||||
} verify {
|
||||
match _result {
|
||||
Err(error) if error.xcm_error == XcmError::Trap(10) => {
|
||||
// This is the success condition
|
||||
},
|
||||
_ => Err("xcm trap did not return the expected error")?
|
||||
};
|
||||
assert!(matches!(_result, Err(ExecutorError {
|
||||
xcm_error: XcmError::Trap(10),
|
||||
..
|
||||
})));
|
||||
}
|
||||
|
||||
subscribe_version {
|
||||
@@ -244,7 +251,7 @@ benchmarks! {
|
||||
let instruction = Instruction::SubscribeVersion { query_id, max_response_weight };
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
} : {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert!(<T::XcmConfig as xcm_executor::Config>::SubscriptionService::is_subscribed(&origin));
|
||||
}
|
||||
@@ -252,13 +259,18 @@ benchmarks! {
|
||||
unsubscribe_version {
|
||||
use xcm_executor::traits::VersionChangeNotifier;
|
||||
// First we need to subscribe to notifications.
|
||||
let origin = T::transact_origin()?;
|
||||
let (origin, _) = T::transact_origin_and_runtime_call()?;
|
||||
let query_id = Default::default();
|
||||
let max_response_weight = Default::default();
|
||||
<T::XcmConfig as xcm_executor::Config>::SubscriptionService::start(
|
||||
&origin,
|
||||
query_id,
|
||||
max_response_weight
|
||||
max_response_weight,
|
||||
&XcmContext {
|
||||
origin: Some(origin.clone()),
|
||||
message_hash: [0; 32],
|
||||
topic: None,
|
||||
},
|
||||
).map_err(|_| "Could not start subscription")?;
|
||||
assert!(<T::XcmConfig as xcm_executor::Config>::SubscriptionService::is_subscribed(&origin));
|
||||
|
||||
@@ -266,30 +278,330 @@ benchmarks! {
|
||||
let instruction = Instruction::UnsubscribeVersion;
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
} : {
|
||||
executor.execute(xcm)?;
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert!(!<T::XcmConfig as xcm_executor::Config>::SubscriptionService::is_subscribed(&origin));
|
||||
}
|
||||
|
||||
initiate_reserve_withdraw {
|
||||
let holding = T::worst_case_holding();
|
||||
let holding = T::worst_case_holding(1);
|
||||
let assets_filter = MultiAssetFilter::Definite(holding.clone());
|
||||
let reserve = T::valid_destination().map_err(|_| BenchmarkError::Skip)?;
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.holding = holding.into();
|
||||
executor.set_holding(holding.into());
|
||||
let instruction = Instruction::InitiateReserveWithdraw { assets: assets_filter, reserve, xcm: Xcm(vec![]) };
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}:{
|
||||
executor.execute(xcm)?;
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
// The execute completing successfully is as good as we can check.
|
||||
// TODO: Potentially add new trait to XcmSender to detect a queued outgoing message. #4426
|
||||
}
|
||||
|
||||
burn_asset {
|
||||
let holding = T::worst_case_holding(0);
|
||||
let assets = holding.clone();
|
||||
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.set_holding(holding.into());
|
||||
|
||||
let instruction = Instruction::BurnAsset(assets.into());
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert!(executor.holding().is_empty());
|
||||
}
|
||||
|
||||
expect_asset {
|
||||
let holding = T::worst_case_holding(0);
|
||||
let assets = holding.clone();
|
||||
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.set_holding(holding.into());
|
||||
|
||||
let instruction = Instruction::ExpectAsset(assets.into());
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
// `execute` completing successfully is as good as we can check.
|
||||
}
|
||||
|
||||
expect_origin {
|
||||
let expected_origin = Parent.into();
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
|
||||
let instruction = Instruction::ExpectOrigin(Some(expected_origin));
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
let mut _result = Ok(());
|
||||
}: {
|
||||
_result = executor.bench_process(xcm);
|
||||
} verify {
|
||||
assert!(matches!(_result, Err(ExecutorError {
|
||||
xcm_error: XcmError::ExpectationFalse,
|
||||
..
|
||||
})));
|
||||
}
|
||||
|
||||
expect_error {
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.set_error(Some((3u32, XcmError::Overflow)));
|
||||
|
||||
let instruction = Instruction::ExpectError(None);
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
let mut _result = Ok(());
|
||||
}: {
|
||||
_result = executor.bench_process(xcm);
|
||||
} verify {
|
||||
assert!(matches!(_result, Err(ExecutorError {
|
||||
xcm_error: XcmError::ExpectationFalse,
|
||||
..
|
||||
})));
|
||||
}
|
||||
|
||||
query_pallet {
|
||||
let query_id = Default::default();
|
||||
let destination = T::valid_destination().map_err(|_| BenchmarkError::Skip)?;
|
||||
let max_weight = Default::default();
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
|
||||
let instruction = Instruction::QueryPallet {
|
||||
module_name: b"frame_system".to_vec(),
|
||||
response_info: QueryResponseInfo { destination, query_id, max_weight },
|
||||
};
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
// TODO: Potentially add new trait to XcmSender to detect a queued outgoing message. #4426
|
||||
}
|
||||
|
||||
expect_pallet {
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
|
||||
let instruction = Instruction::ExpectPallet {
|
||||
index: 0,
|
||||
name: b"System".to_vec(),
|
||||
module_name: b"frame_system".to_vec(),
|
||||
crate_major: 4,
|
||||
min_crate_minor: 0,
|
||||
};
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
// the execution succeeding is all we need to verify this xcm was successful
|
||||
}
|
||||
|
||||
report_transact_status {
|
||||
let query_id = Default::default();
|
||||
let destination = T::valid_destination().map_err(|_| BenchmarkError::Skip)?;
|
||||
let max_weight = Default::default();
|
||||
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.set_transact_status(b"MyError".to_vec().into());
|
||||
|
||||
let instruction = Instruction::ReportTransactStatus(QueryResponseInfo {
|
||||
query_id,
|
||||
destination,
|
||||
max_weight,
|
||||
});
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
// TODO: Potentially add new trait to XcmSender to detect a queued outgoing message. #4426
|
||||
}
|
||||
|
||||
clear_transact_status {
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.set_transact_status(MaybeErrorCode::Error(b"MyError".to_vec()));
|
||||
|
||||
let instruction = Instruction::ClearTransactStatus;
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert_eq!(executor.transact_status(), &MaybeErrorCode::Success);
|
||||
}
|
||||
|
||||
set_topic {
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
|
||||
let instruction = Instruction::SetTopic([1; 32]);
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert_eq!(executor.topic(), &Some([1; 32]));
|
||||
}
|
||||
|
||||
clear_topic {
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.set_topic(Some([2; 32]));
|
||||
|
||||
let instruction = Instruction::ClearTopic;
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert_eq!(executor.topic(), &None);
|
||||
}
|
||||
|
||||
exchange_asset {
|
||||
let (give, want) = T::worst_case_asset_exchange().map_err(|_| BenchmarkError::Skip)?;
|
||||
let assets = give.clone();
|
||||
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.set_holding(give.into());
|
||||
let instruction = Instruction::ExchangeAsset {
|
||||
give: assets.into(),
|
||||
want: want.clone(),
|
||||
maximal: true,
|
||||
};
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert_eq!(executor.holding(), &want.into());
|
||||
}
|
||||
|
||||
universal_origin {
|
||||
let alias = T::universal_alias().map_err(|_| BenchmarkError::Skip)?;
|
||||
|
||||
let mut executor = new_executor::<T>(Here.into_location());
|
||||
|
||||
let instruction = Instruction::UniversalOrigin(alias.clone());
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
use frame_support::traits::Get;
|
||||
let universal_location = <T::XcmConfig as xcm_executor::Config>::UniversalLocation::get();
|
||||
assert_eq!(executor.origin(), &Some(X1(alias).relative_to(&universal_location)));
|
||||
}
|
||||
|
||||
set_fees_mode {
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.set_fees_mode(FeesMode { jit_withdraw: false });
|
||||
|
||||
let instruction = Instruction::SetFeesMode { jit_withdraw: true };
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
assert_eq!(executor.fees_mode(), &FeesMode { jit_withdraw: true });
|
||||
}
|
||||
|
||||
lock_asset {
|
||||
let (unlocker, owner, asset) = T::unlockable_asset()?;
|
||||
|
||||
let mut executor = new_executor::<T>(owner);
|
||||
executor.set_holding(asset.clone().into());
|
||||
|
||||
let instruction = Instruction::LockAsset { asset, unlocker };
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
// TODO: Potentially add new trait to XcmSender to detect a queued outgoing message. #4426
|
||||
}
|
||||
|
||||
unlock_asset {
|
||||
use xcm_executor::traits::{AssetLock, Enact};
|
||||
|
||||
let (unlocker, owner, asset) = T::unlockable_asset()?;
|
||||
|
||||
let mut executor = new_executor::<T>(unlocker.clone());
|
||||
|
||||
// We first place the asset in lock first...
|
||||
<T::XcmConfig as xcm_executor::Config>::AssetLocker::prepare_lock(
|
||||
unlocker,
|
||||
asset.clone(),
|
||||
owner.clone(),
|
||||
)
|
||||
.map_err(|_| BenchmarkError::Skip)?
|
||||
.enact()
|
||||
.map_err(|_| BenchmarkError::Skip)?;
|
||||
|
||||
// ... then unlock them with the UnlockAsset instruction.
|
||||
let instruction = Instruction::UnlockAsset { asset, target: owner };
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
|
||||
}
|
||||
|
||||
note_unlockable {
|
||||
use xcm_executor::traits::{AssetLock, Enact};
|
||||
|
||||
let (unlocker, owner, asset) = T::unlockable_asset()?;
|
||||
|
||||
let mut executor = new_executor::<T>(unlocker.clone());
|
||||
|
||||
// We first place the asset in lock first...
|
||||
<T::XcmConfig as xcm_executor::Config>::AssetLocker::prepare_lock(
|
||||
unlocker,
|
||||
asset.clone(),
|
||||
owner.clone(),
|
||||
)
|
||||
.map_err(|_| BenchmarkError::Skip)?
|
||||
.enact()
|
||||
.map_err(|_| BenchmarkError::Skip)?;
|
||||
|
||||
// ... then note them as unlockable with the NoteUnlockable instruction.
|
||||
let instruction = Instruction::NoteUnlockable { asset, owner };
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
|
||||
}
|
||||
|
||||
request_unlock {
|
||||
use xcm_executor::traits::{AssetLock, Enact};
|
||||
|
||||
let (locker, owner, asset) = T::unlockable_asset()?;
|
||||
|
||||
// We first place the asset in lock first...
|
||||
<T::XcmConfig as xcm_executor::Config>::AssetLocker::prepare_lock(
|
||||
locker.clone(),
|
||||
asset.clone(),
|
||||
owner.clone(),
|
||||
)
|
||||
.map_err(|_| BenchmarkError::Skip)?
|
||||
.enact()
|
||||
.map_err(|_| BenchmarkError::Skip)?;
|
||||
|
||||
// ... then request for an unlock with the RequestUnlock instruction.
|
||||
let mut executor = new_executor::<T>(owner);
|
||||
let instruction = Instruction::RequestUnlock { asset, locker };
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
} verify {
|
||||
// TODO: Potentially add new trait to XcmSender to detect a queued outgoing message. #4426
|
||||
}
|
||||
|
||||
unpaid_execution {
|
||||
let mut executor = new_executor::<T>(Default::default());
|
||||
executor.set_origin(Some(Here.into()));
|
||||
|
||||
let instruction = Instruction::<XcmCallOf<T>>::UnpaidExecution {
|
||||
weight_limit: WeightLimit::Unlimited,
|
||||
check_origin: Some(Here.into()),
|
||||
};
|
||||
|
||||
let xcm = Xcm(vec![instruction]);
|
||||
}: {
|
||||
executor.bench_process(xcm)?;
|
||||
}
|
||||
|
||||
impl_benchmark_test_suite!(
|
||||
Pallet,
|
||||
crate::generic::mock::new_test_ext(),
|
||||
crate::generic::mock::Test
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user