Auto merge of #962 - ebfull:2mb-blocks, r=ebfull

Increase block size limit to 2MB.

http://gavinandresen.ninja/a-guided-tour-of-the-2mb-fork

Closes #765.
This commit is contained in:
zkbot 2016-06-28 17:46:47 +00:00
commit 68b8b95c53
1 changed files with 2 additions and 2 deletions

View File

@ -7,9 +7,9 @@
#define BITCOIN_CONSENSUS_CONSENSUS_H
/** The maximum allowed size for a serialized block, in bytes (network rule) */
static const unsigned int MAX_BLOCK_SIZE = 1000000;
static const unsigned int MAX_BLOCK_SIZE = 2000000;
/** The maximum allowed number of signature check operations in a block (network rule) */
static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50;
static const unsigned int MAX_BLOCK_SIGOPS = 20000;
/** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
static const int COINBASE_MATURITY = 100;