Skip to content

xtokens: ensuring exact error from xcm propagated #659

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
xlc merged 3 commits into from
Nov 24, 2021
Merged

xtokens: ensuring exact error from xcm propagated #659

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
351ba2a
ensuring exact error from xcmp propagated
dzmitry-lahoda Nov 23, 2021
7cbeb5e
added logging for xtokens xcm transfer error
dzmitry-lahoda Nov 24, 2021
8711e06
make xcm exec error to be error in logs
dzmitry-lahoda Nov 24, 2021
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
9 changes: 7 additions & 2 deletions xtokens/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#![allow(clippy::unused_unit)]
#![allow(clippy::large_enum_variant)]

use frame_support::{pallet_prelude::*, require_transactional, traits::Get, transactional, Parameter};
use frame_support::{log, pallet_prelude::*, require_transactional, traits::Get, transactional, Parameter};
use frame_system::{ensure_signed, pallet_prelude::*};
use sp_runtime::{
traits::{AtLeast32BitUnsigned, Convert, MaybeSerializeDeserialize, Member, Zero},
Expand Down Expand Up @@ -54,6 +54,7 @@ use TransferKind::*;

#[frame_support::pallet]
pub mod module {

use super::*;

#[pallet::config]
Expand Down Expand Up @@ -120,6 +121,7 @@ pub mod module {
NotCrossChainTransferableCurrency,
/// The message's weight could not be determined.
UnweighableMessage,
// TODO: expand into XcmExecutionFailed(XcmError) after https://github.com/paritytech/substrate/pull/10242 done
/// XCM execution failed.
XcmExecutionFailed,
/// Could not re-anchor the assets to declare the fees for the
Expand Down Expand Up @@ -245,7 +247,10 @@ pub mod module {
let weight = T::Weigher::weight(&mut msg).map_err(|()| Error::<T>::UnweighableMessage)?;
T::XcmExecutor::execute_xcm_in_credit(origin_location, msg, weight, weight)
.ensure_complete()
.map_err(|_| Error::<T>::XcmExecutionFailed)?;
.map_err(|error| {
log::trace!("Failed execute transfer message with {:?}", error);

@zjb0807 zjb0807 Nov 24, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
log::trace!("Failed execute transfer message with {:?}", error);
log::error!(target: "xtokens", "Failed execute transfer message with {:?}", error);

Error::<T>::XcmExecutionFailed
})?;

if deposit_event {
Self::deposit_event(Event::<T>::TransferredMultiAsset(who, asset, dest));
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 @@ -101,7 +101,7 @@ fn cannot_lost_fund_on_send_failed() {
),
40,
),
Error::<para::Runtime>::XcmExecutionFailed
Error::<para::Runtime>::XcmUnroutable
);

assert_eq!(ParaTokens::free_balance(CurrencyId::R, &ALICE), 1_000);
Expand Down