Browse Source
Merge pull request #5589
23f3435
Rename MAX_TX_SIGOPS to MAX_STANDARD_TX_SIGOPS to match similar policy constant MAX_STANDARD_TX_SIZE (Luke Dashjr)
pull/145/head
Wladimir J. van der Laan
10 years ago
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with
4 additions and
4 deletions
-
src/main.cpp
-
src/main.h
|
|
@ -1002,15 +1002,15 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa |
|
|
|
|
|
|
|
// 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
|
|
|
|
// itself can contain sigops MAX_STANDARD_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) |
|
|
|
if (nSigOps > MAX_STANDARD_TX_SIGOPS) |
|
|
|
return state.DoS(0, |
|
|
|
error("AcceptToMemoryPool : too many sigops %s, %d > %d", |
|
|
|
hash.ToString(), nSigOps, MAX_TX_SIGOPS), |
|
|
|
hash.ToString(), nSigOps, MAX_STANDARD_TX_SIGOPS), |
|
|
|
REJECT_NONSTANDARD, "bad-txns-too-many-sigops"); |
|
|
|
|
|
|
|
CAmount nValueOut = tx.GetValueOut(); |
|
|
|
|
|
@ -60,7 +60,7 @@ static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; |
|
|
|
/** Maximum number of signature check operations in an IsStandard() P2SH script */ |
|
|
|
static const unsigned int MAX_P2SH_SIGOPS = 15; |
|
|
|
/** The maximum number of sigops we're willing to relay/mine in a single tx */ |
|
|
|
static const unsigned int MAX_TX_SIGOPS = MAX_BLOCK_SIGOPS/5; |
|
|
|
static const unsigned int MAX_STANDARD_TX_SIGOPS = MAX_BLOCK_SIGOPS/5; |
|
|
|
/** Default for -maxorphantx, maximum number of orphan transactions kept in memory */ |
|
|
|
static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100; |
|
|
|
/** The maximum size of a blk?????.dat file (since 0.8) */ |
|
|
|