checks for null data transaction before debug.log

accraze · accraze · commit b6915b82398d · 2015-12-11T18:07:11.000-08:00
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 #6142
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -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)
         {
             LogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n",
                      this->GetHash().ToString());

Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,8 @@ void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,`
`1034`	`1034`
`1035`	`1035`	`// In either case, we need to get the destination address`
`1036`	`1036`	`CTxDestination address;`
`1037`		`- if (!ExtractDestination(txout.scriptPubKey, address))`
	`1037`	`+`
	`1038`	`+ if (!ExtractDestination(txout.scriptPubKey, address) && txout.scriptPubKey[0] != OP_RETURN)`
`1038`	`1039`	`{`
`1039`	`1040`	`LogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n",`
`1040`	`1041`	`this->GetHash().ToString());`