Fix incorrect rebase of fix/wallet_remove_conflicting_txs on master #1909
Conversation
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
ImplOfAnImpl
approved these changes
Apr 16, 2025
|
I was late to comment on the previous PR, there was a comment on violates_frozen_token, that doesn't check tx outputs as they can't have a token without having one in the inputs. Actually I had the same bug in API Server, with CreateOrder you can have a token id only in the output |
But |
|
it only iterates through the inputs of the tx, and the check for the CreateOrder will never trigger as it can't be a UTXO. |
ImplOfAnImpl
force-pushed
the
fix/incorrect_rebase
branch
from
823b687 to
3ee1b34
Compare
OBorce
approved these changes
Apr 18, 2025
|
I also has a random failure of an unrelated test on CI; fixed it in this PR as well. |
ImplOfAnImpl
force-pushed
the
fix/incorrect_rebase
branch
from
0d6acfe to
1cca6a5
Compare
OBorce
approved these changes
Apr 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Edit: also,
violates_frozen_tokennow checks the tx outputs too.