Skip to content

fix: destroy frozen funds used wrong identity and proof verification #2467

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 3 commits into from
Feb 20, 2025
Merged

fix: destroy frozen funds used wrong identity and proof verification #2467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ad3591
fix: used the wrong identity to set amount of frozen funds to destroy
pauldelucia Feb 18, 2025
0c9d66d
fix: proof was checking for None but we get Some with zero balance
pauldelucia Feb 18, 2025
0f58829
fix: only accept zero balance for proof
pauldelucia Feb 19, 2025
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
4 changes: 2 additions & 2 deletions ...ransition/token_transition/token_destroy_frozen_funds_transition_action/v0/transformer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl TokenDestroyFrozenFundsTransitionActionV0 {

let maybe_token_amount = drive.fetch_identity_token_balance_operations(
base.token_id().to_buffer(),
owner_id.to_buffer(),
frozen_identity_id.to_buffer(),
!approximate_without_state_for_costs,
transaction,
&mut drive_operations,
Expand Down Expand Up @@ -228,7 +228,7 @@ impl TokenDestroyFrozenFundsTransitionActionV0 {

let maybe_token_amount = drive.fetch_identity_token_balance_operations(
base.token_id().to_buffer(),
owner_id.to_buffer(),
frozen_identity_id.to_buffer(),
!approximate_without_state_for_costs,
transaction,
&mut drive_operations,
Expand Down
8 changes: 4 additions & 4 deletions ...ive/src/verify/state_transition/verify_state_transition_was_executed_with_proof/v0/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ impl Drive {
TokenTransition::DestroyFrozenFunds(
destroy_frozen_funds_transition,
) => {
let (root_hash, None) =
let (root_hash, maybe_token_amount) =
Drive::verify_token_balance_for_identity_id(
proof,
token_id.into_buffer(),
Expand All @@ -470,10 +470,10 @@ impl Drive {
.into_buffer(),
false,
platform_version,
)?
else {
)?;
if maybe_token_amount != Some(0) {
return Err(Error::Proof(ProofError::IncorrectProof(
format!("proof contained token balance for identity {} expected to not exist because of state transition (token destroy frozen funds)", owner_id))));
format!("proof contained non-zero token balance for identity {} expected to be zero because of state transition (token destroy frozen funds)", destroy_frozen_funds_transition.frozen_identity_id()))));
};
Ok((
root_hash,
Expand Down
Loading