Skip to content

Commit 97ef678

Browse files
committed
Merge remote-tracking branch 'origin-pull/876/head' into HEAD
2 parents 802520e + 9cf4038 commit 97ef678

File tree

10 files changed

+81
-56
lines changed

10 files changed

+81
-56
lines changed

README.mediawiki

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,27 @@ Those proposing changes should consider that ultimately consent may rest with th
931931
| Gleb Naumenko, Pieter Wuille
932932
| Standard
933933
| Draft
934+
|-
935+
| [[bip-0340.mediawiki|340]]
936+
|
937+
| Schnorr Signatures for secp256k1
938+
| Pieter Wuille, Jonas Nick, Tim Ruffing
939+
| Standard
940+
| Draft
941+
|-
942+
| [[bip-0341.mediawiki|341]]
943+
| Consensus (soft fork)
944+
| Taproot: SegWit version 1 spending rules
945+
| Pieter Wuille, Jonas Nick, Anthony Towns
946+
| Standard
947+
| Draft
948+
|-
949+
| [[bip-0342.mediawiki|342]]
950+
| Consensus (soft fork)
951+
| Validation of Taproot Scripts
952+
| Pieter Wuille, Jonas Nick, Anthony Towns
953+
| Standard
954+
| Draft
934955
|}
935956

936957
<!-- IMPORTANT! See the instructions at the top of this page, do NOT JUST add BIPs here! -->

bip-schnorr.mediawiki renamed to bip-0340.mediawiki

Lines changed: 13 additions & 10 deletions
Large diffs are not rendered by default.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

bip-taproot.mediawiki renamed to bip-0341.mediawiki

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.
File renamed without changes.

bip-tapscript.mediawiki renamed to bip-0342.mediawiki

Lines changed: 21 additions & 21 deletions
Large diffs are not rendered by default.

scripts/buildtable.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
'Discussions-To' => undef,
3535
'Post-History' => undef,
3636
'Replaces' => undef,
37+
'Requires' => undef,
3738
'Superseded-By' => undef,
3839
);
3940

0 commit comments

Comments
 (0)