merge-script d9c7364ac5 Merge bitcoin/bitcoin#34141: miniscript: Use Func and Expr when parsing keys, hashes, and locktimes ...

4b53cbd692 test: Test for musig() in various miniscript expressions (Ava Chow)
ec0f47b15c miniscript: Using Func and Expr when parsing keys, hashes, and locktimes (Ava Chow)
6fd780d4fb descriptors: Increment key_exp_index in ParsePubkey(Inner) (Ava Chow)
b12281bd86 miniscript: Use a reference to key_exp_index in KeyParser (Ava Chow)
ce4c66eb7c test: Test that key expression indexes match key count (Ava Chow)

Pull request description:

  The miniscript parser currently only looks for the next `)` when parsing key, hash, and locktime expressions. This fails to parse when the expressions contain a nested expression. Currently, this is only possible with `musig()` inside of key expressions. However, this pattern can be generalized to handling hashes and locktimes, so I implemented those too.

  Fixes #34076

ACKs for top commit:
  rkrux:
    ACK 4b53cbd692
  sipa:
    ACK 4b53cbd692
  darosior:
    Other than that, Approach ACK 4b53cbd692. That makes sense to me but i have not closely reviewed the code.

Tree-SHA512: 01040c7b07a59d8e3725ff11ab9543b256aea22535fb94059f490a5bb45319e859666af04c2f0a4edcb8cf1e6dfc7bd8a8271b21ad81143bafccd4d0a39cae9c

2026-02-21 12:18:56 +01:00

..

util

txgraph: initialize Ref in AddTransaction (preparation)

2026-02-09 15:55:55 -05:00

addition_overflow.cpp

scripted-diff: [doc] Unify stale copyright headers

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

addrman.cpp

fuzz: Return chrono point from ConsumeTime(), Add ConsumeDuration()

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

asmap_direct.cpp

refactor: Simplify Interpret asmap function

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

asmap.cpp

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

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

autofile.cpp

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

base_encode_decode.cpp

scripted-diff: [doc] Unify stale copyright headers

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

bech32.cpp

lint: Check for missing trailing newline

2025-05-13 15:50:02 +02:00

bip324.cpp

…

bitdeque.cpp

scripted-diff: [doc] Unify stale copyright headers

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

bitset.cpp

…

block_header.cpp

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

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

block_index_tree.cpp

validation: remove BLOCK_FAILED_MASK

2026-02-17 21:40:46 +05:30

block_index.cpp

scripted-diff: [doc] Unify stale copyright headers

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

block.cpp

refactor: Use SpanReader over DataStream

2026-02-06 07:56:57 +01:00

blockfilter.cpp

scripted-diff: [doc] Unify stale copyright headers

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

bloom_filter.cpp

scripted-diff: [doc] Unify stale copyright headers

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

buffered_file.cpp

scripted-diff: [doc] Unify stale copyright headers

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

chain.cpp

validation: remove BLOCK_FAILED_MASK

2026-02-17 21:40:46 +05:30

checkqueue.cpp

scripted-diff: [doc] Unify stale copyright headers

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

cluster_linearize.cpp

clusterlin: avoid depgraph argument in SanityCheck (cleanup)

2026-02-17 09:04:36 -05:00

CMakeLists.txt

fuzz: add test case for threadpool

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

coins_view.cpp

Merge bitcoin/bitcoin#34165: coins: don't mutate main cache when connecting block

2026-02-19 22:10:41 -05:00

coinscache_sim.cpp

coins: introduce CoinsViewOverlay

2026-02-12 21:31:23 -05:00

connman.cpp

scripted-diff: [doc] Unify stale copyright headers

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

crypto_aes256.cpp

scripted-diff: [doc] Unify stale copyright headers

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

crypto_aes256cbc.cpp

scripted-diff: [doc] Unify stale copyright headers

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

crypto_chacha20.cpp

…

crypto_chacha20poly1305.cpp

…

crypto_common.cpp

scripted-diff: [doc] Unify stale copyright headers

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

crypto_diff_fuzz_chacha20.cpp

scripted-diff: [doc] Unify stale copyright headers

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

crypto_hkdf_hmac_sha256_l32.cpp

scripted-diff: [doc] Unify stale copyright headers

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

crypto_poly1305.cpp

scripted-diff: [doc] Unify stale copyright headers

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

crypto.cpp

scripted-diff: [doc] Unify stale copyright headers

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

cuckoocache.cpp

scripted-diff: [doc] Unify stale copyright headers

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

decode_tx.cpp

scripted-diff: [doc] Unify stale copyright headers

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

descriptor_parse.cpp

test: Test that key expression indexes match key count

2026-02-02 15:20:47 -08:00

deserialize.cpp

refactor: Use SpanReader over DataStream

2026-02-06 07:56:57 +01:00

difference_formatter.cpp

scripted-diff: [doc] Unify stale copyright headers

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

eval_script.cpp

scripted-diff: [doc] Unify stale copyright headers

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

fee_rate.cpp

Refactor CFeeRate to use FeeFrac internally

2025-07-07 10:39:45 +02:00

feefrac.cpp

scripted-diff: [doc] Unify stale copyright headers

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

feeratediagram.cpp

clang-tidy: Apply modernize-deprecated-headers

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

fees.cpp

wallet, rpc:remove settxfee and paytxfee

2026-02-13 10:52:25 +01:00

flatfile.cpp

scripted-diff: [doc] Unify stale copyright headers

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

float.cpp

…

fuzz.cpp

fuzz: doc: remove any mention to address_deserialize_v2

2025-12-17 11:57:11 -03:00

fuzz.h

scripted-diff: [doc] Unify stale copyright headers

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

FuzzedDataProvider.h

fuzz: pull latest FuzzedDataProvider.h from upstream

2026-01-31 08:45:10 +03:00

golomb_rice.cpp

scripted-diff: [doc] Unify stale copyright headers

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

headerssync.cpp

fuzz: Use min option in ConsumeTime

2026-01-16 11:00:58 +01:00

hex.cpp

refactor: Move transaction_identifier.h to primitives

2025-08-11 16:47:51 +01:00

http_request.cpp

scripted-diff: [doc] Unify stale copyright headers

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

i2p.cpp

net: Fix -Wmissing-braces

2025-12-17 16:54:35 +00:00

integer.cpp

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

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

key_io.cpp

scripted-diff: [doc] Unify stale copyright headers

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

key.cpp

policy: uncap datacarrier by default

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

kitchen_sink.cpp

scripted-diff: [doc] Unify stale copyright headers

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

load_external_block_file.cpp

scripted-diff: [doc] Unify stale copyright headers

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

locale.cpp

scripted-diff: [doc] Unify stale copyright headers

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

merkle.cpp

scripted-diff: [doc] Unify stale copyright headers

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

merkleblock.cpp

scripted-diff: [doc] Unify stale copyright headers

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

message.cpp

scripted-diff: [doc] Unify stale copyright headers

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

mini_miner.cpp

scripted-diff: rename AddToMempool -> TryAddToMempool

2025-11-30 10:57:48 -05:00

miniscript.cpp

miniscript: Using Func and Expr when parsing keys, hashes, and locktimes

2026-02-02 15:20:51 -08:00

minisketch.cpp

scripted-diff: [doc] Unify stale copyright headers

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

muhash.cpp

refactor: Revert "disable self-assign warning for tests"

2025-10-09 20:47:25 +02:00

multiplication_overflow.cpp

scripted-diff: [doc] Unify stale copyright headers

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

net_permissions.cpp

scripted-diff: [doc] Unify stale copyright headers

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

net.cpp

scripted-diff: [doc] Unify stale copyright headers

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

netaddress.cpp

scripted-diff: [doc] Unify stale copyright headers

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

netbase_dns_lookup.cpp

scripted-diff: [doc] Unify stale copyright headers

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

node_eviction.cpp

scripted-diff: [doc] Unify stale copyright headers

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

overflow.cpp

…

p2p_handshake.cpp

Merge bitcoin/bitcoin#34181: refactor: [p2p] Make ProcessMessage private again, Use references when non-null

2026-02-06 17:10:25 -08:00

p2p_headers_presync.cpp

Merge bitcoin/bitcoin#34181: refactor: [p2p] Make ProcessMessage private again, Use references when non-null

2026-02-06 17:10:25 -08:00

p2p_transport_serialization.cpp

…

package_eval.cpp

[miner] omit dummy extraNonce via IPC

2026-01-27 14:45:35 +01:00

parse_hd_keypath.cpp

scripted-diff: [doc] Unify stale copyright headers

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

parse_iso8601.cpp

…

parse_numbers.cpp

scripted-diff: [doc] Unify stale copyright headers

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

parse_script.cpp

scripted-diff: [doc] Unify stale copyright headers

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

parse_univalue.cpp

…

partially_downloaded_block.cpp

refactor: unify container presence checks - trivial counts

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

pcp.cpp

scripted-diff: [doc] Unify stale copyright headers

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

policy_estimator_io.cpp

scripted-diff: [doc] Unify stale copyright headers

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

policy_estimator.cpp

Merge bitcoin/bitcoin#33629: Cluster mempool

2025-11-25 10:35:11 +00:00

poolresource.cpp

…

pow.cpp

scripted-diff: [doc] Unify stale copyright headers

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

prevector.cpp

scripted-diff: [doc] Unify stale copyright headers

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

primitives_transaction.cpp

scripted-diff: [doc] Unify stale copyright headers

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

process_message.cpp

Merge bitcoin/bitcoin#34511: test: fully reset the state of CConnman in tests

2026-02-13 11:17:26 +00:00

process_messages.cpp

Merge bitcoin/bitcoin#34511: test: fully reset the state of CConnman in tests

2026-02-13 11:17:26 +00:00

protocol.cpp

scripted-diff: [doc] Unify stale copyright headers

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

psbt.cpp

scripted-diff: [doc] Unify stale copyright headers

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

random.cpp

scripted-diff: [doc] Unify stale copyright headers

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

rbf.cpp

Merge bitcoin/bitcoin#33985: fuzz: gate mempool entry based on weight

2025-12-02 15:07:01 +00:00

rolling_bloom_filter.cpp

scripted-diff: [doc] Unify stale copyright headers

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

rpc.cpp

rpc: Add abortprivatebroadcast

2026-02-11 19:46:19 -05:00

script_assets_test_minimizer.cpp

scripted-diff: [doc] Unify stale copyright headers

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

script_descriptor_cache.cpp

scripted-diff: [doc] Unify stale copyright headers

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

script_flags.cpp

refactor: Use SpanReader over DataStream

2026-02-06 07:56:57 +01:00

script_format.cpp

scripted-diff: [doc] Unify stale copyright headers

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

script_interpreter.cpp

scripted-diff: [doc] Unify stale copyright headers

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

script_ops.cpp

scripted-diff: [doc] Unify stale copyright headers

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

script_parsing.cpp

…

script_sigcache.cpp

scripted-diff: [doc] Unify stale copyright headers

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

script_sign.cpp

scripted-diff: [doc] Unify stale copyright headers

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

script.cpp

scripted-diff: [doc] Unify stale copyright headers

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

scriptnum_ops.cpp

scripted-diff: [doc] Unify stale copyright headers

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

secp256k1_ec_seckey_import_export_der.cpp

scripted-diff: [doc] Unify stale copyright headers

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

secp256k1_ecdsa_signature_parse_der_lax.cpp

scripted-diff: [doc] Unify stale copyright headers

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

signature_checker.cpp

script/verify_flags: make script_verify_flags type safe

2025-08-14 10:17:32 +10:00

signet.cpp

scripted-diff: [doc] Unify stale copyright headers

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

socks5.cpp

scripted-diff: [doc] Unify stale copyright headers

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

span.cpp

…

string.cpp

refactor: fees: split fee rate format from fee estimate mode

2026-02-11 15:48:00 +00:00

strprintf.cpp

scripted-diff: [doc] Unify stale copyright headers

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

system.cpp

scripted-diff: [doc] Unify stale copyright headers

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

threadpool.cpp

threadpool: make Submit return Expected instead of throwing

2026-02-17 15:02:40 -05:00

timeoffsets.cpp

…

torcontrol.cpp

scripted-diff: [doc] Unify stale copyright headers

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

transaction.cpp

refactor: Use SpanReader over DataStream

2026-02-06 07:56:57 +01:00

tx_in.cpp

refactor: Use SpanReader over DataStream

2026-02-06 07:56:57 +01:00

tx_out.cpp

refactor: Use SpanReader over DataStream

2026-02-06 07:56:57 +01:00

tx_pool.cpp

[miner] omit dummy extraNonce via IPC

2026-01-27 14:45:35 +01:00

txdownloadman.cpp

scripted-diff: [doc] Unify stale copyright headers

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

txgraph.cpp

txgraph: use fallback order to sort chunks (feature)

2026-02-09 15:55:58 -05:00

txorphan.cpp

refactor: unify container presence checks - trivial counts

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

txrequest.cpp

scripted-diff: [doc] Unify stale copyright headers

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

util.cpp

fuzz: Return chrono point from ConsumeTime(), Add ConsumeDuration()

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

util.h

Merge bitcoin/bitcoin#34483: refactor: Use SpanReader over DataStream

2026-02-06 18:00:18 -08:00

utxo_snapshot.cpp

Merge bitcoin/bitcoin#33680: validation: do not wipe utxo cache for stats/scans/snapshots

2026-01-29 14:43:27 -08:00

utxo_total_supply.cpp

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

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

validation_load_mempool.cpp

scripted-diff: [doc] Unify stale copyright headers

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

vecdeque.cpp

refactor: Sort includes of touched source files

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

versionbits.cpp

scripted-diff: [doc] Unify stale copyright headers

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