Fix .txn file import for ColdCards #11662
Merged
Conversation
This file contains 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
adamPetho
commented
Oct 10, 2023
Comment on lines
-102
to
-105
| catch (FormatException ex) | ||
| { | ||
| throw new FormatException("An error occurred while loading the PSBT file.", ex); | ||
| } |
There was a problem hiding this comment.
Wasabi couldn't broadcast the .txn file, because here we throw an exception, instead of letting it run to the "fallback" catch block.
If the fallback fails too, we are catching the exception outside and an error dialog will be shown to the user.
yahiheb
requested changes
Oct 10, 2023
turbolay
approved these changes
Oct 11, 2023
|
We tested this in the office with @Szpoti and I'm not aware of anyone having a CC at home, so merging. |
adamPetho
added a commit
that referenced
this pull request
Nov 28, 2023
* add fallbacks when PSBT loading fails * add .txn file support to FileDialogs * Typo * add log messages + remove unused usings --------- Co-authored-by: yahiheb <52379387+yahiheb@users.noreply.github.com> (cherry picked from commit 362b7de)
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.
Addresses: #9856 (comment)
Might fix completely: #9856
When the user sets this settings on ColdCard (
settings>delete psbts>normal/delete)todelete,ColdCard deletes the PSBT files from the SD card.
What's left is a signed
.txnfile.Wasabi almost supported this, but because we throw this ex:
throw new FormatException("An error occurred while loading the PSBT file.", ex);the fallback mechanism didn't have a chance to run.
With this PR I was able to broadcast the .txn file properly.