Skip to content

should kill pending contribution whenever it goes down to zero #1083

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
0x8f701 merged 1 commit into from
Dec 24, 2021
Merged

should kill pending contribution whenever it goes down to zero #1083

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 7 additions & 16 deletions pallets/crowdloans/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,11 @@ pub mod pallet {
.checked_sub(amount)
.ok_or(ArithmeticError::Underflow)?
};
Self::contribution_put(vault.trie_index, who, &new_pending, true);
if new_pending.is_zero() {
Self::contribution_kill(vault.trie_index, who, true);
} else {
Self::contribution_put(vault.trie_index, who, &new_pending, true);
}
Ok(())
}

Expand All @@ -754,25 +758,12 @@ pub mod pallet {
vault: &mut Vault<T>,
amount: BalanceOf<T>,
) -> DispatchResult {
vault.pending = vault
.pending
.checked_sub(amount)
.ok_or(ArithmeticError::Underflow)?;
Self::do_update_pending(who, vault, amount, false)?;

vault.contributed = vault
.contributed
.checked_add(amount)
.ok_or(ArithmeticError::Overflow)?;

let (pending, _) = Self::contribution_get(vault.trie_index, who, true);
let new_pending = pending
.checked_sub(amount)
.ok_or(ArithmeticError::Underflow)?;
if new_pending.is_zero() {
Self::contribution_kill(vault.trie_index, who, true);
} else {
Self::contribution_put(vault.trie_index, who, &new_pending, true);
}

let (contributed, _) = Self::contribution_get(vault.trie_index, who, false);
let new_contributed = contributed
.checked_add(amount)
Expand Down