aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2011-05-03 08:24:57 -0700
committerGavin Andresen <[email protected]>2011-05-03 08:24:57 -0700
commit519365cfa5f1daf40bcf51c4e1383dae2c6e4595 (patch)
treea70744479b9aa7e038482558cd71909fed23d00f
parentMerge pull request #190 from johnmaguire2013/tray. (diff)
parentAccept non-standard transactions on testnet. (diff)
downloaddiscoin-519365cfa5f1daf40bcf51c4e1383dae2c6e4595.tar.xz
discoin-519365cfa5f1daf40bcf51c4e1383dae2c6e4595.zip
Merge pull request #173 from gavinandresen/testnet_isstandard.
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 4c8f20c1e..7e1e420b3 100644
--- 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?