diff options
author | Matt Corallo <git@bluematt.me> | 2013-07-23 17:46:05 +0200 |
---|---|---|
committer | Matt Corallo <git@bluematt.me> | 2013-07-23 18:02:26 +0200 |
commit | d9ace8abe804a4134e5e77a0f9f82a52ea339762 (patch) | |
tree | 18a56ebad9ffde37a41a33f80d8a4934d698103b /src/main.cpp | |
parent | 0a740650a52a21b7d82b43524017c87643af3224 (diff) | |
download | bitcoin-d9ace8abe804a4134e5e77a0f9f82a52ea339762.tar.xz |
Don't use checkpoints and accept nonstd txn on -regtest
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index d358914406..881580a85b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -810,9 +810,9 @@ bool CTxMemPool::accept(CValidationState &state, CTransaction &tx, bool fLimitFr if ((int64)tx.nLockTime > std::numeric_limits<int>::max()) return error("CTxMemPool::accept() : not accepting nLockTime beyond 2038 yet"); - // Rather not work on nonstandard transactions (unless -testnet) + // Rather not work on nonstandard transactions (unless -testnet/-regtest) string reason; - if (!TestNet() && !IsStandardTx(tx, reason)) + if (Params().NetworkID() == CChainParams::MAIN && !IsStandardTx(tx, reason)) return error("CTxMemPool::accept() : nonstandard transaction: %s", reason.c_str()); @@ -888,7 +888,7 @@ bool CTxMemPool::accept(CValidationState &state, CTransaction &tx, bool fLimitFr } // Check for non-standard pay-to-script-hash in inputs - if (!TestNet() && !AreInputsStandard(tx, view)) + if (Params().NetworkID() == CChainParams::MAIN && !AreInputsStandard(tx, view)) return error("CTxMemPool::accept() : nonstandard transaction input"); // Note: if you modify this code to accept non-standard transactions, then |