[Wallet] Abandon tx in CommitTransaction if ATMP fails #1695
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
random-zebra
force-pushed
the
202006_ATMP-in-CommitTx
branch
from
62cf90c to
7086794
Compare
Author
|
Rebased after merge of #1670. Ready for review. |
random-zebra
force-pushed
the
202006_ATMP-in-CommitTx
branch
from
7086794 to
cecc6cc
Compare
Author
|
Rebased and moved |
furszy
reviewed
Jun 22, 2020
furszy
previously approved these changes
Jun 22, 2020
furszy
left a comment
furszy
left a comment
There was a problem hiding this comment.
Side from the comment above, code ACK cecc6cc.
Also introduce CommitResult struct to send proper feedback to the user in case of failures.
random-zebra
force-pushed
the
202006_ATMP-in-CommitTx
branch
from
cecc6cc to
a0de4da
Compare
furszy
approved these changes
Jun 22, 2020
Fuzzbawls
approved these changes
Jun 27, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
This is an alternative to #1664.
It takes the opposite approach.
When ATMP fails in
CommitTransaction, instead of just returning the txid (hoping that the failure is not permanent) try to directly abandon the transaction.Save the result of these operations in a new struct
CWallet::CommitResult, and use it to give a detailed feedback to the user (via log lines, JSON-RPC errors and GUI dialogs).Based on top of:
This PR also cherry-picks 5f12263 from bitcoin#6898, in order to use
FormatStateMessageoutside of main.