Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

XCM: Limit the max number of assets weighable in MultiAssets #6786

Merged
merged 6 commits into from
Feb 28, 2023
Merged

XCM: Limit the max number of assets weighable in MultiAssets #6786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
35165d4
Limit the max number of assets weighable in MultiAssets
KiChjang Feb 25, 2023
96719e9
Apply suggestions from code review
KiChjang Feb 25, 2023
308c780
Add tests
KiChjang Feb 25, 2023
59b0b21
cargo fmt
KiChjang Feb 25, 2023
2ea8d94
Include proof size weight in tests
KiChjang Feb 26, 2023
8a6c555
Add comments
KiChjang Feb 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add tests
  • Loading branch information
@KiChjang
KiChjang committed Feb 25, 2023
commit 308c780c8b14c0ea8f77b404decf967823ba0ab4
8 changes: 8 additions & 0 deletions runtime/kusama/src/weights/xcm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,3 +276,11 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for KusamaXcmWeight<RuntimeCall> {
XcmGeneric::<Runtime>::unpaid_execution()
}
}

#[test]
fn all_counted_has_a_sane_weight_upper_limit() {
let assets = MultiAssetFilter::Wild(AllCounted(4294967295));
let weight = Weight::from_ref_time(1000);
KiChjang marked this conversation as resolved.
Show resolved Hide resolved

assert_eq!(assets.weigh_multi_assets(weight), weight * MAX_ASSETS);
}
13 changes: 13 additions & 0 deletions runtime/kusama/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,3 +457,16 @@ impl pallet_xcm::Config for Runtime {
#[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest;
}

#[test]
fn karura_liquid_staking_xcm_has_sane_weight_upper_limt() {
use parity_scale_codec::Decode;
use xcm::VersionedXcm;
use xcm_executor::traits::WeightBounds;
let blob = hex_literal::hex!("02140004000000000700e40b540213000000000700e40b54020006010700c817a804341801000006010b00c490bf4302140d010003ffffffff000100411f");
let Ok(VersionedXcm::V2(old_xcm)) = VersionedXcm::<super::RuntimeCall>::decode(&mut &blob[..]) else { panic!("can't decode XCM blob") };
let mut xcm: Xcm<super::RuntimeCall> = old_xcm.try_into().expect("conversion from v2 to v3 failed");
let weight = <XcmConfig as xcm_executor::Config>::Weigher::weight(&mut xcm).expect("weighing XCM failed");

assert_eq!(weight.ref_time(), 20_313_281_000);
KiChjang marked this conversation as resolved.
Show resolved Hide resolved
}
8 changes: 8 additions & 0 deletions runtime/rococo/src/weights/xcm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,3 +276,11 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for RococoXcmWeight<RuntimeCall> {
XcmGeneric::<Runtime>::unpaid_execution()
}
}

#[test]
fn all_counted_has_a_sane_weight_upper_limit() {
let assets = MultiAssetFilter::Wild(AllCounted(4294967295));
let weight = Weight::from_ref_time(1000);
KiChjang marked this conversation as resolved.
Show resolved Hide resolved

assert_eq!(assets.weigh_multi_assets(weight), weight * MAX_ASSETS);
}
8 changes: 8 additions & 0 deletions runtime/westend/src/weights/xcm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,11 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for WestendXcmWeight<RuntimeCall> {
XcmGeneric::<Runtime>::unpaid_execution()
}
}

#[test]
fn all_counted_has_a_sane_weight_upper_limit() {
let assets = MultiAssetFilter::Wild(AllCounted(4294967295));
let weight = Weight::from_ref_time(1000);
KiChjang marked this conversation as resolved.
Show resolved Hide resolved

assert_eq!(assets.weigh_multi_assets(weight), weight * MAX_ASSETS);
}