Skip to content

Fix incorrect rebase of fix/wallet_remove_conflicting_txs on master#1909

Merged
ImplOfAnImpl merged 4 commits intomasterfrom
fix/incorrect_rebase
Apr 22, 2025
Merged

Fix incorrect rebase of fix/wallet_remove_conflicting_txs on master#1909
ImplOfAnImpl merged 4 commits intomasterfrom
fix/incorrect_rebase

Conversation

@azarovh
Copy link
Copy Markdown
Contributor

@azarovh azarovh commented Apr 16, 2025

Edit: also, violates_frozen_token now checks the tx outputs too.

@OBorce
Copy link
Copy Markdown
Contributor

OBorce commented 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

@azarovh
Copy link
Copy Markdown
Contributor Author

azarovh commented Apr 17, 2025

with CreateOrder you can have a token id only in the output

But violates_frozen_token checks TokenData for order inputs, both give and ask currency. What's the case I am missing here?

@OBorce
Copy link
Copy Markdown
Contributor

OBorce commented Apr 17, 2025

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 ImplOfAnImpl marked this pull request as draft April 18, 2025 04:27
@ImplOfAnImpl ImplOfAnImpl force-pushed the fix/incorrect_rebase branch from 823b687 to 3ee1b34 Compare April 18, 2025 06:03
@ImplOfAnImpl ImplOfAnImpl marked this pull request as ready for review April 18, 2025 06:03
Comment thread wallet/src/account/output_cache/mod.rs Outdated
@ImplOfAnImpl
Copy link
Copy Markdown
Contributor

I also has a random failure of an unrelated test on CI; fixed it in this PR as well.

@ImplOfAnImpl ImplOfAnImpl force-pushed the fix/incorrect_rebase branch from 0d6acfe to 1cca6a5 Compare April 21, 2025 16:44
@ImplOfAnImpl ImplOfAnImpl merged commit 5fbd5ad into master Apr 22, 2025
18 checks passed
@ImplOfAnImpl ImplOfAnImpl deleted the fix/incorrect_rebase branch April 22, 2025 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants