highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 14:53:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2738 from jgarzik/op_return

Browse Source 
Relay OP_RETURN data TxOut as standard transaction type.
This commit is contained in:
Gavin Andresen
2013-10-21 22:47:24 -07:00
parent 10dc3c7473 a79342479f
commit be484db274
5 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.cpp
View File

@@ -469,17 +469,28 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
return false;
}
}
unsigned int nDataOut = 0;
txnouttype whichType;
BOOST_FOREACH(const CTxOut& txout, tx.vout) {
if (!::IsStandard(txout.scriptPubKey)) {
if (!::IsStandard(txout.scriptPubKey, whichType)) {
reason = "scriptpubkey";
return false;
}
if (txout.IsDust(CTransaction::nMinRelayTxFee)) {
if (whichType == TX_NULL_DATA)
nDataOut++;
else if (txout.IsDust(CTransaction::nMinRelayTxFee)) {
reason = "dust";
return false;
}
}
// only one OP_RETURN txout is permitted
if (nDataOut > 1) {
reason = "mucho-data";
return false;
}
return true;
}