From f29553e085ca3791ccfa5b872771f601f97f6f4c Mon Sep 17 00:00:00 2001
From: Murch <murch@murch.one>
Date: Tue, 13 May 2025 13:01:33 -0700
Subject: [PATCH 1/4] Revert "BIP48: Add p2tr script type derivation"

This reverts commit e7cf2e9149f9cbec36c07d7f02eacc16eaa306f5.
---
 bip-0048.mediawiki | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/bip-0048.mediawiki b/bip-0048.mediawiki
index e2596e89..f5528300 100644
--- a/bip-0048.mediawiki
+++ b/bip-0048.mediawiki
@@ -99,11 +99,11 @@ Hardened derivation is used at this level.
 
 ===Script===
 
-This level splits the key space into three separate <code>script_type</code>(s). To provide
+This level splits the key space into two separate <code>script_type</code>(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:
 <code>1'</code>: Nested Segwit (p2sh-p2wsh) <code>m/48'/0'/0'/1'</code></br>
@@ -111,9 +111,6 @@ The following path represents Nested Segwit (p2sh-p2wsh) mainnet, account 0:
 The following path represents Native Segwit (p2wsh) mainnet, account 0:
 <code>2'</code>: Native Segwit (p2wsh) <code>m/48'/0'/0'/2'</code></br>
 
-The following path represents Taproot (p2tr) mainnet, account 0:
-<code>3'</code>: Taproot (p2tr) <code>m/48'/0'/0'/3'</code></br>
-
 The recommended default for wallets is pay to witness script hash <code>m/48'/0'/0'/2'</code>.
 
 To add new script types submit a PR to this specification and include it in the list above:
@@ -257,13 +254,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
 |}
 
 

From b2ce382603abe1ece3af9847cdd7fdedad1d1ccc Mon Sep 17 00:00:00 2001
From: Murch <murch@murch.one>
Date: Tue, 13 May 2025 13:01:20 -0700
Subject: [PATCH 2/4] Revert P2TR example from "BIP48: Add P2SH-P2WSH and P2TR
 mainnet examples"

This partially reverts commit 9c22bcef63b5daa2d3407149701a03b6777b604a.
---
 bip-0048.mediawiki | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/bip-0048.mediawiki b/bip-0048.mediawiki
index f5528300..845adf8d 100644
--- a/bip-0048.mediawiki
+++ b/bip-0048.mediawiki
@@ -192,13 +192,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

From fc946e19893fc6d7478f7636b12599245c366f14 Mon Sep 17 00:00:00 2001
From: Murch <murch@murch.one>
Date: Tue, 13 May 2025 13:03:04 -0700
Subject: [PATCH 3/4] BIP48: Move to final

---
 README.mediawiki   | 4 ++--
 bip-0048.mediawiki | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.mediawiki b/README.mediawiki
index 80ddc0b8..77a6d180 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 845adf8d..c7d9d0e0 100644
--- a/bip-0048.mediawiki
+++ b/bip-0048.mediawiki
@@ -5,7 +5,7 @@
   Author: Fontaine <dentondevelopment@protonmail.com>
   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

From adafc92b9857337c10ccdd0c4eaac2900b6a3048 Mon Sep 17 00:00:00 2001
From: Murch <murch@murch.one>
Date: Wed, 14 May 2025 15:11:59 -0700
Subject: [PATCH 4/4] BIP48: Remove invitation to add more script types

---
 bip-0048.mediawiki | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bip-0048.mediawiki b/bip-0048.mediawiki
index c7d9d0e0..36cb18d0 100644
--- a/bip-0048.mediawiki
+++ b/bip-0048.mediawiki
@@ -113,9 +113,6 @@ The following path represents Native Segwit (p2wsh) mainnet, account 0:
 
 The recommended default for wallets is pay to witness script hash <code>m/48'/0'/0'/2'</code>.
 
-To add new script types submit a PR to this specification and include it in the list above:
-<code>X'</code>: Future script type <code>m/48'/0'/0'/X'</code></br>
-
 ===Change===
 
 Constant 0 is used for external chain and constant 1 for internal chain (also