merge-script f5f3e1f263 Merge bitcoin/bitcoin#32646: p2p: Add witness mutation check inside FillBlock ...

28299ce776 p2p: remove vestigial READ_STATUS_CHECKBLOCK_FAILED (Greg Sanders)
bac9ee4830 p2p: Add witness mutation check inside FillBlock (Greg Sanders)

Pull request description:

  Since #29412, we have not allowed mutated blocks to continue being processed immediately the block is received, but this is only done for the legacy BLOCK message.

  Extend these checks as belt-and-suspenders to not allow similar mutation strategies to affect relay by honest peers by applying the check inside `PartiallyDownloadedBlock::FillBlock`, immediately before returning `READ_STATUS_OK`.

ACKs for top commit:
  Crypt-iQ:
    ACK 28299ce776
  achow101:
    ACK 28299ce776
  stratospher:
    ACK 28299ce7.
  dergoegge:
    Code review ACK 28299ce776

Tree-SHA512: 883d7c12ca096234b425e6fe12e46b0611607600916e6ac8d1c8112224aa76924b7b074754910163ac2ec15379075d618a9ece3642649ac7629cddb0d4e432ea

2025-06-30 13:15:37 -04:00

..

bench

Merge bitcoin/bitcoin#32638: blocks: force hash validations on disk read

2025-06-27 13:28:26 -07:00

common

Merge bitcoin/bitcoin#32673: clang-tidy: Apply modernize-deprecated-headers

2025-06-11 15:08:23 -07:00

compat

build: simplify *ifaddr handling

2025-05-08 16:49:58 +01:00

consensus

refactor: Sort includes of touched source files

2025-06-03 19:56:55 +02:00

crc32c

…

crypto

refactor: Sort includes of touched source files

2025-06-03 19:56:55 +02:00

index

index: remove CBlockIndex access from CustomAppend()

2025-06-10 20:22:18 -04:00

init

refactor: Avoid using IsArgSet() on -debug, -loglevel, and -vbparams list options

2025-02-13 12:30:15 -05:00

interfaces

Merge bitcoin/bitcoin#31981: Add checkBlock() to Mining interface

2025-06-18 17:07:21 -07:00

ipc

refactor: modernize deprecated ipc headers

2025-06-19 16:29:55 +02:00

kernel

refactor: Sort includes of touched source files

2025-06-03 19:56:55 +02:00

leveldb

Update leveldb subtree to latest upstream

2025-05-30 16:51:49 +01:00

logging

scripted-diff: modernize outdated trait patterns - values

2025-02-21 10:43:01 +01:00

minisketch

Update minisketch subtree to latest upstream

2025-05-13 18:07:47 +01:00

node

Merge bitcoin/bitcoin#32638: blocks: force hash validations on disk read

2025-06-27 13:28:26 -07:00

policy

policy: uncap datacarrier by default

2025-05-30 10:12:38 -04:00

primitives

tidy: modernize-use-equals-default

2024-07-08 11:12:01 +02:00

qt

Merge bitcoin/bitcoin#32731: depends: Build qt package for FreeBSD hosts

2025-06-26 17:28:59 +01:00

rpc

Merge bitcoin/bitcoin#31981: Add checkBlock() to Mining interface

2025-06-18 17:07:21 -07:00

script

script: Add IsPayToTaproot()

2025-05-14 14:00:43 -07:00

secp256k1

Update secp256k1 subtree to latest master

2025-05-13 11:31:34 +01:00

support

doc: remove For ... comments

2025-05-19 16:40:33 +01:00

test

Merge bitcoin/bitcoin#32646: p2p: Add witness mutation check inside FillBlock

2025-06-30 13:15:37 -04:00

univalue

doc: add & amend copyright headers

2025-05-20 09:43:21 +01:00

util

refactor: Sort includes of touched source files

2025-06-03 19:56:55 +02:00

wallet

Merge bitcoin/bitcoin#32721: wallet, rpc: Remove deprecated balances from getwalletinfo and getunconfirmedbalance

2025-06-25 16:43:09 -04:00

zmq

chore: use std::vector<std::byte> for BlockManager::ReadRawBlock()

2025-06-13 19:19:44 +03:00

.clang-format

…

.clang-tidy

clang-tidy: Apply modernize-deprecated-headers

2025-06-03 15:13:54 +02:00

addrdb.cpp

scripted-diff: Rename PACKAGE_* variables to CLIENT_*

2024-10-28 12:36:19 +00:00

addrdb.h

…

addresstype.cpp

policy: Add OP_1 <0x4e73> as a standard output type

2024-07-30 14:06:58 -04:00

addresstype.h

refactor: deduplicate anchor witness program bytes (0x4e,0x73)

2025-03-23 21:58:39 +01:00

addrman_impl.h

Merge bitcoin/bitcoin#30568: addrman: change internal id counting to int64_t

2024-09-20 12:55:22 -04:00

addrman.cpp

addrman: cap the max_pct to not exceed the maximum number of addresses

2024-11-11 12:47:53 -03:00

addrman.h

addrman: cap the max_pct to not exceed the maximum number of addresses

2024-11-11 12:47:53 -03:00

arith_uint256.cpp

Add a fuzz test for Num3072 multiplication and inversion

2025-01-09 10:11:46 -05:00

arith_uint256.h

arith_uint256: modernize comparison operators

2025-04-07 10:45:13 -04:00

attributes.h

…

banman.cpp

refactor: Delay translation of _() literals

2025-01-14 19:21:37 +01:00

banman.h

doc: remove For ... comments

2025-05-19 16:40:33 +01:00

base58.cpp

clang-tidy: Apply modernize-deprecated-headers

2025-06-03 15:13:54 +02:00

base58.h

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

bech32.cpp

scripted-diff: Bump copyright headers after include changes

2025-06-03 15:13:57 +02:00

bech32.h

scripted-diff: Bump copyright headers after include changes

2025-06-03 15:13:57 +02:00

bip324.cpp

refactor: Sort includes of touched source files

2025-06-03 19:56:55 +02:00

bip324.h

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

bitcoin-chainstate.cpp

refactor: Pass verification_progress into block tip notifications

2025-05-24 13:49:32 +02:00

bitcoin-cli-res.rc

doc, windows: CompanyName "Bitcoin" => "Bitcoin Core project"

2025-06-10 15:14:24 +02:00

bitcoin-cli.cpp

cli: Reject + sign in -netinfo level parsing

2025-05-15 19:48:38 +02:00

bitcoin-res.rc

doc, windows: CompanyName "Bitcoin" => "Bitcoin Core project"

2025-06-10 15:14:24 +02:00

bitcoin-tx-res.rc

doc, windows: CompanyName "Bitcoin" => "Bitcoin Core project"

2025-06-10 15:14:24 +02:00

bitcoin-tx.cpp

bitcoin-tx: Reject + sign in MutateTxDel*

2025-05-17 09:36:25 +02:00

bitcoin-util-res.rc

doc, windows: CompanyName "Bitcoin" => "Bitcoin Core project"

2025-06-10 15:14:24 +02:00

bitcoin-util.cpp

refactor: Use TranslateFn type consistently

2025-01-15 12:15:40 +01:00

bitcoin-wallet-res.rc

doc, windows: CompanyName "Bitcoin" => "Bitcoin Core project"

2025-06-10 15:14:24 +02:00

bitcoin-wallet.cpp

Remove create options from wallet tool

2025-05-09 15:07:04 +02:00

bitcoin.cpp

multiprocess: Add bitcoin wrapper executable

2025-05-12 14:49:17 -04:00

bitcoind-res.rc

doc, windows: CompanyName "Bitcoin" => "Bitcoin Core project"

2025-06-10 15:14:24 +02:00

bitcoind.cpp

refactor: introduce a more general LockDirectories for init

2025-01-16 21:06:21 +00:00

blockencodings.cpp

p2p: Add witness mutation check inside FillBlock

2025-06-10 10:07:56 -04:00

blockencodings.h

p2p: remove vestigial READ_STATUS_CHECKBLOCK_FAILED

2025-06-10 10:07:56 -04:00

blockfilter.cpp

util: Move util/string.h functions to util namespace

2024-05-16 10:16:08 -05:00

blockfilter.h

…

chain.cpp

…

chain.h

Remove checkpoints

2025-03-13 11:13:13 +00:00

chainparams.cpp

test: Reject + sign when parsing regtest deployment params

2025-05-15 22:12:24 +02:00

chainparams.h

…

chainparamsbase.cpp

scripted-diff: Bump copyright headers after include changes

2025-06-03 15:13:57 +02:00

chainparamsbase.h

net, init: derive default onion port if a user specified a -port

2024-11-14 13:41:02 -05:00

chainparamsseeds.h

seeds: update fixed dns seeds

2025-03-06 15:39:58 -06:00

checkqueue.h

validation: use a lock for CCheckQueueControl

2025-05-19 22:06:48 +00:00

clientversion.cpp

doc: update MIT license URL

2025-05-20 09:30:41 +01:00

clientversion.h

windows: Use predefined RC_INVOKED macro instead of custom one

2025-05-29 11:18:36 +01:00

cluster_linearize.h

refactor: Sort includes of touched source files

2025-06-03 19:56:55 +02:00

CMakeLists.txt

windows: Add application manifest to bitcoin.exe

2025-05-28 20:22:00 +01:00

coins.cpp

Merge bitcoin/bitcoin#30906: refactor: prohibit direct flags access in CCoinsCacheEntry and remove invalid tests

2024-12-04 14:09:05 -05:00

coins.h

scripted-diff: Bump copyright headers after include changes

2025-06-03 15:13:57 +02:00

compressor.cpp

…

compressor.h

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

core_io.h

rpc: add getdescriptoractivity

2024-11-26 20:47:08 -05:00

core_memusage.h

…

core_read.cpp

refactor: starts/ends_with changes for clang-tidy 20

2025-04-22 13:16:54 +01:00

core_write.cpp

refactor: Rename CTransaction::nVersion to version

2024-06-07 13:55:23 -04:00

cuckoocache.h

doc: remove For ... comments

2025-05-19 16:40:33 +01:00

dbwrapper.cpp

refactor: Remove manual CDBBatch size estimation

2025-04-07 15:59:41 +02:00

dbwrapper.h

refactor: Remove manual CDBBatch size estimation

2025-04-07 15:59:41 +02:00

deploymentinfo.cpp

scripted-diff: rename gbt_force and gbt_force_name

2025-04-30 14:51:21 +02:00

deploymentinfo.h

scripted-diff: rename gbt_force and gbt_force_name

2025-04-30 14:51:21 +02:00

deploymentstatus.cpp

scripted-diff: modernize outdated trait patterns - types

2025-02-21 10:41:27 +01:00

deploymentstatus.h

versionbits: Simplify VersionBitsCache API

2025-01-21 00:38:03 +10:00

dummywallet.cpp

build, wallet, doc: Remove BDB

2025-05-06 12:21:32 -07:00

external_signer.cpp

refactor: Remove Span operator==, Use std::ranges::equal

2024-08-13 07:44:31 +02:00

external_signer.h

…

flatfile.cpp

scripted-diff: LogPrint -> LogDebug

2024-08-29 13:49:57 +02:00

flatfile.h

refactor: Add FlatFileSeq member variables in BlockManager

2024-07-24 09:39:35 +02:00

hash.cpp

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

hash.h

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

headerssync.cpp

[headerssync] update headerssync config for v29

2025-03-04 14:23:18 -05:00

headerssync.h

doc: remove For ... comments

2025-05-19 16:40:33 +01:00

httprpc.cpp

rpc: Avoid join-split roundtrip for user:pass for auth credentials

2025-05-09 17:07:28 +02:00

httprpc.h

…

httpserver.cpp

Merge bitcoin/bitcoin#32539: init: Configure reachable networks before we start the RPC server

2025-06-06 15:31:36 -07:00

httpserver.h

rpc: increase the defaults for -rpcthreads and -rpcworkqueue

2024-11-04 17:08:21 +01:00

i2p.cpp

refactor: starts/ends_with changes for clang-tidy 20

2025-04-22 13:16:54 +01:00

i2p.h

i2p: log errors properly according to their severity

2024-06-12 16:19:50 -03:00

indirectmap.h

…

init.cpp

chore: use std::vector<std::byte> for BlockManager::ReadRawBlock()

2025-06-13 19:19:44 +03:00

init.h

refactor: introduce a more general LockDirectories for init

2025-01-16 21:06:21 +00:00

key_io.cpp

scripted-diff: Bump copyright headers after include changes

2025-06-03 15:13:57 +02:00

key_io.h

…

key.cpp

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

key.h

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

logging.cpp

log: Enforce trailing newline, Remove redundant m_started_new_line

2024-10-01 11:31:39 +02:00

logging.h

log: Enforce trailing newline, Remove redundant m_started_new_line

2024-10-01 11:31:39 +02:00

mapport.cpp

mapport: make ProcessPCP void

2024-11-04 14:19:40 -05:00

mapport.h

mapport: rename 'use_pcp' to 'enable'

2024-10-29 11:58:51 -04:00

memusage.h

memusage: Add DynamicUsage for std::string

2024-11-04 18:46:40 +01:00

merkleblock.cpp

[clang-tidy] Enable the misc-no-recursion check

2024-04-07 14:04:45 +01:00

merkleblock.h

tidy: modernize-use-equals-default

2024-07-08 11:12:01 +02:00

net_permissions.cpp

util: move fees.h and error.h to common/messages.h

2024-05-16 10:16:08 -05:00

net_permissions.h

scripted-diff: modernize outdated trait patterns - types

2025-02-21 10:41:27 +01:00

net_processing.cpp

Merge bitcoin/bitcoin#32646: p2p: Add witness mutation check inside FillBlock

2025-06-30 13:15:37 -04:00

net_processing.h

refactor: Fix net_processing iwyu includes

2024-11-13 14:09:58 +01:00

net_types.cpp

rpc: avoid copying into UniValue

2024-05-20 16:48:19 +00:00

net_types.h

tidy: modernize-use-equals-default

2024-07-08 11:12:01 +02:00

net.cpp

Merge bitcoin/bitcoin#32466: threading: drop CSemaphore in favor of c++20 std::counting_semaphore

2025-05-20 12:21:17 -07:00

net.h

threading: semaphore: move CountingSemaphoreGrant to its own header

2025-05-10 03:31:30 +00:00

netaddress.cpp

doc: update URLs

2025-06-03 08:09:21 +01:00

netaddress.h

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

netbase.cpp

net: Reject + sign when parsing subnet mask

2025-05-15 22:11:52 +02:00

netbase.h

refactor: Sort includes of touched source files

2025-06-03 19:56:55 +02:00

netgroup.cpp

…

netgroup.h

…

netmessagemaker.h

…

noui.cpp

…

noui.h

…

outputtype.cpp

remove unused GetDestinationForKey

2025-05-15 14:59:03 +02:00

outputtype.h

remove unused GetDestinationForKey

2025-05-15 14:59:03 +02:00

pow.cpp

fuzz: enable running fuzz test cases in Debug mode

2025-04-22 17:11:24 +10:00

pow.h

scripted-diff: Bump copyright headers after include changes

2025-06-03 15:13:57 +02:00

prevector.h

refactor: Remove UB in prevector reverse iterators

2025-05-14 09:35:32 +02:00

protocol.cpp

scripted-diff: get rid of remaining "command" terminology in protocol.{h,cpp}

2024-10-26 23:44:15 +02:00

protocol.h

scripted-diff: get rid of remaining "command" terminology in protocol.{h,cpp}

2024-10-26 23:44:15 +02:00

psbt.cpp

psbt: use sighash type field to determine whether to remove non-witness utxos

2025-05-14 14:00:43 -07:00

psbt.h

psbt: use sighash type field to determine whether to remove non-witness utxos

2025-05-14 14:00:43 -07:00

pubkey.cpp

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

pubkey.h

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

random.cpp

random: Use modern Windows randomness functions

2025-05-14 22:55:10 -07:00

random.h

Merge bitcoin/bitcoin#31519: refactor: Use std::span over Span

2025-03-20 13:41:54 +08:00

randomenv.cpp

build: simplify *ifaddr handling

2025-05-08 16:49:58 +01:00

randomenv.h

…

rest.cpp

scripted-diff: rest: rename strURIPart -> uri_part

2025-06-28 14:59:08 +03:00

rest.h

…

scheduler.cpp

thread-safety: fix annotations with REVERSE_LOCK

2025-06-16 18:09:14 +00:00

scheduler.h

…

semaphore_grant.h

threading: semaphore: move CountingSemaphoreGrant to its own header

2025-05-10 03:31:30 +00:00

serialize.h

refactor: re-enable UBSan implicit-sign-change in serialize.h

2025-05-14 15:41:20 +02:00

signet.cpp

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

signet.h

…

span.h

scripted-diff: Bump copyright headers after std::span changes

2025-03-12 19:46:54 +01:00

streams.cpp

optimization: bulk serialization writes in WriteBlockUndo and WriteBlock

2025-04-14 12:04:06 +02:00

streams.h

chore: use std::vector<std::byte> for BlockManager::ReadRawBlock()

2025-06-13 19:19:44 +03:00

sync.cpp

scripted-diff: modernize outdated trait patterns - values

2025-02-21 10:43:01 +01:00

sync.h

Merge bitcoin/bitcoin#32465: thread-safety: fix annotations with REVERSE_LOCK

2025-06-17 14:12:43 -04:00

threadsafety.h

thread-safety: modernize thread safety macros

2025-05-08 20:13:46 +00:00

tinyformat.h

refactor: Introduce struct to hold a runtime format string

2025-01-15 12:16:08 +01:00

torcontrol.cpp

config: allow setting -proxy per network

2025-05-13 12:09:40 +02:00

torcontrol.h

config: allow setting -proxy per network

2025-05-13 12:09:40 +02:00

txdb.cpp

refactor: Remove manual CDBBatch size estimation

2025-04-07 15:59:41 +02:00

txdb.h

kernel: Move default cache constants to caches

2025-01-15 15:44:55 +01:00

txgraph.cpp

doc: fix typos

2025-06-03 08:09:28 +01:00

txgraph.h

refactor: Sort includes of touched source files

2025-06-03 19:56:55 +02:00

txmempool.cpp

txmempool: fix typos in comments

2024-12-31 00:04:20 -03:00

txmempool.h

txmempool: fix typos in comments

2024-12-31 00:04:20 -03:00

txorphanage.cpp

[fuzz] TxOrphanage::SanityCheck accounting

2025-02-07 13:55:57 -05:00

txorphanage.h

[fuzz] TxOrphanage::SanityCheck accounting

2025-02-07 13:55:57 -05:00

txrequest.cpp

scripted-diff: Bump copyright headers after include changes

2025-06-03 15:13:57 +02:00

txrequest.h

doc: remove For ... comments

2025-05-19 16:40:33 +01:00

uint256.cpp

refactor: Remove SetHexDeprecated

2025-04-09 15:59:59 +01:00

uint256.h

refactor: Remove SetHexDeprecated

2025-04-09 15:59:59 +01:00

undo.h

…

validation.cpp

Merge bitcoin/bitcoin#32638: blocks: force hash validations on disk read

2025-06-27 13:28:26 -07:00

validation.h

Merge bitcoin/bitcoin#31981: Add checkBlock() to Mining interface

2025-06-18 17:07:21 -07:00

validationinterface.cpp

thread-safety: fix annotations with REVERSE_LOCK

2025-06-16 18:09:14 +00:00

validationinterface.h

doc: remove For ... comments

2025-05-19 16:40:33 +01:00

versionbits_impl.h

tests: refactor versionbits fuzz test

2025-01-21 00:38:03 +10:00

versionbits.cpp

scripted-diff: rename gbt_force and gbt_force_name

2025-04-30 14:51:21 +02:00

versionbits.h

scripted-diff: rename gbt_force and gbt_force_name

2025-04-30 14:51:21 +02:00

walletinitinterface.h

tidy: modernize-use-equals-default

2024-07-08 11:12:01 +02:00