Skip to content
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

Jump to bottom

Withdraw Assets Before Checking Out in OnReapIdentity impl #2552

Merged
merged 7 commits into from
Nov 30, 2023
Merged

Withdraw Assets Before Checking Out in OnReapIdentity impl #2552

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
140a5e8
actually withdraw assets before checking out
joepetrowski Nov 29, 2023
76c42e4
don't break error encoding
joepetrowski Nov 29, 2023
7002eb0
Apply suggestions from code review
joepetrowski Nov 30, 2023
a2a041f
log error messages
joepetrowski Nov 30, 2023
50de3d9
Merge branch 'master' into joe-fix-onreapidentity
liamaharon Nov 30, 2023
d238c21
remove new error variant
joepetrowski Nov 30, 2023
c4b7970
add comment about transactional context
joepetrowski Nov 30, 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
6 changes: 6 additions & 0 deletions polkadot/runtime/rococo/src/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,12 @@ where
// Do `check_out` accounting since the XCM Executor's `InitiateTeleport` doesn't support
// unpaid teleports.

// withdraw the asset from `who`
let who_origin =
Junction::AccountId32 { network: None, id: who.clone().into() }.into_location();
let _withdrawn = xcm_config::LocalAssetTransactor::withdraw_asset(&roc, &who_origin, None)
joepetrowski marked this conversation as resolved.
Show resolved Hide resolved
muharem marked this conversation as resolved.
Show resolved Hide resolved
.map_err(|_| pallet_xcm::Error::<Runtime>::CannotWithdraw)?;
joepetrowski marked this conversation as resolved.
Show resolved Hide resolved

// check out
xcm_config::LocalAssetTransactor::can_check_out(
&destination,
Expand Down
6 changes: 6 additions & 0 deletions polkadot/runtime/westend/src/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,12 @@ where
// Do `check_out` accounting since the XCM Executor's `InitiateTeleport` doesn't support
// unpaid teleports.

// withdraw the asset from `who`
let who_origin =
Junction::AccountId32 { network: None, id: who.clone().into() }.into_location();
let _withdrawn = xcm_config::LocalAssetTransactor::withdraw_asset(&wnd, &who_origin, None)
.map_err(|_| pallet_xcm::Error::<Runtime>::CannotWithdraw)?;
acatangiu marked this conversation as resolved.
Show resolved Hide resolved
joepetrowski marked this conversation as resolved.
Show resolved Hide resolved

// check out
xcm_config::LocalAssetTransactor::can_check_out(
&destination,
Expand Down
2 changes: 2 additions & 0 deletions polkadot/xcm/pallet-xcm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,8 @@ pub mod pallet {
TooManyReserves,
/// Local XCM execution incomplete.
LocalExecutionIncomplete,
/// The amount of the asset requested could not be withdrawn from the origin.
CannotWithdraw,
joepetrowski marked this conversation as resolved.
Show resolved Hide resolved
}

impl<T: Config> From<SendError> for Error<T> {
Expand Down