Merge BIPs 123 & 2 activation and implementation

1 files changed, 15 insertions, 15 deletions

diff --git a/README.mediawiki b/README.mediawiki
index ed46917..a5bed78 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -12,18 +12,18 @@ Those proposing changes should consider that ultimately consent may rest with th
 !Owner
 !Type
 !Status
-|- style="background-color: #cfffcf"
+|- style="background-color: #ffcfcf"
 | [[bip-0001.mediawiki|1]]
 | BIP Purpose and Guidelines
 | Amir Taaki
 | Process
-| Active
-|-
+| Replaced
+|- style="background-color: #cfffcf"
 | [[bip-0002.mediawiki|2]]
 | BIP process, revised
 | Luke Dashjr
 | Process
-| Draft
+| Active
 |- style="background-color: #cfffcf"
 | [[bip-0009.mediawiki|9]]
 | Version bits with timeout and delay
@@ -83,7 +83,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | hashScriptCheck
 | Luke Dashjr
 | Standard
-| Accepted
+| Proposed
 |-
 | [[bip-0019.mediawiki|19]]
 | M-of-N Standard Transactions (Low SigOp)
@@ -173,7 +173,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Mnemonic code for generating deterministic keys
 | Marek Palatinus, Pavol Rusnak, Aaron Voisine, Sean Bowe
 | Standard
-| Accepted
+| Proposed
 |-
 | 40
 | Stratum wire protocol
@@ -203,13 +203,13 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Multi-Account Hierarchy for Deterministic Wallets
 | Marek Palatinus, Pavol Rusnak
 | Standard
-| Accepted
+| Proposed
 |- style="background-color: #ffffcf"
 | [[bip-0045.mediawiki|45]]
 | Structure for Deterministic P2SH Multisignature Wallets
 | Manuel Araoz, Ryan X. Charles, Matias Alejo Garcia
 | Standard
-| Accepted
+| Proposed
 |-
 | [[bip-0047.mediawiki|47]]
 | Reusable Payment Codes for Hierarchical Deterministic Wallets
@@ -276,7 +276,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Deterministic Pay-to-script-hash multi-signature addresses through public key sorting
 | Thomas Kerin, Jean-Pierre Rupp, Ruben de Vries
 | Standard
-| Accepted
+| Proposed
 |- style="background-color: #cfffcf"
 | [[bip-0068.mediawiki|68]]
 | Relative lock-time using consensus-enforced sequence numbers
@@ -288,7 +288,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Lexicographical Indexing of Transaction Inputs and Outputs
 | Kristov Atlas
 | Informational
-| Accepted
+| Proposed
 |- style="background-color: #cfffcf"
 | [[bip-0070.mediawiki|70]]
 | Payment Protocol
@@ -402,7 +402,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | NODE_BLOOM service bit
 | Matt Corallo, Peter Todd
 | Standard
-| Accepted
+| Proposed
 |- style="background-color: #cfffcf"
 | [[bip-0112.mediawiki|112]]
 | CHECKSEQUENCEVERIFY
@@ -439,12 +439,12 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Marco Pontello
 | Standard
 | Draft
-|-
+|- style="background-color: #cfffcf"
 | [[bip-0123.mediawiki|123]]
 | BIP Classification
 | Eric Lombrozo
 | Process
-| Draft
+| Active
 |-
 | [[bip-0124.mediawiki|124]]
 | Hierarchical Deterministic Script Templates
@@ -456,7 +456,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Opt-in Full Replace-by-Fee Signaling
 | David A. Harding, Peter Todd
 | Standard
-| Accepted
+| Proposed
 |-
 | [[bip-0126.mediawiki|126]]
 | Best Practices for Heterogeneous Input Script Transactions
@@ -468,7 +468,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | sendheaders message
 | Suhas Daftuar
 | Standard
-| Accepted
+| Proposed
 |-
 | [[bip-0131.mediawiki|131]]
 | "Coalescing Transaction" Specification (wildcard inputs)