summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.mediawiki6
-rw-r--r--bip-0102.mediawiki42
-rw-r--r--bip-0121.mediawiki5
3 files changed, 50 insertions, 3 deletions
diff --git a/README.mediawiki b/README.mediawiki
index aa23fe6..94537b7 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -308,6 +308,12 @@ Those proposing changes should consider that ultimately consent may rest with th
| Standard
| Draft
|-
+| [[bip-0102.mediawiki|101]]
+| Block size increase to 2MB
+| Jeff Garzik
+| Standard
+| Draft
+|-
| [[bip-0105.mediawiki|105]]
| Consensus based block size retargeting algorithm
| BtcDrak
diff --git a/bip-0102.mediawiki b/bip-0102.mediawiki
new file mode 100644
index 0000000..6694cb8
--- /dev/null
+++ b/bip-0102.mediawiki
@@ -0,0 +1,42 @@
+<pre>
+ BIP: 102
+ Title: Block size increase to 2MB
+ Author: Jeff Garzik <jgarzik@gmail.com>
+ Status: Draft
+ Type: Standards Track
+ Created: 2015-06-23
+</pre>
+
+==Abstract==
+
+Increase total amount of transaction data permitted in a block from 1MB to 2MB on November 11, 2015.
+
+==Motivation==
+
+# Enable network growth.
+# Continue current economic policy of low fee pressure on average.
+# Exercise network upgrade procedure.
+
+==Specification==
+
+# Maximum block size permitted to be valid is 1MB.
+# Increase this maximum to 2MB on November 11, 2015 at 00:00:00 UTC.
+# Increase maximum block sigops by similar factor, preserving SIZE/50 formula.
+
+==Backward compatibility==
+
+Older clients are not compatible with this change. The first block exceeding 1,000,000 bytes will partition older clients off the new network.
+
+==Discussion==
+
+In the short term, an increase is needed to continue to facilitate
+network growth, and buy time for more comprehensive solutions to be
+developed. This continues the current economic policies with regards to
+fees, matching market expectations and preventing market disruption.
+
+In the long term, continued direct management of this limit is a moral hazard that clouds free market input and prevents a healthy fee market from developing. This area of code should be transitioned away from direct management.
+
+==Implementation==
+
+https://github.com/jgarzik/bitcoin/tree/2015_2mb_blocksize
+
diff --git a/bip-0121.mediawiki b/bip-0121.mediawiki
index de89f0c..716f3c9 100644
--- a/bip-0121.mediawiki
+++ b/bip-0121.mediawiki
@@ -106,8 +106,7 @@ Wallet implementations must support the <tt>http:</tt> and
<tt>https:</tt> schemes in which case <tt>POST</tt> method must be
used. The content type of the POST request must be set to
- Content-Type: application/bitcoin-pop
- Content-Transfer-Encoding: binary
+ application/bitcoin-pop
== Examples ==
@@ -115,7 +114,7 @@ Send PoP for a transaction with label "video 42923" to
<nowiki>https://www.example.com/pop/352</nowiki>, using nonce
<tt>0x73 0xd5 0x1a 0xbb 0xd8 0x9c</tt>:
<pre>
- btcpop:?p=https://www.example.com/pop/352&n=zgWTm8yH&label=video 42923
+ btcpop:?p=https://www.example.com/pop/352&n=zgWTm8yH&label=video%2042923
</pre>
Send PoP through mail using
<nowiki>mailto:pop@example.com?subject=pop444</nowiki>, amount