From f26b5ee295c4607e923483ab65f4e59cd94d3040 Mon Sep 17 00:00:00 2001 From: Chris Guida Date: Tue, 13 Oct 2026 20:24:18 -0600 Subject: [PATCH] knots-next-29: 29.4.3rc1 with k429 at its current head, k445, k444, k443, k459, k319, k422 --- knots-next-28.spec | 21 +++++++++++++++++++-- knots-next-29.spec | 22 ++++++++++++++++++++-- knots-next.spec | 22 ++++++++++++++++++++-- 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/knots-next-28.spec b/knots-next-28.spec index 888c151..ae48035 100644 --- a/knots-next-28.spec +++ b/knots-next-28.spec @@ -747,6 +747,9 @@ NM 32187 zmq_devirtual_destructor-0.12 # Backport of #33553, without log/alert message changes #28.xTODO# "Knots feature request: system notification for a txn should show the net wallet balance delta assuming the txn confirms, not whatever it does now that gives me a heart attack every time I use a large-ish UTXO lol" -Jason (currently only the first send of a sendmany is shown) https://github.com/bitcoin-core/gui/issues/853 # TODO: prunenotify to run a command after each prune (eg, for fstrim or such) + k445 chrisguida/fuzz_spkm_migration-29 last=f9cba55ad70 + # Backport of #32624 + #32977 commit ba015852298; fixes the spkm_migration fuzz UAF that fails CI on k429 + # Needs review: k443 chrisguida/dumptxoutset-rollback-copy (rebased for 29.x onto compat_rpc_dumptxoutset_hr; needs its own base here) # FIXME: How to unify listtransactions and GUI tx list? GUI has net changes, while RPC just has positive fees # FIXME: watchonly indicator is confusing. @@ -1794,6 +1797,13 @@ MERGED 31407 macos_notarization-28 530a83a27bf last=e181bda061c achow101/mac k292 Retropex/rework-opnet # TODO? Dust multiplier by # of outputs: https://x.com/snapolino/status/1976708308603224518 # Non-upstreamed Knots compatibility: + k319 privkeyio/fix-bip110-envelope-datacarrier last=5e3153edef4 + # count bare data envelopes (OP_2DROP/pushnum runs) as datacarrier; jasonsopko approved; base of k422 + k422 privkeyio/policy-unproven-pubkey-datacarrier last=eea24673b4d + # count pubkeys no signature can prove as datacarrier bytes, incl. tapscript keys; jasonsopko approved; contains the k319 commits; eea24673b4d = 177e5cad729 + the two CI fixes (MSVC narrowing, UBSan test helper) + # Needs review: k389 jasonsopko/policy-fake-outputs (data in output hashes and keys; rooted on the 29.4.2 tip, needs a rebased copy) + # Needs review: k400 jasonsopko/policy-dead-branch-data (data in a dead conditional branch; rooted on the 29.4.2 tip, needs a rebased copy) + # Needs review: k457 privkeyio/datacarrier_reject_type-29+knots (TX_NOT_STANDARD for datacarrier rejections) n/a rpc_compat_error_index-25+knots 1ebc7d004d3 # Compatibility with 0.19.0-0.21.0 bech32_error_detection - compat_jsonrpc_weirdversions-28 d50d30bf835 last=6cada87972f @@ -1886,14 +1896,21 @@ MERGED 31407 macos_notarization-28 530a83a27bf last=e181bda061c achow101/mac k385 pow_hf_blake2b_params k420 difficulty_blake2b k419 tsf_longmaturity - k429 chrisguida/long-coinbase-maturity-rdts-expiry-29+knots last=a049372c27f + k429 chrisguida/long-coinbase-maturity-rdts-expiry-29+knots last=6d1b0706a83 + # since a049372c27f: Luke's round-2 items, fuzz UAF fix (the backport is k445), policy hold limited to covered coins (jasonsopko) k425 privkeyio/fix_pow_boundary_sync+nofork last=fd186ab21a9 fix_pow_boundary_sync # + sync headers from legacy peers when BLAKE2b is not scheduled + k459 chrisguida/rdts-testnet4-extension-k429-29+knots last=f4d49816516 chrisguida/rdts-testnet4-extension-29+knots + # testnet4: RDTS expiry extended to 2027-04-01 retroactively (chainstate revalidation from 152963); keeps k429 a softfork on 29.4.2 on testnet4 + # copy of the PR commit rebased onto k429's head with k425 merged in (k425 edits the line above the testnet4 expiry; k429 rewrote the revalidation-deployment test, so the test lookup is adapted) k398 privkeyio/blake2b-outbound-slot-preference last=b947864cb45 - k394 privkeyio/seeds_blake2b-29+knots last=44571c691dc jasonsopko/seeds-blake2b + k394 privkeyio/seeds_blake2b-29+knots last=8e50d772c1a jasonsopko/seeds-blake2b # + keep the cjdns seeds and the testnet4 fixed seeds + # 8e50d772c1a restores the testnet4 and cjdns fixed seeds in the PR itself (the same fix the privkeyio copy carries) k437 privkeyio/dnsseed_lionpool-29+knots last=e76eaac5bdf LionThunderFingers/chainparams-add-lionseed # Pre-BRANDING: (might need to be part of F patch to eliminate binary files) + k444 chrisguida/assumeutxo-976000-29+knots last=6ce57028d6c chrisguida/assumeutxo-976000 + # assumeutxo snapshot at 976000 (first entry past the BLAKE2b fork); approved by luke-jr and kwsantiago; copy of the PR branch rebased onto the k385 merge (the PR branch is rooted on the 29.4.2 tip) n/a (delete_release_notes_fragments) d4c1e555559 Triage: 34808 hebasto/260311-qt-ts-source 7483 svg_icon-28+knots 5b18d9e534b last=cd64df8af62 svg_icon-29.3+knots diff --git a/knots-next-29.spec b/knots-next-29.spec index b50da18..49c49a0 100644 --- a/knots-next-29.spec +++ b/knots-next-29.spec @@ -651,6 +651,8 @@ TM 35209 fix_precomptxdata_lifetime_CVE_2024_52911-27 da7a2310746 # Backport of #33553, without log/alert message changes #30.xTODO# "Knots feature request: system notification for a txn should show the net wallet balance delta assuming the txn confirms, not whatever it does now that gives me a heart attack every time I use a large-ish UTXO lol" -Jason (currently only the first send of a sendmany is shown) https://github.com/bitcoin-core/gui/issues/853 # TODO: prunenotify to run a command after each prune (eg, for fstrim or such) + k445 chrisguida/fuzz_spkm_migration-29 last=f9cba55ad70 + # Backport of #32624 + #32977 commit ba015852298; fixes the spkm_migration fuzz UAF that fails CI on k429 # FIXME: How to unify listtransactions and GUI tx list? GUI has net changes, while RPC just has positive fees # FIXME: watchonly indicator is confusing. @@ -1658,9 +1660,18 @@ NM 14137 win_taskbar_progress ca96c2575ea last=18eb4dbb8a # 386e285943d (rebase on c79ee09a786 needed) # c79ee09a786 RPC/Wallet: Add "require_replacable" option to bumpfee method, to match previous behaviour # 1f1259d318d GUI/Wallet: Warn if bumping the fee on a non-BIP125 transaction + k319 privkeyio/fix-bip110-envelope-datacarrier last=5e3153edef4 + # count bare data envelopes (OP_2DROP/pushnum runs) as datacarrier; jasonsopko approved; base of k422 + k422 privkeyio/policy-unproven-pubkey-datacarrier last=eea24673b4d + # count pubkeys no signature can prove as datacarrier bytes, incl. tapscript keys; jasonsopko approved; contains the k319 commits; eea24673b4d = 177e5cad729 + the two CI fixes (MSVC narrowing, UBSan test helper) + # Needs review: k389 jasonsopko/policy-fake-outputs (data in output hashes and keys; rooted on the 29.4.2 tip, needs a rebased copy) + # Needs review: k400 jasonsopko/policy-dead-branch-data (data in a dead conditional branch; rooted on the 29.4.2 tip, needs a rebased copy) + # Needs review: k457 privkeyio/datacarrier_reject_type-29+knots (TX_NOT_STANDARD for datacarrier rejections) - compat_rpc_dumptxoutset_hr 3418537d61c # FIXME: 'type' param attempts to parse as JSON ? (with 28.x bitcoin-cli tho) # FIXME: 'rollback' param rejects height ? + k443 chrisguida/dumptxoutset-rollback-copy-29+knots last=fac46e45db0 chrisguida/dumptxoutset-rollback-copy + # Backport of #33477 (dumptxoutset rollback on a copy of the UTXO set); copy of the PR branch rebased onto the compat_rpc_dumptxoutset_hr merge above (the PR branch is rooted on the 29.4.2 tip), so it must follow it - compat_jsonrpc_weirdversions 6b76e9d6a51 29530 rpc_getpeerinfo_misbehaving_score-29+k aa3d4f02b8d last=87efb6f0cfd # NOTE: Held back 976d61c974e...87efb6f0cfd which degrades docs and adds a test incompatible with Knots @@ -1757,14 +1768,21 @@ NM 14137 win_taskbar_progress ca96c2575ea last=18eb4dbb8a k385 pow_hf_blake2b_params a6b32ff9e03 k420 difficulty_blake2b 8c04afce107 k419 tsf_longmaturity 049c5553a64 - k429 chrisguida/long-coinbase-maturity-rdts-expiry-29+knots last=a049372c27f + k429 chrisguida/long-coinbase-maturity-rdts-expiry-29+knots last=6d1b0706a83 + # since a049372c27f: Luke's round-2 items, fuzz UAF fix (the backport is k445), policy hold limited to covered coins (jasonsopko) k425 privkeyio/fix_pow_boundary_sync+nofork last=fd186ab21a9 fix_pow_boundary_sync # + sync headers from legacy peers when BLAKE2b is not scheduled + k459 chrisguida/rdts-testnet4-extension-k429-29+knots last=f4d49816516 chrisguida/rdts-testnet4-extension-29+knots + # testnet4: RDTS expiry extended to 2027-04-01 retroactively (chainstate revalidation from 152963); keeps k429 a softfork on 29.4.2 on testnet4 + # copy of the PR commit rebased onto k429's head with k425 merged in (k425 edits the line above the testnet4 expiry; k429 rewrote the revalidation-deployment test, so the test lookup is adapted) k398 privkeyio/blake2b-outbound-slot-preference last=b947864cb45 - k394 privkeyio/seeds_blake2b-29+knots last=44571c691dc jasonsopko/seeds-blake2b + k394 privkeyio/seeds_blake2b-29+knots last=8e50d772c1a jasonsopko/seeds-blake2b # + keep the cjdns seeds and the testnet4 fixed seeds + # 8e50d772c1a restores the testnet4 and cjdns fixed seeds in the PR itself (the same fix the privkeyio copy carries) k437 privkeyio/dnsseed_lionpool-29+knots last=e76eaac5bdf LionThunderFingers/chainparams-add-lionseed # Pre-BRANDING: (might need to be part of F patch to eliminate binary files) + k444 chrisguida/assumeutxo-976000-29+knots last=6ce57028d6c chrisguida/assumeutxo-976000 + # assumeutxo snapshot at 976000 (first entry past the BLAKE2b fork); approved by luke-jr and kwsantiago; copy of the PR branch rebased onto the k385 merge (the PR branch is rooted on the 29.4.2 tip) n/a (delete_release_notes_fragments) 1b71ccce258 # Triage: 34808 hebasto/260311-qt-ts-source 7483 svg_icon-29.3+knots a3c9beb6db2 diff --git a/knots-next.spec b/knots-next.spec index 7750c79..0ed15ee 100644 --- a/knots-next.spec +++ b/knots-next.spec @@ -619,6 +619,8 @@ checkout v30.0rc1 # Backport of #33553, without log/alert message changes #30.xTODO# "Knots feature request: system notification for a txn should show the net wallet balance delta assuming the txn confirms, not whatever it does now that gives me a heart attack every time I use a large-ish UTXO lol" -Jason (currently only the first send of a sendmany is shown) https://github.com/bitcoin-core/gui/issues/853 # TODO: prunenotify to run a command after each prune (eg, for fstrim or such) + k445 chrisguida/fuzz_spkm_migration-29 last=f9cba55ad70 + # Backport of #32624 + #32977 commit ba015852298; fixes the spkm_migration fuzz UAF that fails CI on k429 # FIXME: How to unify listtransactions and GUI tx list? GUI has net changes, while RPC just has positive fees # FIXME: watchonly indicator is confusing. @@ -1590,6 +1592,13 @@ checkout v30.0rc1 k292 Retropex/rework-opnet #31.xTODO# Consider reverting parts of #33489 (build: Drop support for EOL macOS 13) and #33573 # TODO? Dust multiplier by # of outputs: https://x.com/snapolino/status/1976708308603224518 + k319 privkeyio/fix-bip110-envelope-datacarrier last=5e3153edef4 + # count bare data envelopes (OP_2DROP/pushnum runs) as datacarrier; jasonsopko approved; base of k422 + k422 privkeyio/policy-unproven-pubkey-datacarrier last=eea24673b4d + # count pubkeys no signature can prove as datacarrier bytes, incl. tapscript keys; jasonsopko approved; contains the k319 commits; eea24673b4d = 177e5cad729 + the two CI fixes (MSVC narrowing, UBSan test helper) + # Needs review: k389 jasonsopko/policy-fake-outputs (data in output hashes and keys; rooted on the 29.4.2 tip, needs a rebased copy) + # Needs review: k400 jasonsopko/policy-dead-branch-data (data in a dead conditional branch; rooted on the 29.4.2 tip, needs a rebased copy) + # Needs review: k457 privkeyio/datacarrier_reject_type-29+knots (TX_NOT_STANDARD for datacarrier rejections) 30.xTODO: Consider #33892 policy: allow