diff options
author | Luke-Jr <luke_github1@dashjr.org> | 2015-11-07 06:19:23 +0000 |
---|---|---|
committer | Luke-Jr <luke_github1@dashjr.org> | 2015-11-07 06:19:23 +0000 |
commit | 1bc807558f322be7917429768e517813c6ee6fcd (patch) | |
tree | 5ccdd1d883e5a2ba4bd4786cdc8fb8aa3aaab9a4 | |
parent | 4f79338aa2536a5f422b535c496e467d30b7e947 (diff) | |
parent | aad81251a18c47462055eb63eb2280570662f053 (diff) | |
download | bips-1bc807558f322be7917429768e517813c6ee6fcd.tar.xz |
Merge pull request #236 from jgarzik/2015_2mb_blocksize
BIP 102: Add miner vote. Fix index.
-rw-r--r-- | README.mediawiki | 2 | ||||
-rw-r--r-- | bip-0102.mediawiki | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/README.mediawiki b/README.mediawiki index 94537b7..4ecf92f 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -308,7 +308,7 @@ Those proposing changes should consider that ultimately consent may rest with th | Standard | Draft |- -| [[bip-0102.mediawiki|101]] +| [[bip-0102.mediawiki|102]] | Block size increase to 2MB | Jeff Garzik | Standard diff --git a/bip-0102.mediawiki b/bip-0102.mediawiki index 6694cb8..b75f798 100644 --- a/bip-0102.mediawiki +++ b/bip-0102.mediawiki @@ -9,7 +9,7 @@ ==Abstract== -Increase total amount of transaction data permitted in a block from 1MB to 2MB on November 11, 2015. +Simple, one-time increase in total amount of transaction data permitted in a block from 1MB to 2MB. ==Motivation== @@ -20,7 +20,7 @@ Increase total amount of transaction data permitted in a block from 1MB to 2MB o ==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 this maximum to 2MB as soon as 75% of the last 1,000 blocks have signaled support. # Increase maximum block sigops by similar factor, preserving SIZE/50 formula. ==Backward compatibility== |