Checks for null data transaction before issuing error to debug.log #7200
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
CWalletTx::GetAmounts could not find output address for null data transactions, thus issuing an error in debug.log. This change checks to see if the transaction is OP_RETURN before issuing error. resolves bitcoin#6142
| @@ -1034,7 +1034,8 @@ void CWalletTx::GetAmounts(list<COutputEntry>& listReceived, | |||
|
|
|||
| // In either case, we need to get the destination address | |||
| CTxDestination address; | |||
| if (!ExtractDestination(txout.scriptPubKey, address)) | |||
|
|
|||
| if (!ExtractDestination(txout.scriptPubKey, address) && txout.scriptPubKey[0] != OP_RETURN) | |||
There was a problem hiding this comment.
Instead of checking txout.scriptPubKey[0] you should probably use CScript::IsUnspendable().
|
Concept ACK. |
|
updated code to use |
|
utACK |
1 similar comment
|
utACK |
laanwj
added a commit
that referenced
this pull request
Dec 14, 2015
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 28, 2015
CWalletTx::GetAmounts could not find output address for null data transactions, thus issuing an error in debug.log. This change checks to see if the transaction is OP_RETURN before issuing error. resolves bitcoin#6142 Github-Pull: bitcoin#7200 Rebased-From: b6915b8
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 28, 2015
Github-Pull: bitcoin#7200 Rebased-From: c611acc
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 28, 2015
Github-Pull: bitcoin#7200 Rebased-From: d812daf
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 28, 2015
CWalletTx::GetAmounts could not find output address for null data transactions, thus issuing an error in debug.log. This change checks to see if the transaction is OP_RETURN before issuing error. resolves bitcoin#6142 Github-Pull: bitcoin#7200 Rebased-From: b6915b8
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 28, 2015
Github-Pull: bitcoin#7200 Rebased-From: c611acc
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 28, 2015
Github-Pull: bitcoin#7200 Rebased-From: d812daf
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
CWalletTx::GetAmountscould not find output address for null data transactions, thus issuing an error in debug.log. This change checks to see if the transaction isOP_RETURNbefore issuing error.resolves #6142