Merge remote-tracking branch 'upstream/master' into bip-46

To fix the merge conflict caused by BIP 47 getting updated to final.

1 files changed, 140 insertions, 35 deletions

diff --git a/README.mediawiki b/README.mediawiki
index f84fcf0..1ad8aaf 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -1,4 +1,4 @@
-People wishing to submit BIPs, first should propose their idea or document to the [https://lists.linuxfoundation.org/mailman/listinfo/bitcoin-dev bitcoin-dev@lists.linuxfoundation.org] mailing list (do <em>not</em> assign a number - read <a href="bip-0002.mediawiki">BIP 2</a> for the full process). After discussion, please open a PR. After copy-editing and acceptance, it will be published here.
+People wishing to submit BIPs, first should propose their idea or document to the [https://groups.google.com/g/bitcoindev bitcoindev@googlegroups.com] mailing list (do <em>not</em> assign a number - read <a href="bip-0002.mediawiki">BIP 2</a> for the full process). After discussion, please open a PR. After copy-editing and acceptance, it will be published here.
 
 We are fairly liberal with approving BIPs, and try not to be too involved in decision making on behalf of the community. The exception is in very rare cases of dispute resolution when a decision is contentious and cannot be agreed upon. In those cases, the conservative option will always be preferred.
 
@@ -235,15 +235,15 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Applications
 | Purpose Field for Deterministic Wallets
 | Marek Palatinus, Pavol Rusnak
-| Informational
+| Standard
 | Final
-|- style="background-color: #ffffcf"
+|- style="background-color: #cfffcf"
 | [[bip-0044.mediawiki|44]]
 | Applications
 | Multi-Account Hierarchy for Deterministic Wallets
 | Marek Palatinus, Pavol Rusnak
 | Standard
-| Proposed
+| Final
 |- style="background-color: #ffffcf"
 | [[bip-0045.mediawiki|45]]
 | Applications
@@ -258,13 +258,13 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Chris Belcher, Thebora Kompanioni
 | Standard
 | Draft
-|-
+|- style="background-color: #cfffcf"
 | [[bip-0047.mediawiki|47]]
 | Applications
 | Reusable Payment Codes for Hierarchical Deterministic Wallets
 | Justus Ranvier
 | Informational
-| Draft
+| Final
 |- style="background-color: #ffffcf"
 | [[bip-0048.mediawiki|48]]
 | Applications
@@ -277,7 +277,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Applications
 | Derivation scheme for P2WPKH-nested-in-P2SH based accounts
 | Daniel Weigl
-| Informational
+| Standard
 | Final
 |- style="background-color: #cfffcf"
 | [[bip-0050.mediawiki|50]]
@@ -441,13 +441,13 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Eric Lombrozo
 | Standard
 | Rejected
-|-
+|- style="background-color: #cfffcf"
 | [[bip-0084.mediawiki|84]]
 | Applications
 | Derivation scheme for P2WPKH based accounts
 | Pavol Rusnak
-| Informational
-| Draft
+| Standard
+| Final
 |-
 | [[bip-0085.mediawiki|85]]
 | Applications
@@ -459,7 +459,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | [[bip-0086.mediawiki|86]]
 | Applications
 | Key Derivation for Single Key P2TR Outputs
-| Andrew Chow
+| Ava Chow
 | Standard
 | Draft
 |- style="background-color: #ffffcf"
@@ -491,6 +491,13 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Standard
 | Final
 |-
+| [[bip-0093.mediawiki|93]]
+| Applications
+| codex32: Checksummed SSSS-aware BIP32 seeds
+| Leon Olsson Curr, Pearlwort Sneed, Andrew Poelstra
+| Informational
+| Draft
+|-
 | [[bip-0098.mediawiki|98]]
 | Consensus (soft fork)
 | Fast Merkle Trees
@@ -627,7 +634,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | [[bip-0119.mediawiki|119]]
 | Consensus (soft fork)
 | CHECKTEMPLATEVERIFY
-| Jeremy Rubin
+| Jeremy Rubin, James O'Beirne
 | Standard
 | Draft
 |- style="background-color: #ffcfcf"
@@ -714,13 +721,13 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Andy Chase
 | Process
 | Withdrawn
-|-
+|- style="background-color: #cfffcf"
 | [[bip-0133.mediawiki|133]]
 | Peer Services
 | feefilter message
 | Alex Morcos
 | Standard
-| Draft
+| Final
 |- style="background-color: #ffcfcf"
 | [[bip-0134.mediawiki|134]]
 | Consensus (hard fork)
@@ -832,7 +839,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Peer-to-Peer Communication Encryption
 | Jonas Schnelli
 | Standard
-| Withdrawn
+| Replaced
 |- style="background-color: #cfffcf"
 | [[bip-0152.mediawiki|152]]
 | Peer Services
@@ -900,7 +907,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | [[bip-0174.mediawiki|174]]
 | Applications
 | Partially Signed Bitcoin Transaction Format
-| Andrew Chow
+| Ava Chow
 | Standard
 | Final
 |- style="background-color: #ffcfcf"
@@ -928,7 +935,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | [[bip-0179.mediawiki|179]]
 |
 | Name for payment recipient identifiers
-| Emil Engler, MarcoFalke, Luke Dashjr
+| Emil Engler, Luke Dashjr
 | Informational
 | Draft
 |- style="background-color: #ffcfcf"
@@ -987,6 +994,13 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Karl-Johan Alm
 | Standard
 | Draft
+|-
+| [[bip-0324.mediawiki|324]]
+| Peer Services
+| Version 2 P2P Encrypted Transport Protocol
+| Dhruv Mehta, Tim Ruffing, Jonas Schnelli, Pieter Wuille
+| Standard
+| Draft
 |- style="background-color: #ffffcf"
 | [[bip-0325.mediawiki|325]]
 | Applications
@@ -997,11 +1011,25 @@ Those proposing changes should consider that ultimately consent may rest with th
 |-
 | [[bip-0326.mediawiki|326]]
 | Applications
-| Anti-fee-sniping protection in taproot transactions
+| Anti-fee-sniping in taproot transactions
 | Chris Belcher
 | Informational
 | Draft
 |-
+| [[bip-0327.mediawiki|327]]
+|
+| MuSig2 for BIP340-compatible Multi-Signatures
+| Jonas Nick, Tim Ruffing, Elliott Jin
+| Informational
+| Draft
+|-
+| [[bip-0329.mediawiki|329]]
+| Applications
+| Wallet Labels Export Format
+| Craig Raw
+| Informational
+| Draft
+|-
 | [[bip-0330.mediawiki|330]]
 | Peer Services
 | Transaction announcements reconciliation
@@ -1009,6 +1037,20 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Standard
 | Draft
 |-
+| [[bip-0331.mediawiki|331]]
+| Peer Services
+| Ancestor Package Relay
+| Gloria Zhao
+| Standard
+| Draft
+|-
+| [[bip-0337.mediawiki|337]]
+| API/RPC
+| Compressed Transactions
+| Tom Briar
+| Standard
+| Draft
+|-
 | [[bip-0338.mediawiki|338]]
 | Peer Services
 | Disable transaction relay message
@@ -1022,102 +1064,165 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Suhas Daftuar
 | Standard
 | Draft
-|-
+|- style="background-color: #cfffcf"
 | [[bip-0340.mediawiki|340]]
 |
 | Schnorr Signatures for secp256k1
 | Pieter Wuille, Jonas Nick, Tim Ruffing
 | Standard
-| Draft
-|-
+| Final
+|- style="background-color: #cfffcf"
 | [[bip-0341.mediawiki|341]]
 | Consensus (soft fork)
 | Taproot: SegWit version 1 spending rules
 | Pieter Wuille, Jonas Nick, Anthony Towns
 | Standard
-| Draft
-|-
+| Final
+|- style="background-color: #cfffcf"
 | [[bip-0342.mediawiki|342]]
 | Consensus (soft fork)
 | Validation of Taproot Scripts
 | Pieter Wuille, Jonas Nick, Anthony Towns
 | Standard
-| Draft
-|- style="background-color: #ffffcf"
+| Final
+|- style="background-color: #cfffcf"
 | [[bip-0343.mediawiki|343]]
 | Consensus (soft fork)
 | Mandatory activation of taproot deployment
 | Shinobius, Michael Folkson
 | Standard
-| Proposed
+| Final
+|-
+| [[bip-0345.mediawiki|345]]
+| Consensus (soft fork)
+| OP_VAULT
+| James O'Beirne, Greg Sanders, Anthony Towns
+| Standard
+| Draft
 |-
+| [[bip-0347.mediawiki|347]]
+| Consensus (soft fork)
+| OP_CAT in Tapscript
+| Ethan Heilman, Armin Sabouri
+| Standard
+| Draft
+|- style="background-color: #cfffcf"
 | [[bip-0350.mediawiki|350]]
 | Applications
 | Bech32m format for v1+ witness addresses
 | Pieter Wuille
 | Standard
+| Final
+|-
+| [[bip-0351.mediawiki|351]]
+| Applications
+| Private Payments
+| Alfred Hodler, Clark Moody
+| Informational
 | Draft
+|- style="background-color: #ffffcf"
+| [[bip-0352.mediawiki|352]]
+| Applications
+| Silent Payments
+| josibake, Ruben Somsen
+| Standard
+| Proposed
 |-
 | [[bip-0370.mediawiki|370]]
 | Applications
 | PSBT Version 2
-| Andrew Chow
+| Ava Chow
 | Standard
 | Draft
 |-
 | [[bip-0371.mediawiki|371]]
 | Applications
 | Taproot Fields for PSBT
-| Andrew Chow
+| Ava Chow
+| Standard
+| Draft
+|-
+| [[bip-0372.mediawiki|372]]
+| Applications
+| Pay-to-contract tweak fields for PSBT
+| Maxim Orlovsky
 | Standard
 | Draft
 |-
 | [[bip-0380.mediawiki|380]]
 | Applications
 | Output Script Descriptors General Operation
-| Pieter Wuille, Andrew Chow
+| Pieter Wuille, Ava Chow
 | Informational
 | Draft
 |-
 | [[bip-0381.mediawiki|381]]
 | Applications
 | Non-Segwit Output Script Descriptors
-| Pieter Wuille, Andrew Chow
+| Pieter Wuille, Ava Chow
 | Informational
 | Draft
 |-
 | [[bip-0382.mediawiki|382]]
 | Applications
 | Segwit Output Script Descriptors
-| Pieter Wuille, Andrew Chow
+| Pieter Wuille, Ava Chow
 | Informational
 | Draft
 |-
 | [[bip-0383.mediawiki|383]]
 | Applications
 | Multisig Output Script Descriptors
-| Pieter Wuille, Andrew Chow
+| Pieter Wuille, Ava Chow
 | Informational
 | Draft
 |-
 | [[bip-0384.mediawiki|384]]
 | Applications
 | combo() Output Script Descriptors
-| Pieter Wuille, Andrew Chow
+| Pieter Wuille, Ava Chow
 | Informational
 | Draft
 |-
 | [[bip-0385.mediawiki|385]]
 | Applications
 | raw() and addr() Output Script Descriptors
-| Pieter Wuille, Andrew Chow
+| Pieter Wuille, Ava Chow
 | Informational
 | Draft
 |-
 | [[bip-0386.mediawiki|386]]
 | Applications
 | tr() Output Script Descriptors
-| Pieter Wuille, Andrew Chow
+| Pieter Wuille, Ava Chow
+| Informational
+| Draft
+|-
+| [[bip-0387.mediawiki|387]]
+| Applications
+| Tapscript Multisig Output Script Descriptors
+| Pieter Wuille, Ava Chow
+| Informational
+| Draft
+|- style="background-color: #ffffcf"
+| [[bip-0388.mediawiki|388]]
+| Applications
+| Wallet Policies for Descriptor Wallets
+| Salvatore Ingala
+| Standard
+| Proposed
+|-
+| [[bip-0389.mediawiki|389]]
+| Applications
+| Multipath Descriptor Key Expressions
+| Ava Chow
+| Informational
+| Draft
+|-
+| [[bip-0431.mediawiki|431]]
+| Applications
+| Topology Restrictions for Pinning
+| Gloria Zhao
 | Informational
 | Draft
 |}