diff options
| author | W. J. van der Laan <laanwj@protonmail.com> | 2021-09-08 17:19:42 +0200 |
|---|---|---|
| committer | W. J. van der Laan <laanwj@protonmail.com> | 2021-09-08 17:20:00 +0200 |
| commit | 03f14227862041650771c4e399560683b291a28e (patch) | |
| tree | ad3ebbaf0ec6a5ca84f7d1a0ddd1b8d577b8a167 | |
| parent | fbf498d26bd25f65777930bbe44c1630bcec7dcc (diff) | |
| parent | 303bc8a0697fda00f21173dc9ae863357adac793 (diff) | |
Merge bitcoin/bitcoin#22857: [22.x] Backports
303bc8a0697fda00f21173dc9ae863357adac793 guix/prelude: Override VERSION with FORCE_VERSION (Carl Dong)
0640bf5c82e5841911b1d8288aad66e872ed3183 doc: mention bech32m/BIP350 in doc/descriptors.md (Pieter Wuille)
Pull request description:
Backports:
* #22847 - guix/prelude: Override VERSION with FORCE_VERSION
* #22837 - doc: mention bech32m/BIP350 in doc/descriptors.md
Theses are both minor enough that they would not require and rc4.
ACKs for top commit:
laanwj:
ACK 303bc8a0697fda00f21173dc9ae863357adac793
Tree-SHA512: faac095f71abb537f1d2a338e4f79f8389be2362eec0841e3fb47aaee731ce242856db461f89351c2ca4e1129a3afdd49c3e918a7bf22af3e4d2f7deaff48ad8
| -rw-r--r-- | contrib/guix/libexec/prelude.bash | 2 | ||||
| -rw-r--r-- | doc/descriptors.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash index 9705607119..40ae4b5208 100644 --- a/contrib/guix/libexec/prelude.bash +++ b/contrib/guix/libexec/prelude.bash @@ -49,7 +49,7 @@ fi # Set common variables ################ -VERSION="${VERSION:-$(git_head_version)}" +VERSION="${FORCE_VERSION:-$(git_head_version)}" DISTNAME="${DISTNAME:-bitcoin-${VERSION}}" version_base_prefix="${PWD}/guix-build-" diff --git a/doc/descriptors.md b/doc/descriptors.md index e27ff87546..3bbb626a42 100644 --- a/doc/descriptors.md +++ b/doc/descriptors.md @@ -99,7 +99,7 @@ Descriptors consist of several types of expressions. The top level expression is `ADDR` expressions are any type of supported address: - P2PKH addresses (base58, of the form `1...` for mainnet or `[nm]...` for testnet). Note that P2PKH addresses in descriptors cannot be used for P2PK outputs (use the `pk` function instead). - P2SH addresses (base58, of the form `3...` for mainnet or `2...` for testnet, defined in [BIP 13](https://github.com/bitcoin/bips/blob/master/bip-0013.mediawiki)). -- Segwit addresses (bech32, of the form `bc1...` for mainnet or `tb1...` for testnet, defined in [BIP 173](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki)). +- Segwit addresses (bech32 and bech32m, of the form `bc1...` for mainnet or `tb1...` for testnet, defined in [BIP 173](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki) and [BIP 350](https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki)). ## Explanation |