diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-12 15:06:20 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-12 15:06:20 +0200 |
commit | 3b72fdfb86b08d80f5f790220137083b56f624d6 (patch) | |
tree | 4460ab2684d648646b5576af79c2f532184fd6ca /src/main.cpp | |
parent | 8ebe42435ab1deda622a7bbfc638b0b2393150ee (diff) | |
download | bitcoin-3b72fdfb86b08d80f5f790220137083b56f624d6.tar.xz |
Revert "Reject transactions with excessive numbers of sigops"
This reverts commit 4fad8e6d831729efa1965fa2034e7e51d3d0a1be.
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/main.cpp b/src/main.cpp index e135e93adb..55206600e2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -956,18 +956,9 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa if (Params().RequireStandard() && !AreInputsStandard(tx, view)) return error("AcceptToMemoryPool: : nonstandard transaction input"); - // Check that the transaction doesn't have an excessive number of - // sigops, making it impossible to mine. Since the coinbase transaction - // itself can contain sigops MAX_TX_SIGOPS is less than - // MAX_BLOCK_SIGOPS; we still consider this an invalid rather than - // merely non-standard transaction. - unsigned int nSigOps = GetLegacySigOpCount(tx); - nSigOps += GetP2SHSigOpCount(tx, view); - if (nSigOps > MAX_TX_SIGOPS) - return state.DoS(0, - error("AcceptToMemoryPool : too many sigops %s, %d > %d", - hash.ToString(), nSigOps, MAX_TX_SIGOPS), - REJECT_NONSTANDARD, "bad-txns-too-many-sigops"); + // Note: if you modify this code to accept non-standard transactions, then + // you should add code here to check that the transaction does a + // reasonable number of ECDSA signature verifications. int64_t nValueOut = tx.GetValueOut(); int64_t nFees = nValueIn-nValueOut; |