merge-script 5c724f3b04 Merge bitcoin/bitcoin#34235: miniminer: stop assuming ancestor fees >= self fees ...

2cade5d5d1 [miniminer] stop assuming ancestor fees >= self fees (glozow)

Pull request description:

  These assertions exist to detect double-deducting values when we update descendants. However, negative fees are possible with `prioritisetransaction` so it doesn't make sense to check this.

  Leave the check for sizes because those are never negative.

  Fixes #34234

ACKs for top commit:
  instagibbs:
    ACK 2cade5d5d1
  dergoegge:
    utACK 2cade5d5d1

Tree-SHA512: 935bbc8bd9a0d508eea43bb49aa43c22735e3f2c1012598f6843e229c13b76e44f9fd3eb8b61c437fa0b32353b4e7b15afa3e31002bdfa382d3d711d16419fde

2026-01-09 11:24:03 +00:00

..

bench

Merge bitcoin/bitcoin#33142: test: Run bench sanity checks in parallel with functional tests

2026-01-05 15:47:49 -08:00

common

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

compat

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

consensus

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

crc32c

…

crypto

Merge bitcoin/bitcoin#33810: ci: Add IWYU job

2025-12-22 17:38:50 +00:00

index

Merge bitcoin/bitcoin#32997: index: Deduplicate HashKey / HeightKey handling

2025-12-27 16:18:34 +00:00

init

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

interfaces

kernel: Move BlockInfo to a kernel file

2025-12-21 10:24:36 +01:00

ipc

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

kernel

Merge bitcoin/bitcoin#33891: kernel: Expose reusable PrecomputedTransactionData in script validation

2025-12-27 16:20:43 +00:00

leveldb

…

logging

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

minisketch

…

node

[miniminer] stop assuming ancestor fees >= self fees

2026-01-08 07:55:27 -08:00

policy

policy: remove constant parameter from IsWellFormedPackage

2025-12-29 21:26:35 +01:00

primitives

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

qt

qt: Remove "Starting Block" from Peer Detail. Following Deprecation in bitcoin#34197

2026-01-06 03:08:01 +02:00

rpc

rpc, net: deprecate startingheight field of getpeerinfo RPC

2026-01-04 02:02:01 +01:00

script

Merge bitcoin/bitcoin#33135: wallet: warn against accidental unsafe older() import

2026-01-02 16:15:50 -08:00

secp256k1

…

support

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

test

clusterlin: remove unused FixLinearization (cleanup)

2026-01-05 11:48:34 -05:00

univalue

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

util

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

wallet

Merge bitcoin/bitcoin#34215: wallettool: fix unnamed createfromdump failure walletsdir deletion

2026-01-07 14:32:01 +00:00

zmq

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

.clang-format

iwyu, clang-format: Sort includes

2025-12-17 20:29:36 +00:00

.clang-tidy

refactor: enable readability-container-contains clang-tidy rule

2025-12-18 22:38:02 +01:00

addrdb.cpp

…

addrdb.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

addresstype.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

addresstype.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

addrman_impl.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

addrman.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

addrman.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

arith_uint256.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

arith_uint256.h

…

attributes.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

banman.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

banman.h

…

base58.cpp

…

base58.h

…

bech32.cpp

…

bech32.h

…

bip324.cpp

…

bip324.h

…

bitcoin-chainstate.cpp

kernel: revert accidentally removed copyright header

2025-12-18 16:07:31 +01:00

bitcoin-cli-res.rc

…

bitcoin-cli.cpp

Merge bitcoin/bitcoin#33192: refactor: unify container presence checks

2025-12-17 16:17:29 -05:00

bitcoin-res.rc

…

bitcoin-tx-res.rc

…

bitcoin-tx.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

bitcoin-util-res.rc

…

bitcoin-util.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

bitcoin-wallet-res.rc

…

bitcoin-wallet.cpp

…

bitcoin.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

bitcoind-res.rc

…

bitcoind.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

blockencodings.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

blockencodings.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

blockfilter.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

blockfilter.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

chain.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

chain.h

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

chainparams.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

chainparams.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

chainparamsbase.cpp

…

chainparamsbase.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

chainparamsseeds.h

…

checkqueue.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

clientversion.cpp

…

clientversion.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

cluster_linearize.h

clusterlin: remove unused FixLinearization (cleanup)

2026-01-05 11:48:34 -05:00

CMakeLists.txt

cmake: Make codegen target dependent on generate_build_info

2025-12-17 20:29:03 +00:00

coins.cpp

Merge bitcoin/bitcoin#33866: refactor: Let CCoinsViewCache::BatchWrite return void

2026-01-02 16:49:23 -08:00

coins.h

refactor: Let CCoinsViewCache::BatchWrite return void

2025-12-14 22:25:31 +01:00

compressor.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

compressor.h

…

core_io.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

core_memusage.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

core_read.cpp

kernel: Remove some unnecessary non-kernel includes

2025-12-21 10:24:09 +01:00

core_write.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

cuckoocache.h

…

dbwrapper.cpp

refactor: Add Chainstate::StoragePath() method

2025-12-12 06:49:59 -04:00

dbwrapper.h

refactor: Add Chainstate::StoragePath() method

2025-12-12 06:49:59 -04:00

deploymentinfo.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

deploymentinfo.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

deploymentstatus.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

deploymentstatus.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

dummywallet.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

external_signer.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

external_signer.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

flatfile.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

flatfile.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

hash.cpp

…

hash.h

…

headerssync.cpp

…

headerssync.h

…

httprpc.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

httprpc.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

httpserver.cpp

libevent: separate log statements per level

2025-12-13 12:48:27 +01:00

httpserver.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

i2p.cpp

log: Remove brittle and confusing LogPrintLevel

2025-12-13 13:43:24 +01:00

i2p.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

indirectmap.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

init.cpp

Merge bitcoin/bitcoin#33192: refactor: unify container presence checks

2025-12-17 16:17:29 -05:00

init.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

key_io.cpp

…

key_io.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

key.cpp

…

key.h

…

logging.cpp

log: Use __func__ for -logsourcelocations

2025-12-17 18:35:49 +01:00

logging.h

log: Use __func__ for -logsourcelocations

2025-12-17 18:35:49 +01:00

mapport.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

mapport.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

memusage.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

merkleblock.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

merkleblock.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

musig.cpp

…

musig.h

…

net_permissions.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

net_permissions.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

net_processing.cpp

Merge bitcoin/bitcoin#34203: doc: p2p: replace last remaining "command" terminology with "message type"

2026-01-06 09:45:34 +00:00

net_processing.h

Add util::Expected (std::expected)

2025-12-06 13:06:21 +01:00

net_types.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

net_types.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

net.cpp

Merge bitcoin/bitcoin#33192: refactor: unify container presence checks

2025-12-17 16:17:29 -05:00

net.h

net: Cache -capturemessages setting

2025-12-10 06:51:47 +10:00

netaddress.cpp

…

netaddress.h

…

netbase.cpp

Merge bitcoin/bitcoin#34033: scripted-diff: Unify error and warning log formatting

2025-12-11 09:00:18 -08:00

netbase.h

refactor: unify container presence checks - trivial counts

2025-12-03 13:36:58 +01:00

netgroup.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

netgroup.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

netmessagemaker.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

noui.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

noui.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

outputtype.cpp

…

outputtype.h

…

pow.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

pow.h

…

prevector.h

…

protocol.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

protocol.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

psbt.cpp

refactor: unify container presence checks - trivial counts

2025-12-03 13:36:58 +01:00

psbt.h

Merge bitcoin/bitcoin#34010: psbt: detect invalid MuSig2 pubkeys in deserialization

2026-01-05 14:56:25 -08:00

pubkey.cpp

…

pubkey.h

…

random.cpp

…

random.h

…

randomenv.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

randomenv.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

rest.cpp

rest: reformat uri_prefixes initializer list

2025-12-14 10:04:37 +01:00

rest.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

scheduler.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

scheduler.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

semaphore_grant.h

…

serialize.h

…

signet.cpp

kernel: Remove some unnecessary non-kernel includes

2025-12-21 10:24:09 +01:00

signet.h

kernel: Remove some unnecessary non-kernel includes

2025-12-21 10:24:09 +01:00

span.h

…

streams.cpp

…

streams.h

…

sync.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

sync.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

threadsafety.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

tinyformat.h

…

torcontrol.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

torcontrol.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

txdb.cpp

Merge bitcoin/bitcoin#33866: refactor: Let CCoinsViewCache::BatchWrite return void

2026-01-02 16:49:23 -08:00

txdb.h

Merge bitcoin/bitcoin#33866: refactor: Let CCoinsViewCache::BatchWrite return void

2026-01-02 16:49:23 -08:00

txgraph.cpp

txgraph: permit non-topological clusters to defer fixing (optimization)

2026-01-05 11:48:30 -05:00

txgraph.h

txgraph: drop move assignment operator

2025-11-25 07:36:50 -05:00

txmempool.cpp

Fix compilation for old Boost versions

2025-12-18 22:38:02 +01:00

txmempool.h

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

txrequest.cpp

Fix compilation for old Boost versions

2025-12-18 22:38:02 +01:00

txrequest.h

doc: fix double-word typos in comments

2025-12-30 12:12:26 -08:00

uint256.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

uint256.h

…

undo.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

validation.cpp

Merge bitcoin/bitcoin#33866: refactor: Let CCoinsViewCache::BatchWrite return void

2026-01-02 16:49:23 -08:00

validation.h

test: Wrap validation functions with TestChainstateManager

2025-12-16 11:25:46 -05:00

validationinterface.cpp

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

validationinterface.h

refactor: Convert ChainstateRole enum to struct

2025-12-12 06:49:59 -04:00

versionbits_impl.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

versionbits.cpp

Merge bitcoin/bitcoin#34084: scripted-diff: [doc] Unify stale copyright headers

2025-12-19 16:56:02 +00:00

versionbits.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00

walletinitinterface.h

scripted-diff: [doc] Unify stale copyright headers

2025-12-16 22:21:15 +01:00