aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2011-04-20 11:20:33 -0400
committerGavin Andresen <gavinandresen@gmail.com>2011-04-20 11:20:33 -0400
commit5ec05f0a280acdfeafdfb9920ce157108c161449 (patch)
treed90e8d168fa465b7d521090a87432b5c47d7d451
parent72e962cf5589d708a6ba636c07ab7db7165ba965 (diff)
downloadbitcoin-5ec05f0a280acdfeafdfb9920ce157108c161449.tar.xz
Accept non-standard transactions on testnet.
-rw-r--r--main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 1b15d7e07e..3da06ba21d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -691,8 +691,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?