wallet: return ErrNotMine for script addresses #909
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
We recently added the ManagedTaprootScriptAddress type which is not a ManagedPubKeyAddress and therefore doesn't store the derivation info. When trying to fetch the input info for such an address we run into the case where we return nil as the error which causes issues further up in the call stack. This commit fixes the problem by returning an actual error and not the err variable that is nil due to the previous check.
Roasbeef
reviewed
Feb 6, 2024
| @@ -135,7 +135,7 @@ func (w *Wallet) FetchInputInfo(prevOut *wire.OutPoint) (*wire.MsgTx, | |||
| } | |||
| pubKeyAddr, ok := addr.(waddrmgr.ManagedPubKeyAddress) | |||
| if !ok { | |||
| return nil, nil, nil, 0, err | |||
| return nil, nil, nil, 0, ErrNotMine | |||
There was a problem hiding this comment.
So do we need to modify this routine to support the other types? Or is this just a way to catch this case in some higher level code?
There was a problem hiding this comment.
Ah also weird interaction re the err variable shadowing 🙈
There was a problem hiding this comment.
I don't think we need to handle the other types, really. This is mainly about returning the wrong error (it's always nil which is what breaks things at the call sites).
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.
We recently added the ManagedTaprootScriptAddress type which is not a ManagedPubKeyAddress and therefore doesn't store the derivation info. When trying to fetch the input info for such an address we run into the case where we return nil as the error which causes issues further up in the call stack.
This commit fixes the problem by returning an actual error and not the err variable that is nil due to the previous check.