Merge pull request #2738 from jgarzik/op_return

Relay OP_RETURN data TxOut as standard transaction type.

1 files changed, 13 insertions, 2 deletions

diff --git a/src/main.cpp b/src/main.cpp
index a5a0f031af..01a1babc7f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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;
 }