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

Stop weighing XCM execution on pallet-xcm's send extrinsic #7201

Merged
merged 2 commits into from
May 9, 2023
Merged

Stop weighing XCM execution on pallet-xcm's send extrinsic #7201

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc0e581
Stop weighing XCM execution on pallet-xcm's send extrinsic
franciscoaguirre May 8, 2023
4d076e2
Add missing instruction to transfer extrinsics' weight in pallet-xcm
franciscoaguirre May 9, 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
15 changes: 5 additions & 10 deletions xcm/pallet-xcm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,16 +779,7 @@ pub mod pallet {
#[pallet::call]
impl<T: Config> Pallet<T> {
#[pallet::call_index(0)]
#[pallet::weight({
let maybe_msg: Result<Xcm<()>, ()> = (*message.clone()).try_into();
match maybe_msg {
Ok(msg) => {
T::Weigher::weight(&mut msg.into())
.map_or(Weight::MAX, |w| T::WeightInfo::send().saturating_add(w))
}
_ => Weight::MAX,
}
})]
#[pallet::weight(T::WeightInfo::send())]
pub fn send(
origin: OriginFor<T>,
dest: Box<VersionedMultiLocation>,
Expand Down Expand Up @@ -830,6 +821,7 @@ pub mod pallet {
let count = assets.len() as u32;
let mut message = Xcm(vec![
WithdrawAsset(assets),
SetFeesMode { jit_withdraw: true },
InitiateTeleport {
assets: Wild(AllCounted(count)),
dest,
Expand Down Expand Up @@ -875,6 +867,7 @@ pub mod pallet {
(Ok(assets), Ok(dest)) => {
use sp_std::vec;
let mut message = Xcm(vec![
SetFeesMode { jit_withdraw: true },
TransferReserveAsset { assets, dest, xcm: Xcm(vec![]) }
]);
T::Weigher::weight(&mut message).map_or(Weight::MAX, |w| T::WeightInfo::reserve_transfer_assets().saturating_add(w))
Expand Down Expand Up @@ -1048,6 +1041,7 @@ pub mod pallet {
(Ok(assets), Ok(dest)) => {
use sp_std::vec;
let mut message = Xcm(vec![
SetFeesMode { jit_withdraw: true },
TransferReserveAsset { assets, dest, xcm: Xcm(vec![]) }
]);
T::Weigher::weight(&mut message).map_or(Weight::MAX, |w| T::WeightInfo::reserve_transfer_assets().saturating_add(w))
Expand Down Expand Up @@ -1099,6 +1093,7 @@ pub mod pallet {
use sp_std::vec;
let mut message = Xcm(vec![
WithdrawAsset(assets),
SetFeesMode { jit_withdraw: true },
InitiateTeleport { assets: Wild(All), dest, xcm: Xcm(vec![]) },
]);
T::Weigher::weight(&mut message).map_or(Weight::MAX, |w| T::WeightInfo::teleport_assets().saturating_add(w))
Expand Down