diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index d85c30194..01b4300c1 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -1,71 +1,55 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_CONSENSUS_CONSENSUS_H #define BITCOIN_CONSENSUS_CONSENSUS_H #include /** 1MB */ static const uint64_t ONE_MEGABYTE = 1000000; /** The maximum allowed size for a transaction, in bytes */ static const uint64_t MAX_TX_SIZE = ONE_MEGABYTE; /** The minimum allowed size for a transaction, in bytes */ static const uint64_t MIN_TX_SIZE = 100; /** The maximum allowed size for a block, before the UAHF */ static const uint64_t LEGACY_MAX_BLOCK_SIZE = ONE_MEGABYTE; /** Default setting for maximum allowed size for a block, in bytes */ static const uint64_t DEFAULT_MAX_BLOCK_SIZE = 32 * ONE_MEGABYTE; -/** - * The maximum allowed number of parsed signature check operations (SigOps) - * per MB in a block (network rule). - */ -static const int64_t MAX_BLOCK_SIGOPS_PER_MB = 20000; /** allowed number of signature check operations (sigops) per transaction. */ static const uint64_t MAX_TX_SIGOPS_COUNT = 20000; /** Allowed number of signature check operations per transaction. */ static const uint64_t MAX_TX_SIGCHECKS = 3000; /** * The ratio between the maximum allowable block size and the maximum allowable * SigChecks (executed signature check operations) in the block. (network rule). */ static const int BLOCK_MAXBYTES_MAXSIGCHECKS_RATIO = 141; /** * Coinbase transaction outputs can only be spent after this number of new * blocks (network rule). */ static const int COINBASE_MATURITY = 100; /** Coinbase scripts have their own script size limit. */ static const int MAX_COINBASE_SCRIPTSIG_SIZE = 100; /** Flags for nSequence and nLockTime locks */ /** Interpret sequence numbers as relative lock-time constraints. */ static constexpr unsigned int LOCKTIME_VERIFY_SEQUENCE = (1 << 0); /** Use GetMedianTimePast() instead of nTime for end point timestamp. */ static constexpr unsigned int LOCKTIME_MEDIAN_TIME_PAST = (1 << 1); -/** - * Compute the maximum number of sigops operation that can contained in a block - * given the block size as parameter. It is computed by multiplying - * MAX_BLOCK_SIGOPS_PER_MB by the size of the block in MB rounded up to the - * closest integer. - */ -inline uint64_t GetMaxBlockSigOpsCount(uint64_t blockSize) { - auto nMbRoundedUp = 1 + ((blockSize - 1) / ONE_MEGABYTE); - return nMbRoundedUp * MAX_BLOCK_SIGOPS_PER_MB; -} - /** * Compute the maximum number of sigchecks that can be contained in a block * given the MAXIMUM block size as parameter. The maximum sigchecks scale * linearly with the maximum block size and do not depend on the actual * block size. The returned value is rounded down (there are no fractional * sigchecks so the fractional part is meaningless). */ inline uint64_t GetMaxBlockSigChecksCount(uint64_t maxBlockSize) { return maxBlockSize / BLOCK_MAXBYTES_MAXSIGCHECKS_RATIO; } #endif // BITCOIN_CONSENSUS_CONSENSUS_H diff --git a/src/policy/policy.h b/src/policy/policy.h index 43d3060f1..731ba2011 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -1,156 +1,155 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_POLICY_POLICY_H #define BITCOIN_POLICY_POLICY_H #include #include #include #include