summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2017-05-07 22:05:18 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2017-05-07 22:05:46 +0000
commit3b3a9db960f98c6ea2c370f78fc4113a0761aeff (patch)
tree7025e0650182d3bf8421920b38d279c2741dab4a
parentb455cad3f85ae33f9bc92c9a71cacf4d88934e9b (diff)
downloadbips-3b3a9db960f98c6ea2c370f78fc4113a0761aeff.tar.xz
Assign BIP 135: Generalized version bits voting
-rw-r--r--README.mediawiki7
-rw-r--r--bip-0135.mediawiki (renamed from bip-genvbvoting.mediawiki)17
-rw-r--r--bip-0135/bip-0135-states-small.png (renamed from bip-genvbvoting/bip-genvbvoting-states-small.png)bin36260 -> 36260 bytes
-rw-r--r--bip-0135/bip-0135-states.png (renamed from bip-genvbvoting/bip-genvbvoting-states.png)bin158832 -> 158832 bytes
-rw-r--r--bip-0135/bip-0135-states.svg (renamed from bip-genvbvoting/bip-genvbvoting-states.svg)2
5 files changed, 17 insertions, 9 deletions
diff --git a/README.mediawiki b/README.mediawiki
index 5edf334..d31a620 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -589,6 +589,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| Standard
| Draft
|-
+| [[bip-0135.mediawiki|135]]
+|
+| Generalized version bits voting
+| Sancho Panza
+| Informational
+| Draft
+|-
| [[bip-0140.mediawiki|140]]
| Consensus (soft fork)
| Normalized TXID
diff --git a/bip-genvbvoting.mediawiki b/bip-0135.mediawiki
index c11e4c4..cb6f9a0 100644
--- a/bip-genvbvoting.mediawiki
+++ b/bip-0135.mediawiki
@@ -1,16 +1,17 @@
<pre>
- BIP: ?
+ BIP: 135
Title: Generalized version bits voting
Author: Sancho Panza <sanch0panza@protonmail.com>
- Comments-Summary: Mixed review (3 persons)
- Comments-URI: https://bitco.in/forum/threads/bip9-generalized-version-bits-voting-bip-genvbvoting.1968/
- https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2017-April/013969.html
+ Comments-Summary: No comments yet.
+ Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0135
+ https://bitco.in/forum/threads/bip9-generalized-version-bits-voting-bip-genvbvoting.1968/
Status: Draft
Type: Informational
- Replaces: 9
Created: 2017-03-29
License: CC0-1.0
GNU-All-Permissive
+ Post-History: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2017-April/013969.html
+ Replaces: 9
</pre>
@@ -158,7 +159,7 @@ changes (including after reorganizations).
The following diagram illustrates the generalized state machine:
-<img src="bip-genvbvoting/bip-genvbvoting-states-small.png" align="middle"></img>
+<img src="bip-0135/bip-0135-states-small.png" align="middle"></img>
<br>
'''NOTES:'''
@@ -330,7 +331,7 @@ The following table describes mainnet compatibility options (95%, 2016 blocks):
{| class="wikitable"
!colspan=3 |
|-
-! Parameter !! BIP9 value !! BIP-GENVBVOTING value
+! Parameter !! BIP9 value !! BIP135 value
|-
| name || some_name || some_name
|-
@@ -354,7 +355,7 @@ The following table describes testnet compatibility options (75%, 2016 blocks):
{| class="wikitable"
!colspan=3 |
|-
-! Parameter !! BIP9 value !! BIP-GENVBVOTING value
+! Parameter !! BIP9 value !! BIP135 value
|-
| name || some_name || some_name
|-
diff --git a/bip-genvbvoting/bip-genvbvoting-states-small.png b/bip-0135/bip-0135-states-small.png
index 9191ae3..9191ae3 100644
--- a/bip-genvbvoting/bip-genvbvoting-states-small.png
+++ b/bip-0135/bip-0135-states-small.png
Binary files differ
diff --git a/bip-genvbvoting/bip-genvbvoting-states.png b/bip-0135/bip-0135-states.png
index ace0617..ace0617 100644
--- a/bip-genvbvoting/bip-genvbvoting-states.png
+++ b/bip-0135/bip-0135-states.png
Binary files differ
diff --git a/bip-genvbvoting/bip-genvbvoting-states.svg b/bip-0135/bip-0135-states.svg
index cb737a9..4b06ef9 100644
--- a/bip-genvbvoting/bip-genvbvoting-states.svg
+++ b/bip-0135/bip-0135-states.svg
@@ -14,7 +14,7 @@
id="svg2"
version="1.1"
inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="bip-genvbvoting-states.svg">
+ sodipodi:docname="bip-0135-states.svg">
<defs
id="defs4">
<marker