From c9517ecf8708f9745cc9d608b7936dff6c541b57 Mon Sep 17 00:00:00 2001
From: Fonta1n3 <fontainedenton@googlemail.com>
Date: Wed, 16 Dec 2020 22:05:54 +0800
Subject: [PATCH] fixes

---
 .DS_Store          | Bin 0 -> 18436 bytes
 bip-0048.mediawiki |  90 +++++++++++++++++++++++++++------------------
 2 files changed, 55 insertions(+), 35 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6f80a1ec80f0b10f9fff8b6300c28c0adeff69b9
GIT binary patch
literal 18436
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
M^#ZTHSo8nC0iP6&JOBUy

literal 0
HcmV?d00001

diff --git a/bip-0048.mediawiki b/bip-0048.mediawiki
index 7c398239..386b410e 100644
--- a/bip-0048.mediawiki
+++ b/bip-0048.mediawiki
@@ -3,7 +3,7 @@
   Layer: Applications
   Title: Multi-Account/Multi-Script Hierarchy for Deterministic Multi Signature Wallets
   Author: Peter Denton <dentondevelopment@protonmail.com>
-  Comments-Summary: Mixed review (one person)
+  Comments-Summary: No comments
   Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0048
   Status: Proposed
   Type: Standards Track
@@ -27,7 +27,7 @@ millions of addresses per chain.
 ==Key sorting==
 
 Any wallet that supports BIP48 inherently supports deterministic key sorting as per BIP67 so that all possible
-multi-signature addresses/scripts are derived from deterministically ordered public keys.
+multi-signature addresses/scripts are derived from deterministically sorted public keys.
 
 ==Path levels==
 
@@ -37,7 +37,7 @@ We define the following 6 levels in BIP32 path:
 m / purpose' / coin_type' / account' / script_type' / change / address_index
 </pre>
 
-`h` in the path indicates that BIP32 hardened derivation is used.
+<code>h</code> or <code>'</code> in the path indicates that BIP32 hardened derivation is used.
 
 Each level has a special meaning, described in the chapters below.
 
@@ -55,7 +55,7 @@ Sharing the same space for various networks has some disadvantages.
 
 Avoiding reusing addresses across networks and improving privacy issues.
 
-Coin type `0` for mainnet and `1` for testnet.
+Coin type <code>0</code> for mainnet and <code>1</code> for testnet.
 
 Hardened derivation is used at this level.
 
@@ -82,16 +82,18 @@ an external source. Such an algorithm is described in "Account discovery" chapte
 
 ===Script===
 
-This level splits the key space into three separate `script_type`(s). To provide
+This level splits the key space into three separate <code>script_type</code>(s). To provide
 optimum backward compatibility.
 
-The recommended default is pay to witness script hash `m/48'/0'/0'/2'`.
+The recommended default is pay to witness script hash <code>m/48'/0'/0'/2'</code>.
 
 The following represent mainnet, account 0.
 
-`1'`: Nested Segwit (p2sh-p2wsh) `m/48'/0'/0'/1'`</br>
-`2'`: Native Segwit (p2wsh) `m/48'/0'/0'/2'`</br>
-`3'`: Legacy (p2sh) `m/48'/0'/0'/3'`</br>
+<code>1'</code>: Nested Segwit (p2sh-p2wsh) <code>m/48'/0'/0'/1'</code></br>
+<code>2'</code>: Native Segwit (p2wsh) <code>m/48'/0'/0'/2'</code></br>
+<code>3'</code>: Legacy (p2sh) <code>m/48'/0'/0'/3'</code></br>
+
+Easily expanded to account for new script types.
 
 ===Change===
 
@@ -142,109 +144,127 @@ an external chain by generating a new address.
 ==Examples==
 
 {|
-!coin
-!account
-!script
-!chain
-!address
-!path
+|network
+|account
+|script
+|chain
+|address
+|path
 |-
-|Bitcoin
+|mainnet
 |first
+|p2wsh
 |external
 |first
 |m / 48' / 0' / 0' / 2' / 0 / 0
 |-
-|Bitcoin
+|mainnet
 |first
+|p2wsh
 |external
 |second
 |m / 48' / 0' / 0' / 2' / 0 / 1
 |-
-|Bitcoin
+|mainnet
 |first
+|p2wsh
 |change
 |first
 |m / 48' / 0' / 0' / 2' / 1 / 0
 |-
-|Bitcoin
+|mainnet
 |first
+|p2wsh
 |change
 |second
 |m / 48' / 0' / 0' / 2' / 1 / 1
 |-
-|Bitcoin
+|mainnet
 |second
+|p2wsh
 |external
 |first
 |m / 48' / 0' / 1' / 2' / 0 / 0
 |-
-|Bitcoin
+|mainnet
 |second
+|p2wsh
 |external
 |second
 |m / 48' / 0' / 1' / 2' / 0 / 1
 |-
-|Bitcoin
+|mainnet
 |second
+|p2sh
 |change
 |first
-|m / 48' / 0' / 1' / 2' / 1 / 0
+|m / 48' / 0' / 1' / 3' / 1 / 0
 |-
-|Bitcoin
+|mainnet
 |second
+|p2sh
 |change
 |second
-|m / 48' / 1' / 1' / 2' / 1 / 1
+|m / 48' / 1' / 1' / 3' / 1 / 1
 |-
-|Bitcoin Testnet
+|testnet
 |first
+|p2sh-p2wsh
 |external
 |first
-|m / 48' / 1' / 0' / 2' / 0 / 0
+|m / 48' / 1' / 0' / 1' / 0 / 0
 |-
-|Bitcoin Testnet
+|testnet
 |first
+|p2wsh
 |external
 |second
 |m / 48' / 1' / 0' / 2' / 0 / 1
 |-
-|Bitcoin Testnet
+|testnet
 |first
+|p2wsh
 |change
 |first
 |m / 48' / 1' / 0' / 2' / 1 / 0
 |-
-|Bitcoin Testnet
+|testnet
 |first
+|p2wsh
 |change
 |second
 |m / 48' / 1' / 0' / 2' / 1 / 1
 |-
-|Bitcoin Testnet
+|testnet
 |second
+|p2wsh
 |external
 |first
 |m / 48' / 1' / 1' / 2' / 0 / 0
 |-
-|Bitcoin Testnet
+|testnet
 |second
+|p2wsh
 |external
 |second
 |m / 48' / 1' / 1' / 2' / 0 / 1
 |-
-|Bitcoin Testnet
+|testnet
 |second
+|p2wsh
 |change
 |first
 |m / 48' / 1' / 1' / 2' / 1 / 0
 |-
-|Bitcoin Testnet
+|testnet
 |second
+|p2wsh
 |change
 |second
 |m / 48 h / 1' / 1' / 2' / 1 / 1
-|}
+|-
+}|
+
 
 ==Reference==