Skip to content

[cu-33e4tdu] Attempt#2 Change order of execution of lock #2020

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
merged 4 commits into from
Oct 19, 2022
Merged

[cu-33e4tdu] Attempt#2 Change order of execution of lock #2020

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cc85e3
[cu-33e4tdu] Attempt#2 Change order of execution of lock
vimukthi-git Oct 19, 2022
c1a504b
Comment
vimukthi-git Oct 19, 2022
80dfa89
Comment
vimukthi-git Oct 19, 2022
6d01ce1
Allow transaction fee payments
vimukthi-git Oct 19, 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
19 changes: 11 additions & 8 deletions code/parachain/frame/crowdloan-rewards/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,14 +490,6 @@ pub mod pallet {
ensure!(available_to_claim > T::Balance::zero(), Error::<T>::NothingToClaim);

reward.claimed = available_to_claim.saturating_add(reward.claimed);
if T::LockByDefault::get() && !RemoveRewardLocks::<T>::exists() {
T::RewardAsset::set_lock(
T::LockId::get(),
reward_account,
reward.claimed,
WithdrawReasons::all(),
);
}

let funds_account = Self::account_id();
// No need to keep the pallet account alive.
Expand All @@ -508,6 +500,17 @@ pub mod pallet {
false,
)?;

// IMPORTANT: Order of execution of this lock matters for proper locking of
// funds. Refer https://app.clickup.com/t/33e4tdu
if T::LockByDefault::get() && !RemoveRewardLocks::<T>::exists() {
T::RewardAsset::set_lock(
T::LockId::get(),
reward_account,
reward.claimed,
WithdrawReasons::TRANSFER,
);
}

ClaimedRewards::<T>::mutate(|x| *x = x.saturating_add(available_to_claim));

Ok(available_to_claim)
Expand Down