|
|
@ -833,7 +833,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa |
|
|
|
|
|
|
|
|
|
|
|
// Rather not work on nonstandard transactions (unless -testnet/-regtest)
|
|
|
|
// Rather not work on nonstandard transactions (unless -testnet/-regtest)
|
|
|
|
string reason; |
|
|
|
string reason; |
|
|
|
if (Params().NetworkID() == CChainParams::MAIN && !IsStandardTx(tx, reason)) |
|
|
|
if (Params().RequireStandard() && !IsStandardTx(tx, reason)) |
|
|
|
return state.DoS(0, |
|
|
|
return state.DoS(0, |
|
|
|
error("AcceptToMemoryPool : nonstandard transaction: %s", reason), |
|
|
|
error("AcceptToMemoryPool : nonstandard transaction: %s", reason), |
|
|
|
REJECT_NONSTANDARD, reason); |
|
|
|
REJECT_NONSTANDARD, reason); |
|
|
@ -894,7 +894,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Check for non-standard pay-to-script-hash in inputs
|
|
|
|
// Check for non-standard pay-to-script-hash in inputs
|
|
|
|
if (Params().NetworkID() == CChainParams::MAIN && !AreInputsStandard(tx, view)) |
|
|
|
if (Params().RequireStandard() && !AreInputsStandard(tx, view)) |
|
|
|
return error("AcceptToMemoryPool: : nonstandard transaction input"); |
|
|
|
return error("AcceptToMemoryPool: : nonstandard transaction input"); |
|
|
|
|
|
|
|
|
|
|
|
// Note: if you modify this code to accept non-standard transactions, then
|
|
|
|
// Note: if you modify this code to accept non-standard transactions, then
|
|
|
|