merge-script 1e64aeaaec

Merge bitcoin/bitcoin#34295: test: Improve STRICTENC/DERSIG unit tests ...

4dfb6eef70d719a79904cabc4519d7a725de130a test: Add DERSIG tests to script_tests (billymcbip)
884978f3894ac7d96f113a00bbcce45c9785d44a test: Fix a STRICTENC test in script_tests (billymcbip)
527e8ca7b54515e129484824e4df66b5dafdb45f test: Remove outdated comment in script_tests (billymcbip)

Pull request description:

  1. Remove a comment referencing a file that no longer exists in the codebase: `script_invalid.json`.

  2. Fix a test that isn't implemented as intended. The idea is to test execution order by providing a signature that would cause script failure when parsed. An empty signature does not cause script failure in `CHECKMULTISIG`. Use `OP_1` for the second signature instead of `OP_0`.

  3. Copy existing `STRICTENC` tests and change the flag to `DERSIG`. `DERSIG` is a consensus flag (unlike `STRICTENC`), so it'd be good to have dedicated test cases.

  `script_tests` pass on my end.

ACKs for top commit:
  darosior:
    reACK 4dfb6eef70d719a79904cabc4519d7a725de130a
  sipa:
    ACK 4dfb6eef70d719a79904cabc4519d7a725de130a

Tree-SHA512: aea4aa5199530804561e9f597f69d6cffd7a40d4830919f9371fe97e4d04d8f10e8ed29b91e65e007a3f6e3a38e2881f88dff25831e741ad7592a12ed02b801a

2026-02-04 09:37:56 +00:00

..

bench

Merge bitcoin/bitcoin#32420: mining, ipc: omit dummy extraNonce from coinbase

2026-02-02 15:21:16 -08:00

common

Merge bitcoin/bitcoin#34328: rpc: make uptime monotonic across NTP jumps

2026-01-27 13:26:43 +01:00

compat

Merge bitcoin/bitcoin#34090: net: Fix -Wmissing-braces

2026-01-22 12:39:52 +01:00

consensus

Merge bitcoin/bitcoin#32497: merkle: pre‑reserve leaves to prevent reallocs with odd vtx count

2026-01-20 15:47:17 -08:00

crc32c

Update crc32c subtree to latest upstream master

2025-08-07 09:27:25 +01:00

crypto

iwyu: Add temporary mapping to work around upstream bug

2026-01-30 11:50:17 +00:00

index

iwyu: Add temporary mapping to work around upstream bug

2026-01-30 11:50:17 +00:00

init

log: Print warning about privacy-sensitive log info unconditionally

2026-01-27 13:08:50 +01:00

interfaces

Merge bitcoin/bitcoin#34276: Remove empty caption from user interface (noui, gui)

2026-01-28 13:43:56 +01:00

ipc

Merge bitcoin/bitcoin#34363: Update libmultiprocess subtree to avoid occasional rpc_misc.py timeout

2026-01-21 15:07:23 +00:00

kernel

Merge bitcoin/bitcoin#34253: validation: cache tip recency for lock-free IsInitialBlockDownload()

2026-01-29 11:51:41 +01:00

leveldb

Bump leveldb subtree

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

logging

scripted-diff: [doc] Unify stale copyright headers

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

minisketch

Update minisketch subtree to latest upstream

2025-10-13 12:33:23 +01:00

node

Merge bitcoin/bitcoin#32420: mining, ipc: omit dummy extraNonce from coinbase

2026-02-02 15:21:16 -08:00

policy

fees: make flushes log debug only

2026-02-03 13:53:41 +00:00

primitives

Merge bitcoin/bitcoin#34352: ci, iwyu: Fix warnings in src/primitives and treat them as errors

2026-01-28 17:08:34 +01:00

qt

refactor: Remove remaining std::bind, check via clang-tidy

2026-01-28 14:44:22 +01:00

rpc

Merge bitcoin/bitcoin#32420: mining, ipc: omit dummy extraNonce from coinbase

2026-02-02 15:21:16 -08:00

script

Merge bitcoin/bitcoin#34433: script: remove unused SCRIPT_ERR_LAST

2026-02-02 08:16:43 +01:00

secp256k1

Update secp256k1 subtree to latest master

2026-02-02 15:21:14 +00:00

support

coins: replace std::distance with unambiguous pointer subtraction

2026-01-20 15:35:19 +01:00

test

Merge bitcoin/bitcoin#34295: test: Improve STRICTENC/DERSIG unit tests

2026-02-04 09:37:56 +00:00

univalue

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

2026-01-31 10:41:50 +00:00

util

Merge bitcoin/bitcoin#33878: refactor, docs: Embedded ASMap [2/3]: Refactor asmap internals and add documentation

2026-02-02 18:22:31 +01:00

wallet

Merge bitcoin/bitcoin#33701: test: add case where TOTAL_TRIES is exceeded yet solution remains

2026-01-30 18:26:07 -08:00

zmq

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

2026-01-29 14:38:35 +00:00

.clang-format

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

2026-01-29 14:38:35 +00:00

.clang-tidy

refactor: Remove remaining std::bind, check via clang-tidy

2026-01-28 14:44:22 +01:00

addrdb.cpp

log: Properly log warnings with warn loglevel in addrdb

2025-07-10 11:24:40 +02:00

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

refactor: Enforce readability-avoid-const-params-in-decls

2026-01-14 23:04:12 +01:00

addrman.cpp

refactor: Unify asmap version calculation and naming

2026-01-20 23:45:29 +01:00

addrman.h

refactor: Enforce readability-avoid-const-params-in-decls

2026-01-14 23:04:12 +01:00

arith_uint256.cpp

scripted-diff: [doc] Unify stale copyright headers

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

arith_uint256.h

refactor(headerssync): Extract test constants ahead of breakup into functions

2025-09-12 22:28:41 +02:00

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: Add Handle/View pattern for BlockValidationState

2026-01-21 19:40:25 +05:30

bitcoin-cli-res.rc

…

bitcoin-cli.cpp

Merge bitcoin/bitcoin#29415: Broadcast own transactions only via short-lived Tor or I2P connections

2026-01-12 15:02:14 -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

Remove no longer necessary WinCmdLineArgs class

2025-10-06 19:41:35 +01:00

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

log,blocks: avoid ComputeTotalSize and GetHash work when logging is disabled

2026-01-19 20:20:13 +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

Merge bitcoin/bitcoin#32740: refactor: Header sync optimisations & simplifications

2026-01-14 11:38:07 -08:00

chain.h

Merge bitcoin/bitcoin#34253: validation: cache tip recency for lock-free IsInitialBlockDownload()

2026-01-29 11:51:41 +01:00

chainparams.cpp

scripted-diff: [doc] Unify stale copyright headers

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

chainparams.h

refactor: Enforce readability-avoid-const-params-in-decls

2026-01-14 23:04:12 +01:00

chainparamsbase.cpp

…

chainparamsbase.h

refactor: Enforce readability-avoid-const-params-in-decls

2026-01-14 23:04:12 +01:00

chainparamsseeds.h

contrib: update fixed seeds

2025-09-03 11:23:30 +01:00

checkqueue.h

scripted-diff: [doc] Unify stale copyright headers

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

clientversion.cpp

refactor: Avoid -W*-whitespace in git archive

2025-11-13 09:33:36 +01:00

clientversion.h

scripted-diff: [doc] Unify stale copyright headers

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

cluster_linearize.h

clusterlin: minimize chunks (feature)

2026-01-12 17:38:30 -05:00

CMakeLists.txt

Squashed 'src/secp256k1/' changes from 14e56970cb..57315a6985

2026-02-02 15:21:14 +00:00

coins.cpp

Merge bitcoin/bitcoin#34164: validation: add reusable coins view for ConnectBlock

2026-01-29 14:59:36 -08:00

coins.h

Merge bitcoin/bitcoin#34164: validation: add reusable coins view for ConnectBlock

2026-01-29 14:59:36 -08:00

compressor.cpp

scripted-diff: [doc] Unify stale copyright headers

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

compressor.h

…

core_io.cpp

Merge bitcoin/bitcoin#33738: log: avoid collecting GetSerializeSize data when compact block logging is disabled

2026-01-20 15:41:30 -08:00

core_io.h

refactor: [move-only] Merge core_io module

2026-01-19 12:57:16 +01:00

core_memusage.h

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

refactor: Enforce readability-avoid-const-params-in-decls

2026-01-14 23:04:12 +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

refactor: Avoid copies by using const references or by move-construction

2026-01-14 23:03:47 +01:00

external_signer.h

refactor: Enforce readability-avoid-const-params-in-decls

2026-01-14 23:04:12 +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

refactor: Use reference for chain_start in HeadersSyncState

2025-11-20 11:34:21 +09:00

headerssync.h

refactor: Use reference for chain_start in HeadersSyncState

2025-11-20 11:34:21 +09:00

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

Merge bitcoin/bitcoin#34276: Remove empty caption from user interface (noui, gui)

2026-01-28 13:43:56 +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#33878: refactor, docs: Embedded ASMap [2/3]: Refactor asmap internals and add documentation

2026-02-02 18:22:31 +01: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

Merge bitcoin/bitcoin#29675: wallet: Be able to receive and spend inputs involving MuSig2 aggregate keys

2025-10-14 16:25:52 -04:00

key.h

sign: Add CreateMuSig2PartialSig

2025-09-30 11:06:43 -07:00

logging.cpp

Merge bitcoin/bitcoin#29415: Broadcast own transactions only via short-lived Tor or I2P connections

2026-01-12 15:02:14 -05:00

logging.h

Merge bitcoin/bitcoin#29415: Broadcast own transactions only via short-lived Tor or I2P connections

2026-01-12 15:02:14 -05: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#32740: refactor: Header sync optimisations & simplifications

2026-01-14 11:38:07 -08:00

merkleblock.h

scripted-diff: [doc] Unify stale copyright headers

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

musig.cpp

musig: Move MUSIG_CHAINCODE to musig.cpp

2025-11-24 18:48:43 +01:00

musig.h

musig: Move MUSIG_CHAINCODE to musig.cpp

2025-11-24 18:48:43 +01:00

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#33604: p2p: Allow block downloads from peers without snapshot block after assumeutxo validation

2026-01-29 15:11:04 -08:00

net_processing.h

refactor: Enforce readability-avoid-const-params-in-decls

2026-01-14 23:04:12 +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#34276: Remove empty caption from user interface (noui, gui)

2026-01-28 13:43:56 +01:00

net.h

Merge bitcoin/bitcoin#34302: fuzz: Restore SendMessages coverage in process_message(s) fuzz targets

2026-01-20 16:45:18 +01:00

netaddress.cpp

refactor: increase string_view usage

2025-10-02 12:53:55 +01:00

netaddress.h

refactor: Enforce readability-avoid-const-params-in-decls

2026-01-14 23:04:12 +01:00

netbase.cpp

Modernize GetBindAddress()

2026-01-22 10:35:14 -05:00

netbase.h

Merge bitcoin/bitcoin#34242: Prepare string and net utils for future HTTP operations

2026-01-23 13:25:42 +01:00

netgroup.cpp

refactor: Use span instead of vector for data in util/asmap

2026-01-20 23:59:41 +01:00

netgroup.h

refactor: Use span instead of vector for data in util/asmap

2026-01-20 23:59:41 +01:00

netmessagemaker.h

scripted-diff: [doc] Unify stale copyright headers

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

noui.cpp

noui: Remove always empty caption while formatting

2026-01-14 19:39:01 +01:00

noui.h

refactor: Remove empty caption from ThreadSafeMessageBox

2026-01-14 19:36:14 +01:00

outputtype.cpp

refactor: increase string_view usage

2025-10-02 12:53:55 +01:00

outputtype.h

refactor: increase string_view usage

2025-10-02 12:53:55 +01:00

pow.cpp

scripted-diff: [doc] Unify stale copyright headers

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

pow.h

refactor: Enforce readability-avoid-const-params-in-decls

2026-01-14 23:04:12 +01:00

prevector.h

refactor: Prefer <=> over multiple relational operators

2025-11-03 14:39:50 +01:00

private_broadcast.cpp

net_processing: retry private broadcast

2025-12-16 17:53:50 +01:00

private_broadcast.h

net_processing: retry private broadcast

2025-12-16 17:53:50 +01:00

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: Avoid copies by using const references or by move-construction

2026-01-14 23:03:47 +01:00

psbt.h

refactor: Avoid copies by using const references or by move-construction

2026-01-14 23:03:47 +01:00

pubkey.cpp

pubkey: Return tweaks from BIP32 derivation

2025-09-30 11:06:09 -07:00

pubkey.h

refactor: Remove all operator!= definitions

2025-11-03 14:39:48 +01:00

random.cpp

log: [refactor] Use info level for init logs

2025-07-25 09:50:50 +02:00

random.h

refactor: Enforce readability-avoid-const-params-in-decls

2026-01-14 23:04:12 +01:00

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

refactor: Return uint64_t from GetSerializeSize

2025-10-30 17:51:53 +01:00

signet.cpp

Merge bitcoin/bitcoin#32497: merkle: pre‑reserve leaves to prevent reallocs with odd vtx count

2026-01-20 15:47:17 -08:00

signet.h

kernel: Remove some unnecessary non-kernel includes

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

span.h

…

streams.cpp

refactor: Add AutoFile::size

2025-11-14 01:17:38 +02:00

streams.h

refactor: Add AutoFile::size

2025-11-14 01:17:38 +02:00

sync.cpp

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

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

sync.h

doc: Fix wrong code in WITH_LOCK doxygen comment

2026-01-21 14:51:12 +01:00

threadsafety.h

scripted-diff: [doc] Unify stale copyright headers

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

tinyformat.h

…

torcontrol.cpp

refactor: Use std::bind_front over std::bind

2026-01-20 15:30:46 +01:00

torcontrol.h

scripted-diff: [doc] Unify stale copyright headers

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

txdb.cpp

txdb: assert CCoinsViewDB::GetCoin only returns unspent coins

2026-01-06 12:16:45 +01:00

txdb.h

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

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

txgraph.cpp

clusterlin: minimize chunks (feature)

2026-01-12 17:38:30 -05:00

txgraph.h

txgraph: drop move assignment operator

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

txmempool.cpp

Rework CTxMemPool::GetChildren() to not use epochs

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

txmempool.h

Rework CTxMemPool::GetChildren() to not use epochs

2026-01-22 21:51:13 -05: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

refactor: Remove all operator!= definitions

2025-11-03 14:39:48 +01:00

undo.h

scripted-diff: [doc] Unify stale copyright headers

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

validation.cpp

Merge bitcoin/bitcoin#34179: refactor: Enable transparent lookup for setBlockIndexCandidates to remove const_cast

2026-02-02 08:49:02 +01:00

validation.h

Merge bitcoin/bitcoin#34443: validation: follow-up nits for lock-free IsInitialBlockDownload()

2026-02-02 07:57:34 +01: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