Skip to content

Distinguish when MinXcmFee is not registered and FeeNotEnough #753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zqhxuyuan merged 6 commits into from
Jun 5, 2022
Merged

Distinguish when MinXcmFee is not registered and FeeNotEnough #753

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92e83dc
Make xcm min fee return option
ghzlatarev May 26, 2022
b34836e
Fix test
ghzlatarev May 26, 2022
fd97173
Add default impl for MinXcmFee::GetByKey
ghzlatarev May 30, 2022
21ec159
Correct another accourance of MinXcmFee impl in comments
ghzlatarev May 30, 2022
c95109f
Move default impl to xcm-support. Cooments and fmt
ghzlatarev May 31, 2022
d64f59c
Fix test in asset-registry
ghzlatarev May 31, 2022
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
6 changes: 4 additions & 2 deletions xtokens/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ pub mod module {
type SelfLocation: Get<MultiLocation>;

/// Minimum xcm execution fee paid on destination chain.
type MinXcmFee: GetByKey<MultiLocation, u128>;
type MinXcmFee: GetByKey<MultiLocation, Option<u128>>;
Comment thread
ghzlatarev marked this conversation as resolved.

/// XCM executor.
type XcmExecutor: ExecuteXcm<Self::Call>;
Expand Down Expand Up @@ -173,6 +173,8 @@ pub mod module {
FeeNotEnough,
/// Not supported MultiLocation
NotSupportedMultiLocation,
/// MinXcmFee not registered for certain reserve location
MinXcmFeeNotDefined,
}

#[pallet::hooks]
Expand Down Expand Up @@ -538,7 +540,7 @@ pub mod module {
ensure!(non_fee_reserve == dest.chain_part(), Error::<T>::InvalidAsset);

let reserve_location = non_fee_reserve.clone().ok_or(Error::<T>::AssetHasNoReserve)?;
let min_xcm_fee = T::MinXcmFee::get(&reserve_location);
let min_xcm_fee = T::MinXcmFee::get(&reserve_location).ok_or(Error::<T>::MinXcmFeeNotDefined)?;

// min xcm fee should less than user fee
let fee_to_dest: MultiAsset = (fee.id.clone(), min_xcm_fee).into();
Expand Down
6 changes: 3 additions & 3 deletions xtokens/src/mock/para.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,11 @@ match_types! {
}

parameter_type_with_key! {
pub ParachainMinFee: |location: MultiLocation| -> u128 {
pub ParachainMinFee: |location: MultiLocation| -> Option<u128> {
#[allow(clippy::match_ref_pats)] // false positive
match (location.parents, location.first_interior()) {
(1, Some(Parachain(2))) => 40,
_ => u128::MAX,
(1, Some(Parachain(2))) => Some(40),
_ => None,
}
};
}
Expand Down
6 changes: 3 additions & 3 deletions xtokens/src/mock/para_relative_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,11 @@ match_types! {
}

parameter_type_with_key! {
pub ParachainMinFee: |location: MultiLocation| -> u128 {
pub ParachainMinFee: |location: MultiLocation| -> Option<u128> {
#[allow(clippy::match_ref_pats)] // false positive
match (location.parents, location.first_interior()) {
(1, Some(Parachain(2))) => 40,
_ => u128::MAX,
(1, Some(Parachain(2))) => Some(40),
_ => None,
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion xtokens/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ fn transfer_asset_with_relay_fee_failed() {
),
40,
),
Error::<para::Runtime>::FeeNotEnough
Error::<para::Runtime>::MinXcmFeeNotDefined
);
});
}
Expand Down