Skip to content

fix transfer_held #592

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

fix transfer_held #592

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70e7faa
fix transfer_held
wangjj9219 Aug 26, 2021
e711066
Merge remote-tracking branch 'upstream/master' into fix-transfer-held
wangjj9219 Nov 3, 2021
5e175e4
add tests
wangjj9219 Nov 3, 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 tokens/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1355,11 +1355,16 @@ impl<T: Config> fungibles::MutateHold<T::AccountId> for Pallet<T> {
source: &T::AccountId,
dest: &T::AccountId,
amount: Self::Balance,
_best_effort: bool,
best_effort: bool,
on_hold: bool,
) -> Result<Self::Balance, DispatchError> {
let status = if on_hold { Status::Reserved } else { Status::Free };
Self::repatriate_reserved(asset_id, source, dest, amount, status)
ensure!(
amount <= Self::balance_on_hold(asset_id, source) || best_effort,
Error::<T>::BalanceTooLow
);
let gap = Self::repatriate_reserved(asset_id, source, dest, amount, status);
Ok(amount.saturating_sub(gap))
}
}

Expand Down