From 23c6d3aba8a7de8272ffffc7e8ca69a90aa86159 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Tue, 24 May 2016 11:23:55 -0600 Subject: [PATCH 1/2] Increase block size limit to 2MB. --- src/consensus/consensus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index fc2d01f9..c5704afd 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -7,7 +7,7 @@ #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; /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */ From 6ef996a3b60c5e85621acb5f1ef9ccf7da6a1925 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Wed, 25 May 2016 16:46:36 -0600 Subject: [PATCH 2/2] Make sigop limit `20000` just as in Bitcoin, ignoring our change to the blocksize limit. --- src/consensus/consensus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index c5704afd..e7f4e02f 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -9,7 +9,7 @@ /** The maximum allowed size for a serialized block, in bytes (network rule) */ 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;