GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ElementsProject/elements#1569: Linter fixes
Some checks failed
CI / test each commit (push) Has been cancelled
Details
CI / macOS 14 native, arm64, no depends, sqlite only, gui (push) Has been cancelled
Details
CI / macOS 14 native, arm64, fuzz (push) Has been cancelled
Details
CI / Win64 native, VS 2022 (push) Has been cancelled
Details
CI / Win64 native fuzz, VS 2022 (push) Has been cancelled
Details
CI / ASan + LSan + UBSan + integer, no depends, USDT (push) Has been cancelled
Details
CI / lint (push) Has been cancelled
Details

Browse source 
713da86406 add linter check to CI (Tom Trevethan)
bd2dbdcceb Fix: linter errors (Tom Trevethan)
0ee8558f3a Squashed 'src/secp256k1/' content from commit 95b983597a (Tom Trevethan)

Pull request description:

  Fixes for the v29 branch point linter checks.

  `tests/bitcoin_functional` obsolete tests removed.

ACKs for top commit:
  delta1:
    ACK 713da86406; tested locally.

Tree-SHA512: 8385282c8824ac4b47213594955a99279e83890f0be879e8558ad7aa166571dd813c97a3c57e08b54b9d12b650cb8518282dc87d91b39ad2eaa97955f81b51b5
This commit is contained in:
merge-script 2026-07-10 13:06:25 +02:00
commit af697df271
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
190 changed files with 95 additions and 30880 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/validation.cpp
View file

@ -864,7 +864,7 @@ private:
// or the peg-in paid enough subsidy
return true;
}
ValidationCache& GetValidationCache()
{
return m_active_chainstate.m_chainman.m_validation_cache;
@ -3112,7 +3112,7 @@ bool Chainstate::ConnectBlock(const CBlock& block, BlockValidationState& state,
Ticks<SecondsDouble>(m_chainman.time_connect),
Ticks<MillisecondsDouble>(m_chainman.time_connect) / m_chainman.num_blocks_total);
// todo:
// todo:
// CAmountMap block_reward = fee_map;
// block_reward[consensusParams.subsidy_asset] += GetBlockSubsidy(pindex->nHeight, consensusParams);
// if (!MoneyRange(block_reward)) {
@ -3122,7 +3122,7 @@ bool Chainstate::ConnectBlock(const CBlock& block, BlockValidationState& state,
// if (!VerifyCoinbaseAmount(*(block.vtx[0]), block_reward)) {
// LogPrintf("ERROR: ConnectBlock(): coinbase pays too much\n");
// return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-cb-amount");
CAmountMap block_reward = fee_map;
block_reward[consensusParams.subsidy_asset] += GetBlockSubsidy(pindex->nHeight, consensusParams);
if (!MoneyRange(block_reward) && state.IsValid()) {
@ -4849,7 +4849,7 @@ static bool ContextualCheckBlockHeader(const CBlockHeader& block, BlockValidatio
LogPrintf("ERROR: %s: block height in header is incorrect (got %d, expected %d)\n", __func__, block.block_height, nHeight);
return state.Invalid(BlockValidationResult::BLOCK_INVALID_HEADER, "bad-header-height");
}
// Testnet4 and regtest only: Check timestamp against prev for difficulty-adjustment
// blocks to prevent timewarp attacks (see https://github.com/bitcoin/bitcoin/pull/15482).
if (consensusParams.enforce_BIP94) {