Merge 0ac19a98f329fe8952f394509a7a29775ab805b0 into 5f4422d68dc3530c353af1f87499de1c864b60ad

This commit is contained in:
Sjors Provoost 2025-03-17 03:55:25 +01:00 committed by GitHub
commit aa1a364176
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -4094,6 +4094,7 @@ bool CheckBlock(const CBlock& block, BlockValidationState& state, const Consensu
strprintf("Transaction check failed (tx hash %s) %s", tx->GetHash().ToString(), tx_state.GetDebugMessage())); strprintf("Transaction check failed (tx hash %s) %s", tx->GetHash().ToString(), tx_state.GetDebugMessage()));
} }
} }
// This underestimates the number of sigops, because unlike ConnectBlock it does not count the witness:
unsigned int nSigOps = 0; unsigned int nSigOps = 0;
for (const auto& tx : block.vtx) for (const auto& tx : block.vtx)
{ {