From 9c40c18dbe8e01da8a9f1786fe845f5aed70fa06 Mon Sep 17 00:00:00 2001
From: Robert Spigler <RobertSpigler@ProtonMail.ch>
Date: Sat, 15 May 2021 00:55:41 -0400
Subject: [PATCH] Link to merged BSMS, update examples

---
 bip-0087.mediawiki | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/bip-0087.mediawiki b/bip-0087.mediawiki
index f9be499d..53f2849e 100644
--- a/bip-0087.mediawiki
+++ b/bip-0087.mediawiki
@@ -1,7 +1,7 @@
 <pre>
   BIP: 87
   Layer: Applications
-  Title: Modern Hierarchy for Deterministic Multisignature Wallets
+  Title: Hierarchy for Deterministic Multisig Wallets
   Author: Robert Spigler <RobertSpigler@ProtonMail.ch>
   Comments-Summary: No comments yet.
   Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0087
@@ -124,7 +124,8 @@ Public derivation is used at this level.
 
 The multisig descriptors or descriptor template that is generated from the cosigners' combined key records should be used to generate and discover addresses.
 
-Please see BIP__ (Bitcoin Secure Multisig Setup) for an introduction on descriptor templates.  [Waiting for merge of BSMS to link here].  The descriptor or descriptor template should contain the key origin information for maximum compatibility with BIP-0174.
+Please see [https://github.com/bitcoin/bips/blob/master/bip-0129.mediawiki BIP-0129 (Bitcoin Secure Multisig Setup)] for an introduction on descriptor templates.
+The descriptor or descriptor template should contain the key origin information for maximum compatibility with BIP-0174.
 
 For example:
 
@@ -171,43 +172,43 @@ As wallets complying with this BIP are descriptor wallets, this therefore necess
 |first
 |external
 |first
-|m / XY' / 0' / 0' / 0 / 0
+|m / 87' / 0' / 0' / 0 / 0
 |-
 |mainnet
 |first
 |external
 |second
-|m / XY' / 0' / 0' / 0 / 1
+|m / 87' / 0' / 0' / 0 / 1
 |-
 |mainnet
 |first
 |change
 |first
-|m / XY' / 0' / 0' / 1 / 0
+|m / 87' / 0' / 0' / 1 / 0
 |-
 |mainnet
 |first
 |change
 |second
-|m / XY' / 0' / 0' / 1 / 1
+|m / 87' / 0' / 0' / 1 / 1
 |-
 |mainnet
 |second
 |external
 |first
-|m / XY' / 0' / 1' / 0 / 0
+|m / 87' / 0' / 1' / 0 / 0
 |-
 |mainnet
 |second
 |external
 |second
-|m / XY' / 0' / 1' / 0 / 1
+|m / 87' / 0' / 1' / 0 / 1
 |-
 |testnet
 |first
 |external
 |first
-|m / XY' / 1' / 0' / 0 / 0
+|m / 87' / 1' / 0' / 0 / 0
 |-
 |testnet
 |first
@@ -219,37 +220,37 @@ As wallets complying with this BIP are descriptor wallets, this therefore necess
 |first
 |change
 |first
-|m / XY' / 1' / 0' / 1 / 0
+|m / 87' / 1' / 0' / 1 / 0
 |-
 |testnet
 |first
 |change
 |second
-|m / XY' / 1' / 0' / 1 / 1
+|m / 87' / 1' / 0' / 1 / 1
 |-
 |testnet
 |second
 |external
 |first
-|m / XY' / 1' / 1' / 0 / 0
+|m / 87' / 1' / 1' / 0 / 0
 |-
 |testnet
 |second
 |external
 |second
-|m / XY' / 1' / 1' / 0 / 1
+|m / 87' / 1' / 1' / 0 / 1
 |-
 |testnet
 |second
 |change
 |first
-|m / XY' / 1' / 1' / 1 / 0
+|m / 87' / 1' / 1' / 1 / 0
 |-
 |testnet
 |second
 |change
 |second
-|m / XY' / 1' / 1' / 1 / 1
+|m / 87' / 1' / 1' / 1 / 1
 |}
 
 ==Reference Implementation==
@@ -270,4 +271,4 @@ Original mailing list thread: https://lists.linuxfoundation.org/pipermail/bitcoi
 * [https://github.com/bitcoin/bitcoin/blob/master/doc/descriptors.md Output Descriptors]
 * [[bip-0174.mediawiki|BIP174 - Partially Signed Bitcoin Transaction Format]]
 * [[bip-0067.mediawiki|BIP67 - Deterministic Pay-to-script-hash multi-signature addresses through public key sorting]]
-* Bitcoin Secure Multisig Setup [Waiting For Merge]
+* [[bip-0129.mediawiki|BIP129 - Bitcoin Secure Multisig Setup (BSMS)]]