Merge pull request #173 from gavinandresen/testnet_isstandard.

Accept non-standard transactions on testnet.
2011-05-03 08:24:57 -07:00 · 2011-05-03 08:24:57 -07:00 · 519365cfa5
parent 8737e1ee20 5ec05f0a28
commit 519365cfa5
1 changed files with 2 additions and 2 deletions
--- a/main.cpp
+++ b/main.cpp
@ -681,8 +681,8 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
    if (GetSigOpCount() > nSize / 34 || nSize < 100)
        return error("AcceptToMemoryPool() : nonstandard transaction");

-    // Rather not work on nonstandard transactions
-    if (!IsStandard())
+    // Rather not work on nonstandard transactions (unless -testnet)
+    if (!fTestNet && !IsStandard())
        return error("AcceptToMemoryPool() : nonstandard transaction type");

    // Do we already have it?