diff --git a/README.mediawiki b/README.mediawiki index c2ded8de..e6e1fedd 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -272,13 +272,13 @@ Those proposing changes should consider that ultimately consent may rest with th | Justus Ranvier | Informational | Final -|- style="background-color: #ffffcf" +|- style="background-color: #cfffcf" | [[bip-0048.mediawiki|48]] | Applications | Multi-Script Hierarchy for Multi-Sig Wallets | Fontaine | Standard -| Proposed +| Final |- style="background-color: #cfffcf" | [[bip-0049.mediawiki|49]] | Applications diff --git a/bip-0048.mediawiki b/bip-0048.mediawiki index e2596e89..36cb18d0 100644 --- a/bip-0048.mediawiki +++ b/bip-0048.mediawiki @@ -5,7 +5,7 @@ Author: Fontaine Comments-Summary: No comments Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0048 - Status: Proposed + Status: Final Type: Standards Track Created: 2020-12-16 License: MIT @@ -99,11 +99,11 @@ Hardened derivation is used at this level. ===Script=== -This level splits the key space into three separate script_type(s). To provide +This level splits the key space into two separate script_type(s). To provide forward compatibility for future script types this specification can be easily extended. -Currently the only script types covered by this BIP are Native Segwit (p2wsh), -Nested Segwit (p2sh-p2wsh), and Taproot (p2tr). +Currently the only script types covered by this BIP are Native Segwit (p2wsh) and +Nested Segwit (p2sh-p2wsh). The following path represents Nested Segwit (p2sh-p2wsh) mainnet, account 0: 1': Nested Segwit (p2sh-p2wsh) m/48'/0'/0'/1'
@@ -111,14 +111,8 @@ The following path represents Nested Segwit (p2sh-p2wsh) mainnet, account 0: The following path represents Native Segwit (p2wsh) mainnet, account 0: 2': Native Segwit (p2wsh) m/48'/0'/0'/2'
-The following path represents Taproot (p2tr) mainnet, account 0: -3': Taproot (p2tr) m/48'/0'/0'/3'
- The recommended default for wallets is pay to witness script hash m/48'/0'/0'/2'. -To add new script types submit a PR to this specification and include it in the list above: -X': Future script type m/48'/0'/0'/X'
- ===Change=== Constant 0 is used for external chain and constant 1 for internal chain (also @@ -195,13 +189,6 @@ Public derivation is used at this level. |second |m / 48' / 0' / 1' / 2' / 0 / 1 |- -|mainnet -|first -|p2tr -|external -|first -|m / 48' / 0' / 0' / 3' / 0 / 0 -|- |testnet |first |p2sh-p2wsh @@ -257,13 +244,6 @@ Public derivation is used at this level. |change |second |m / 48' / 1' / 1' / 2' / 1 / 1 -|- -|testnet -|first -|p2tr -|external -|first -|m / 48' / 1' / 0' / 3' / 0 / 0 |}