Skip to content

[pull] master from bitcoin:master #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Feb 28, 2026
Merged

[pull] master from bitcoin:master #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
edb6856
BIP-117: add missing BIP8 reference (#2080)
MoNyAvA Feb 27, 2026
53dac1b
bip-0044: add Requires header for BIP32 and BIP43 (#2072)
MohammadEglil Feb 27, 2026
e76f043
BIP-383: remove extra stray </tt> (#2061)
MoNyAvA Feb 27, 2026
0780663
BIP129: Add Requires header (#2019)
jonatack Feb 27, 2026
95465e0
BIP20,21: add Superseded-By and Replaces headers (#1984)
jonatack Feb 27, 2026
0f30778
BIP-174: port public key terminology from BIP 373 (#2085)
rkrux Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bip-0020.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
Type: Specification
Assigned: 2011-01-10
License: BSD-2-Clause
Proposed-Replacement: 21
</pre>

BIP 0020 is based off an earlier document by Nils Schneider. '''And has been replaced by BIP 0021'''
Expand Down
1 change: 1 addition & 0 deletions bip-0021.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
Status: Closed
Type: Specification
Assigned: 2012-01-29
Replaces: 20
Proposed-Replacement: 321
</pre>

Expand Down
1 change: 1 addition & 0 deletions bip-0044.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
Status: Deployed
Type: Specification
Assigned: 2014-04-24
Requires: 32, 43
</pre>

==Abstract==
Expand Down
2 changes: 2 additions & 0 deletions bip-0117.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,5 @@ The v0 segwit rules prohibit leaving anything on the stack, so for v0 parameters
[5] [https://github.com/bitcoin/bips/blob/master/bip-0114.mediawiki BIP114: Merkelized Abstract Syntax Tree]

[6] [https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki BIP68: Relative lock-time using consensus-enforced sequence numbers]

[9] [https://github.com/bitcoin/bips/blob/master/bip-0008.mediawiki BIP8: Version bits with lock-in by height]
1 change: 1 addition & 0 deletions bip-0129.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
Type: Specification
Assigned: 2020-11-10
License: BSD-2-Clause
Requires: 32, 174, 322, 380, 381, 382, 383
</pre>

==Introduction==
Expand Down
26 changes: 13 additions & 13 deletions bip-0174.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,11 +507,11 @@ The currently defined per-input types are defined as follows:
|-
| MuSig2 Participant Public Keys
| <tt>PSBT_IN_MUSIG2_PARTICIPANT_PUBKEYS = 0x1a</tt>
| <33 byte plain aggregate pubkey>
| The MuSig2 aggregate plain public key from the <tt>KeyAgg</tt> algorithm. This key may or may not
| <33 byte aggregate pubkey (compressed)>
| The MuSig2 aggregate public key (compressed) from the <tt>KeyAgg</tt> algorithm. This key may or may not
be in the script directly (as x-only). It may instead be a parent public key from which the public keys in the
script were derived.
| <tt><33 byte compressed pubkey>*</tt>
| <tt><33 byte participant pubkey (compressed)>*</tt>
| A list of the compressed public keys of the participants in the MuSig2 aggregate key in the order
required for aggregation. If sorting was done, then the keys must be in the sorted order.
|
Expand All @@ -521,11 +521,11 @@ required for aggregation. If sorting was done, then the keys must be in the sort
|-
| MuSig2 Public Nonce
| <tt>PSBT_IN_MUSIG2_PUB_NONCE = 0x1b</tt>
| <tt><33 byte compressed pubkey> <33 byte plain pubkey> <32 byte hash or omitted></tt>
| The compressed public key of the participant providing this nonce, followed by the plain public
| <tt><33 byte participant pubkey (compressed)> <33 byte aggregate pubkey (compressed)> <32 byte hash or omitted></tt>
| The compressed public key of the participant providing this nonce, followed by the compressed aggregate public
key the participant is providing the nonce for, followed by the BIP 341 tapleaf hash of
the Taproot leaf script that will be signed. If the aggregate key is the taproot internal key or the
taproot output key, then the tapleaf hash must be omitted. The plain public key must be
taproot output key, then the tapleaf hash must be omitted. The compressed participant public key must be
the key found in the script and not the aggregate public key that it was derived from, if it was
derived from an aggregate key.
| <tt><66 byte public nonce></tt>
Expand All @@ -537,11 +537,11 @@ derived from an aggregate key.
|-
| MuSig2 Participant Partial Signature
| <tt>PSBT_IN_MUSIG2_PARTIAL_SIG = 0x1c</tt>
| <tt><33 byte compressed pubkey> <33 byte plain pubkey> <32 byte hash or omitted></tt>
| <tt><33 byte participant pubkey (compressed)> <33 byte aggregate pubkey (compressed)> <32 byte hash or omitted></tt>
| The compressed public key of the participant providing this partial signature, followed by the
plain public key the participant is providing the signature for, followed by the BIP 341 tapleaf hash
of the Taproot leaf script that will be signed. If the aggregate key is the taproot internal key or
the taproot output key, then the tapleaf hash must be omitted. Note that the plain public key must
compressed public key the participant is providing the signature for, followed by the BIP 341 tapleaf hash
of the Taproot leaf script that will be signed. If the aggregate key is the Taproot internal key or
the Taproot output key, then the tapleaf hash must be omitted. Note that the compressed participant public key must be
be the key found in the script and not the aggregate public key that it was derived from, if it was
derived from an aggregate key.
| <tt><32 byte partial signature></tt>
Expand Down Expand Up @@ -691,11 +691,11 @@ determine which outputs are change outputs and verify that the change is returni
|-
| MuSig2 Participant Public Keys
| <tt>PSBT_OUT_MUSIG2_PARTICIPANT_PUBKEYS = 0x08</tt>
| <33 byte plain aggregate pubkey>
| The MuSig2 aggregate plain public key from the <tt>KeyAgg</tt> algorithm. This key may or may not
| <tt><33 byte aggregate pubkey (compressed)></tt>
| The MuSig2 compressed aggregate public key from the <tt>KeyAgg</tt> algorithm. This key may or may not
be in the script directly. It may instead be a parent public key from which the public keys in the
script were derived.
| <tt><33 byte compressed pubkey>*</tt>
| <tt><33 byte participant pubkey (compressed)>*</tt>
| A list of the compressed public keys of the participants in the MuSig2 aggregate key in the order
required for aggregation. If sorting was done, then the keys must be in the sorted order.
|
Expand Down
2 changes: 1 addition & 1 deletion bip-0383.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ For values greater than 16, they must be a push of the signed little endian enco
The only change for <tt>sortedmulti()</tt> is that the keys are sorted lexicographically prior to the creation of the output script.
This sorting is on the keys that are to be put into the output script, i.e. after all extended keys are derived.

===Multiple Extended Keys</tt>===
===Multiple Extended Keys===

When one or more the key expressions in a <tt>multi()</tt> or <tt>sortedmulti()</tt> expression are extended keys, the derived keys use the same child index.
This changes the keys in lockstep and allows for output scripts to be indexed in the same way that the derived keys are indexed.
Expand Down