merge-script 5b8c204275 Merge bitcoin/bitcoin#34384: Remove epoch logic from mempool ...

40735450c0 Remove unused epochguard.h (Suhas Daftuar)
1a8494d16c Rework CTxMemPool::GetChildren() to not use epochs (Suhas Daftuar)

Pull request description:

  Since #33591, the epoch-based graph traversal optimization logic is only used for `CTxMempool::GetChildren()`, a function that is only used in RPC code and tests. Rewrite it without epochs, and remove `util/epochguard.h` itself, as that was its last use.

  This allows us to reduce per-transaction memory usage by 8 bytes, for no material loss. With the new TxGraph-based mempool implementation, I also don't foresee future uses for it, as TxGraph can do even better by using BitSet-based traversal tracking.

ACKs for top commit:
  ajtowns:
    ACK 40735450c0
  instagibbs:
    ACK 40735450c0
  l0rinc:
    code review ACK 40735450c0

Tree-SHA512: 7ce7c04835cd2425a71c4fd47f316b6fb7381caa27383de7ecc4aa81100fcf7bc5e062699b307c08e0b853b35f06710d9ac761d6e660af9f9331e708d36f2fe0

2026-01-23 15:10:54 +00:00

..

bitcoinkernel_wrapper.h

kernel: Add support for block headers

2026-01-22 20:06:27 +05:30

bitcoinkernel.cpp

kernel: Add support for block headers

2026-01-22 20:06:27 +05:30

bitcoinkernel.h

kernel: Add support for block headers

2026-01-22 20:06:27 +05:30

blockmanager_opts.h

scripted-diff: [doc] Unify stale copyright headers

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

caches.h

…

chain.cpp

kernel: Move BlockInfo to a kernel file

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

chain.h

kernel: Move BlockInfo to a kernel file

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

chainparams.cpp

iwyu: Do not export crypto/hex_base.h header

2026-01-19 17:03:11 +00:00

chainparams.h

ci, iwyu: Fix warnings in src/kernel and treat them as errors

2026-01-16 14:25:45 +00:00

chainstatemanager_opts.h

scripted-diff: [doc] Unify stale copyright headers

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

checks.cpp

ci, iwyu: Fix warnings in src/kernel and treat them as errors

2026-01-16 14:25:45 +00:00

checks.h

scripted-diff: [doc] Unify stale copyright headers

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

CMakeLists.txt

kernel: Remove unused core_read.cpp from kernel

2026-01-19 12:56:59 +01:00

coinstats.cpp

ci, iwyu: Fix warnings in src/kernel and treat them as errors

2026-01-16 14:25:45 +00:00

coinstats.h

ci, iwyu: Fix warnings in src/kernel and treat them as errors

2026-01-16 14:25:45 +00:00

context.cpp

scripted-diff: [doc] Unify stale copyright headers

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

context.h

scripted-diff: [doc] Unify stale copyright headers

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

cs_main.cpp

scripted-diff: [doc] Unify stale copyright headers

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

cs_main.h

scripted-diff: [doc] Unify stale copyright headers

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

disconnected_transactions.cpp

…

disconnected_transactions.h

ci, iwyu: Fix warnings in src/kernel and treat them as errors

2026-01-16 14:25:45 +00:00

mempool_entry.h

Rework CTxMemPool::GetChildren() to not use epochs

2026-01-22 21:51:13 -05:00

mempool_limits.h

scripted-diff: [doc] Unify stale copyright headers

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

mempool_options.h

scripted-diff: [doc] Unify stale copyright headers

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

mempool_removal_reason.cpp

…

mempool_removal_reason.h

…

messagestartchars.h

scripted-diff: [doc] Unify stale copyright headers

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

notifications_interface.h

scripted-diff: [doc] Unify stale copyright headers

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

types.h

refactor: Convert ChainstateRole enum to struct

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

warning.h

…