From 2d8258bddefc0655c953b286502a8986f279e421 Mon Sep 17 00:00:00 2001 From: DCG-Claude Date: Sun, 15 Nov 2026 18:05:26 -0600 Subject: [PATCH 1/3] Merge bitcoin/bitcoin#30143: doc: Update NetBSD Build Guide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 85e480a41ad0901a8b46759e921c187ebbbcccdf doc: Update NetBSD Build Guide (Hennadii Stepanov) Pull request description: This PR updates the NetBSD Build Guide to reflect: - the recent NetBSD Release - GCC minimum supported version update (https://github.com/bitcoin/bitcoin/pull/28348 and https://github.com/bitcoin/bitcoin/pull/29091) - Python minimum supported version update (https://github.com/bitcoin/bitcoin/pull/28211) Also a smaller package set has been suggested: - `boost-headers` instead of the full `boost` - `qt5-qtbase qt5-qttools` instead of the full `qt5` (similar to https://github.com/bitcoin/bitcoin/pull/29932 and https://github.com/bitcoin/bitcoin/pull/29947). ACKs for top commit: maflcko: utACK 85e480a41ad0901a8b46759e921c187ebbbcccdf Tree-SHA512: 0848b6f169a00f2da78eea452fd116193aece853680f4e615ba1df654246ec2a9d1600a4cfb238eb9305b72bbe4b2873519bf1e2987eaaf48aba900c64e85a48 Dash adaptations: - doc/build-netbsd.md: takes upstream's boost-headers package but keeps Dash's extra zstd dependency in the pkgin install line - doc/build-netbsd.md: keeps Dash Core branding in the reworded GUI sentence ('To compile the GUI, Qt 5 is required.') - doc/build-netbsd.md: keeps Dash's python312 instead of upstream's python39, because Dash's guide requires Python 3.10+ - doc/build-netbsd.md: the gcc9→gcc12 hunk is a no-op; Dash's guide already recommends gcc12 for C++20 --- doc/build-netbsd.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/build-netbsd.md b/doc/build-netbsd.md index 474a4c3c87c1..77ee94a30a5e 100644 --- a/doc/build-netbsd.md +++ b/doc/build-netbsd.md @@ -1,6 +1,6 @@ # NetBSD Build Guide -Updated for NetBSD [9.2](https://netbsd.org/releases/formal-9/NetBSD-9.2.html). +**Updated for NetBSD [10.0](https://netbsd.org/releases/formal-10/NetBSD-10.0.html)** This guide describes how to build dashd, command-line utilities, and GUI on NetBSD. @@ -14,7 +14,7 @@ Install the required dependencies the usual way you [install software on NetBSD] The example commands below use `pkgin`. ```bash -pkgin install autoconf automake libtool pkg-config git gmake boost libevent zstd +pkgin install autoconf automake libtool pkg-config git gmake boost-headers libevent zstd ``` @@ -68,10 +68,10 @@ pkgin install db4 #### GUI Dependencies -Dash Core includes a GUI built with the cross-platform Qt Framework. To compile the GUI, we need to install `qt5`. +Dash Core includes a GUI built with the cross-platform Qt Framework. To compile the GUI, Qt 5 is required. ```bash -pkgin install qt5 +pkgin install qt5-qtbase qt5-qttools ``` The GUI can encode addresses in a QR Code. To build in QR support for the GUI, install `qrencode`. From 82a3da7102ca1a0e8119c9f1fddb7de56b83a8dd Mon Sep 17 00:00:00 2001 From: DCG-Claude Date: Sun, 15 Nov 2026 18:05:45 -0600 Subject: [PATCH 2/3] Merge bitcoin/bitcoin#30502: doc: add release notes for #22729 6d33e13bd493ca6cee7b52b990e4822a28e35d0a doc: tor.md: use -bind=127.0.0.1:8334=onion for the Tor bind (David Gumberg) a7f5d188cc7a23b1946d48693ada22fe90d9ffe0 doc: add release notes for #22729 (Vasil Dimov) Pull request description: Add release notes for #22729. ACKs for top commit: davidgumberg: reACK https://github.com/bitcoin/bitcoin/pull/30502/commits/6d33e13bd493ca6cee7b52b990e4822a28e35d0a willcl-ark: ACK 6d33e13bd493ca6cee7b52b990e4822a28e35d0a Tree-SHA512: 9d7e66ee1d0bb1d75b8273707d30f20915d5040a768c2c5cd47c84997df2645c8bec35db6c09dc77ab917836622411b924373816cbc83c4be38e2e9156a139d8 Dash adaptations: - doc/tor.md: uses Dash's mainnet onion bind port 9996 (BaseParams().OnionServiceTargetPort()) instead of Bitcoin's 8334 Not applicable to Dash (intentionally omitted): - doc/release-notes-22729.md: Dash already covered bitcoin#22729 in its v24.0.0 notes, and the upstream text is wrong for Dash: -bind still adds the default onion bind unless -listenonion=0 (dash#7786/#8003) --- doc/tor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.md b/doc/tor.md index daf884ad5528..12dd6a89099d 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -213,7 +213,7 @@ In a typical situation, where you're only reachable via Tor, this should suffice listen on all devices and another node could establish a clearnet connection, when knowing your address. To mitigate this, additionally bind the address of your Tor proxy: - ./dashd ... -bind=127.0.0.1 + ./dashd ... -bind=127.0.0.1:9996=onion If you don't care too much about hiding your node, and want to be reachable on IPv4 as well, use `discover` instead: From 4166c982c1cee86a8186afc44ae94c4b501c4955 Mon Sep 17 00:00:00 2001 From: DCG-Claude Date: Sun, 15 Nov 2026 18:06:14 -0600 Subject: [PATCH 3/3] Merge bitcoin/bitcoin#29154: tests: improve wallet multisig descriptor test and docs d93b79470916b1e6f85c55cc6beb1e41b382196f tests: improve wallet multisig descriptor test and docs (Michael Dietz) Pull request description: It is best to store all key origin information (master key fingerprint and all derivation steps) in the multisig descriptor. Being explicit with this information should be beneficial if this approach is used with other wallets/signers (whether hardware or software). There is no harm including all of this with xpubs (if anything it simplifies the test code) and makes this example/docs more complete and safer incase it is referenced by others. ACKs for top commit: S3RK: Code Review ACK d93b79470916b1e6f85c55cc6beb1e41b382196f achow101: ACK d93b79470916b1e6f85c55cc6beb1e41b382196f Tree-SHA512: 0e5c4d13f060489405e6cf50c8a09911f5a0cee71023649235afd80a5e3aae38d52c6e12ad4660205b9357b09f45596941391bdcf6fceccbe07c4e5a1592a482 Dash adaptations: - test/functional/wallet_multisig_descriptor_psbt.py: the multisig descriptors keep Dash's sh(sortedmulti(...)) instead of upstream's wsh(...) because Dash has no segwit - doc/descriptors.md: the new 2-of-3 example uses sh(sortedmulti(...)) with its checksum recomputed (#6adrlqpw) instead of upstream's wsh(...)#av0kxgw0, because Dash has no segwit --- doc/descriptors.md | 5 ++-- .../wallet_multisig_descriptor_psbt.py | 25 ++++++++----------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/doc/descriptors.md b/doc/descriptors.md index c3e41b14636d..846372f4f833 100644 --- a/doc/descriptors.md +++ b/doc/descriptors.md @@ -47,6 +47,7 @@ Output descriptors currently support: - `sortedmulti(1,022f8bde4d1a07209355b4a7250a5c5128e88b84bddc619ab7cba8d569b240efe4,025cbdf0646e5db4eaa398f365f2ea7a0e3d419b7e0330e39ce92bddedcac4f9bc)` describes a bare *1-of-2* multisig with keys sorted lexicographically in the resulting redeemScript. - `pkh(xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LHhwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw/1/2)` describes a P2PKH output with child key *1/2* of the specified xpub. - `pkh([d34db33f/44'/0'/0']xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/1/*)` describes a set of P2PKH outputs, but additionally specifies that the specified xpub is a child of a master with fingerprint `d34db33f`, and derived using path `44'/0'/0'`. +- `sh(sortedmulti(2,[6f53d49c/44h/1h/0h]tpubDDjsCRDQ9YzyaAq9rspCfq8RZFrWoBpYnLxK6sS2hS2yukqSczgcYiur8Scx4Hd5AZatxTuzMtJQJhchufv1FRFanLqUP7JHwusSSpfcEp2/0/*,[e6807791/44h/1h/0h]tpubDDAfvogaaAxaFJ6c15ht7Tq6ZmiqFYfrSmZsHu7tHXBgnjMZSHAeHSwhvjARNA6Qybon4ksPksjRbPDVp7yXA1KjTjSd5x18KHqbppnXP1s/0/*,[367c9cfa/44h/1h/0h]tpubDDtPnSgWYk8dDnaDwnof4ehcnjuL5VoUt1eW2MoAed1grPHuXPDnkX1fWMvXfcz3NqFxPbhqNZ3QBdYjLz2hABeM9Z2oqMR1Gt2HHYDoCgh/0/*))#6adrlqpw` describes a *2-of-3* multisig. For brevity, the internal "change" descriptor accompanying the above external "receiving" descriptor is not included here, but it typically differs only in the xpub derivation steps, ending in `/1/*` for change addresses. ## Reference @@ -138,9 +139,9 @@ The basic steps are: the participant's signer wallet. Avoid reusing this wallet for any purpose other than signing transactions from the corresponding multisig we are about to create. Hint: extract the wallet's xpubs using `listdescriptors` and pick the one from the `pkh` descriptor since it's least likely to be accidentally reused (legacy addresses) - 2. Create a watch-only descriptor wallet (blank, private keys disabled). Now the multisig is created by importing the two descriptors: + 2. Create a watch-only descriptor wallet (blank, private keys disabled). Now the multisig is created by importing the external and internal descriptors: `wsh(sortedmulti(,XPUB1/0/*,XPUB2/0/*,…,XPUBN/0/*))` and `wsh(sortedmulti(,XPUB1/1/*,XPUB2/1/*,…,XPUBN/1/*))` - (one descriptor w/ `0` for receiving addresses and another w/ `1` for change). Every participant does this + (one descriptor w/ `0` for receiving addresses and another w/ `1` for change). Every participant does this. All key origin information (master key fingerprint and all derivation steps) should be included with xpubs for proper support of hardware devices / external signers 3. A receiving address is generated for the multisig. As a check to ensure step 2 was done correctly, every participant should verify they get the same addresses 4. Funds are sent to the resulting address diff --git a/test/functional/wallet_multisig_descriptor_psbt.py b/test/functional/wallet_multisig_descriptor_psbt.py index 2959574d5b0b..528d23c31bc6 100755 --- a/test/functional/wallet_multisig_descriptor_psbt.py +++ b/test/functional/wallet_multisig_descriptor_psbt.py @@ -7,7 +7,6 @@ This is meant to be documentation as much as functional tests, so it is kept as simple and readable as possible. """ -from test_framework.address import base58_to_byte from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_approx, @@ -30,10 +29,12 @@ def skip_test_if_missing_module(self): self.skip_if_no_sqlite() @staticmethod - def _get_xpub(wallet): + def _get_xpub(wallet, internal): """Extract the wallet's xpubs using `listdescriptors` and pick the one from the `pkh` descriptor since it's least likely to be accidentally reused (legacy addresses).""" - descriptor = next(filter(lambda d: d["desc"].startswith("pkh"), wallet.listdescriptors()["descriptors"])) - return descriptor["desc"].split("]")[-1].split("/")[0] + pkh_descriptor = next(filter(lambda d: d["desc"].startswith("pkh(") and d["internal"] == internal, wallet.listdescriptors()["descriptors"])) + # Keep all key origin information (master key fingerprint and all derivation steps) for proper support of hardware devices + # See section 'Key origin identification' in 'doc/descriptors.md' for more details... + return pkh_descriptor["desc"].split("pkh(")[1].split(")")[0] @staticmethod def _check_psbt(psbt, to, value, multisig): @@ -47,19 +48,13 @@ def _check_psbt(psbt, to, value, multisig): amount += vout["value"] assert_approx(amount, float(value), vspan=0.001) - def participants_create_multisigs(self, xpubs): + def participants_create_multisigs(self, external_xpubs, internal_xpubs): """The multisig is created by importing the following descriptors. The resulting wallet is watch-only and every participant can do this.""" - # some simple validation - assert_equal(len(xpubs), self.N) - # a sanity-check/assertion, this will throw if the base58 checksum of any of the provided xpubs are invalid - for xpub in xpubs: - base58_to_byte(xpub) - for i, node in enumerate(self.nodes): node.createwallet(wallet_name=f"{self.name}_{i}", blank=True, descriptors=True, disable_private_keys=True) multisig = node.get_wallet_rpc(f"{self.name}_{i}") - external = multisig.getdescriptorinfo(f"sh(sortedmulti({self.M},{f'/0/*,'.join(xpubs)}/0/*))") - internal = multisig.getdescriptorinfo(f"sh(sortedmulti({self.M},{f'/1/*,'.join(xpubs)}/1/*))") + external = multisig.getdescriptorinfo(f"sh(sortedmulti({self.M},{f','.join(external_xpubs)}))") + internal = multisig.getdescriptorinfo(f"sh(sortedmulti({self.M},{f','.join(internal_xpubs)}))") result = multisig.importdescriptors([ { # receiving addresses (internal: False) "desc": external["descriptor"], @@ -93,10 +88,10 @@ def run_test(self): } self.log.info("Generate and exchange xpubs...") - xpubs = [self._get_xpub(signer) for signer in participants["signers"]] + external_xpubs, internal_xpubs = [[self._get_xpub(signer, internal) for signer in participants["signers"]] for internal in [False, True]] self.log.info("Every participant imports the following descriptors to create the watch-only multisig...") - participants["multisigs"] = list(self.participants_create_multisigs(xpubs)) + participants["multisigs"] = list(self.participants_create_multisigs(external_xpubs, internal_xpubs)) self.log.info("Check that every participant's multisig generates the same addresses...") for _ in range(10): # we check that the first 10 generated addresses are the same for all participant's multisigs