diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp --- a/src/bench/mempool_eviction.cpp +++ b/src/bench/mempool_eviction.cpp @@ -13,10 +13,10 @@ int64_t nTime = 0; unsigned int nHeight = 1; bool spendsCoinbase = false; - unsigned int nSigOpCount = 1; + unsigned int nSigChecks = 1; LockPoints lp; pool.addUnchecked(CTxMemPoolEntry(tx, nFee, nTime, nHeight, spendsCoinbase, - nSigOpCount, lp)); + nSigChecks, lp)); } // Right now this is only testing eviction performance in an extremely small diff --git a/src/bench/mempool_stress.cpp b/src/bench/mempool_stress.cpp --- a/src/bench/mempool_stress.cpp +++ b/src/bench/mempool_stress.cpp @@ -16,10 +16,10 @@ int64_t nTime = 0; unsigned int nHeight = 1; bool spendsCoinbase = false; - unsigned int sigOpCost = 4; + unsigned int sigChecks = 1; LockPoints lp; pool.addUnchecked(CTxMemPoolEntry(tx, 1000 * SATOSHI, nTime, nHeight, - spendsCoinbase, sigOpCost, lp)); + spendsCoinbase, sigChecks, lp)); } struct Available { diff --git a/src/bench/rpc_mempool.cpp b/src/bench/rpc_mempool.cpp --- a/src/bench/rpc_mempool.cpp +++ b/src/bench/rpc_mempool.cpp @@ -15,7 +15,7 @@ pool.addUnchecked(CTxMemPoolEntry(tx, fee, /* time */ 0, /* height */ 1, /* spendsCoinbase */ false, - /* sigOpCount */ 1, lp)); + /*_sigChecks=*/1, lp)); } static void RpcMempool(benchmark::Bench &bench) { diff --git a/src/blockvalidity.h b/src/blockvalidity.h --- a/src/blockvalidity.h +++ b/src/blockvalidity.h @@ -26,7 +26,7 @@ /** * Only first tx is coinbase, 2 <= coinbase input script length <= 100, - * transactions valid, no duplicate txids, sigops, size, merkle root. + * transactions valid, no duplicate txids, size, merkle root. * Implies all parents are at least TREE but not necessarily TRANSACTIONS. * When all parent blocks also have TRANSACTIONS, CBlockIndex::nChainTx and * CBlockIndex::nChainSize will be set. diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -1132,11 +1132,12 @@ ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::NODE_RELAY); - argsman.AddArg("-bytespersigop", - strprintf("Equivalent bytes per sigop in transactions for " - "relay and mining (default: %u)", - DEFAULT_BYTES_PER_SIGCHECK), - ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY); + argsman.AddArg( + "-bytespersigop", + strprintf("Equivalent bytes per sigCheck in transactions for " + "relay and mining (default: %u)", + DEFAULT_BYTES_PER_SIGCHECK), + ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY); argsman.AddArg( "-datacarrier", strprintf("Relay and mine data carrier transactions (default: %d)", diff --git a/src/net_processing.cpp b/src/net_processing.cpp --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -4856,7 +4856,7 @@ // caught in FillBlock with READ_STATUS_FAILED, so // impossible here) // 3. the block is otherwise invalid (eg invalid coinbase, - // block is too big, too many legacy sigops, etc). + // block is too big, too many sigChecks, etc). // So if CheckBlock failed, #3 is the only possibility. // Under BIP 152, we don't DoS-ban unless proof of work is // invalid (we don't require all the stateless checks to have diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -726,10 +726,10 @@ "if key is not present, fee is unknown and " "clients MUST NOT assume there isn't one"}, {RPCResult::Type::NUM, "sigops", - "total SigOps cost, as counted for purposes of " - "block limits; if key is not present, sigop " - "cost is unknown and clients MUST NOT assume it " - "is zero"}, + "total sigChecks, as counted for purposes of " + "block limits; if key is not present, sigChecks " + "are unknown and clients MUST NOT assume it is " + "zero"}, }}, }}, {RPCResult::Type::OBJ, @@ -783,7 +783,7 @@ {RPCResult::Type::STR_HEX, "noncerange", "A range of valid nonces"}, {RPCResult::Type::NUM, "sigoplimit", - "limit of sigops in blocks"}, + "limit of sigChecks in blocks"}, {RPCResult::Type::NUM, "sizelimit", "limit of block size"}, {RPCResult::Type::NUM_TIME, "curtime", "current timestamp in " + UNIX_EPOCH_TIME}, diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4064,10 +4064,7 @@ // Check transactions: // - canonical ordering // - ensure they are finalized - // - perform a preliminary block-sigops count (they will be recounted more - // strictly during ConnectBlock). - // - perform a transaction-sigops check (again, a more strict check will - // happen in ConnectBlock). + // - check they have the minimum size const CTransaction *prevTx = nullptr; for (const auto &ptx : block.vtx) { const CTransaction &tx = *ptx;