Permalink
Browse files

Update default configuration to produce larger blocks.

  • Loading branch information...
jgarzik committed Nov 17, 2017
1 parent 385cbc9 commit d09f3decfa2806515a0504be927c4384d6241dba
Showing with 5 additions and 3 deletions.
  1. +3 −1 src/miner.cpp
  2. +2 −2 src/policy/policy.h
View
@@ -75,6 +75,8 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam
BlockAssembler::BlockAssembler(const CChainParams& _chainparams)
: chainparams(_chainparams)
{
fWitnessSeasoned = true;
// Block resource limits
// If neither -blockmaxsize or -blockmaxweight is given, limit to DEFAULT_BLOCK_MAX_*
// If only one is given, only restrict the specified resource.
@@ -118,7 +120,7 @@ void BlockAssembler::resetBlock()
nBlockWeight = 4000;
nBlockSigOpsCost = 400;
fIncludeWitness = false;
fWitnessSeasoned = false;
fWitnessSeasoned = true;
// These counters do not include coinbase tx
nBlockTx = 0;
View
@@ -15,11 +15,11 @@
class CCoinsViewCache;
/** Default for -blockmaxsize, which controls the maximum size of block the mining code will create **/
static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000;
static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 1750000;
/** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 0;
/** Default for -blockmaxweight, which controls the range of block weights the mining code will create **/
static const unsigned int DEFAULT_BLOCK_MAX_WEIGHT = 3000000;
static const unsigned int DEFAULT_BLOCK_MAX_WEIGHT = 5000000;
/** Default for -blockmintxfee, which sets the minimum feerate for a transaction in blocks created by mining code **/
static const unsigned int DEFAULT_BLOCK_MIN_TX_FEE = 1000;
/** The maximum weight for transactions we're willing to relay/mine */

0 comments on commit d09f3de

Please sign in to comment.