Merge pull request #173 from gavinandresen/testnet_isstandard.
Accept non-standard transactions on testnet.
This commit is contained in:
commit
519365cfa5
1 changed files with 2 additions and 2 deletions
4
main.cpp
4
main.cpp
|
@ -681,8 +681,8 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
|
||||||
if (GetSigOpCount() > nSize / 34 || nSize < 100)
|
if (GetSigOpCount() > nSize / 34 || nSize < 100)
|
||||||
return error("AcceptToMemoryPool() : nonstandard transaction");
|
return error("AcceptToMemoryPool() : nonstandard transaction");
|
||||||
|
|
||||||
// Rather not work on nonstandard transactions
|
// Rather not work on nonstandard transactions (unless -testnet)
|
||||||
if (!IsStandard())
|
if (!fTestNet && !IsStandard())
|
||||||
return error("AcceptToMemoryPool() : nonstandard transaction type");
|
return error("AcceptToMemoryPool() : nonstandard transaction type");
|
||||||
|
|
||||||
// Do we already have it?
|
// Do we already have it?
|
||||||
|
|
Loading…
Reference in a new issue