fix handling of conflicting order transactions in the wallet#2045
Merged
fix handling of conflicting order transactions in the wallet#2045
Conversation
OBorce
force-pushed
the
fix/wallet-conflicting-orders
branch
from
35a466e to
2f2522f
Compare
ImplOfAnImpl
approved these changes
Apr 23, 2026
Comment on lines
+2106
to
+2107
| cmd_tag: OrderAccountCommandTag, | ||
| order_id: OrderId, |
Contributor
There was a problem hiding this comment.
Name them confirmed_tx_cmd_tag and confirmed_tx_order_id?
| assert!(output_cache.orders[&order_id].is_concluded); | ||
|
|
||
| // A *different* confirmed conclude tx for the same order arrives. | ||
| // update_conflicting_txs must mark the unconfirmed one as Conflicted. |
Contributor
There was a problem hiding this comment.
"unconfirmed one" - there are multiple txs that are marked as Conflicted here
| ) | ||
| .unwrap(); | ||
|
|
||
| assert!(output_cache.orders[&order_id].is_concluded); |
Contributor
There was a problem hiding this comment.
For completeness, I'd check the state of is_frozen too.
Same in the second test - whenever you check is_frozen, it's better to also check that is_concluded is not affected.
Contributor
|
Plz also update the changelog |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #2043
Any confirmed Freeze order transaction will now mark any unconfirmed Fill or Freeze order transaction for the same order as conflicting.
Similar for Conclude order it will mark any unconfirmed Fill, Freeze or Conclude order transactions as conflicting.