Merge pull request bitcoin#645 from kallerosenbaum/master

Withdrawing BIP120/121 due to security issues during soft-forks
batermj · Feb 10, 2018 · e38387e · e38387e
2 parents 2d5fc7a + a7819e4
commit e38387e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/README.mediawiki b/README.mediawiki
@@ -546,20 +546,20 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Mark Friedenbach, Kalle Alm, BtcDrak
 | Standard
 | Draft
-|-
+|- style="background-color: #ffcfcf"
 | [[bip-0120.mediawiki|120]]
 | Applications
 | Proof of Payment
 | Kalle Rosenbaum
 | Standard
-| Draft
-|-
+| Withdrawn
+|- style="background-color: #ffcfcf"
 | [[bip-0121.mediawiki|121]]
 | Applications
 | Proof of Payment URI scheme
 | Kalle Rosenbaum
 | Standard
-| Draft
+| Withdrawn
 |-
 | [[bip-0122.mediawiki|122]]
 | Applications

diff --git a/bip-0120.mediawiki b/bip-0120.mediawiki
@@ -5,7 +5,7 @@
   Author: Kalle Rosenbaum <kalle@rosenbaum.se>
   Comments-Summary: No comments yet.
   Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0120
-  Status: Draft
+  Status: Withdrawn
   Type: Standards Track
   Created: 2015-07-28
 </pre>

diff --git a/bip-0121.mediawiki b/bip-0121.mediawiki
@@ -5,7 +5,7 @@
   Author: Kalle Rosenbaum <kalle@rosenbaum.se>
   Comments-Summary: No comments yet.
   Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0121
-  Status: Draft
+  Status: Withdrawn
   Type: Standards Track
   Created: 2015-07-27
 </pre>