diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-13 05:39:27 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-13 05:39:35 +0100 |
| commit | 150771c4f31cf71cb97a9589e21d8882454fbc53 (patch) | |
| tree | 94443785dd434f9caf103d0bede4d65823de162f /src/miner.cpp | |
| parent | d670cdd6986d6fba6e44944b59d7baf90c8313fa (diff) | |
| parent | ad898b40aaf06c1cc7ac12e953805720fc9217c0 (diff) | |
| download | bitcoin-150771c4f31cf71cb97a9589e21d8882454fbc53.tar.xz | |
Merge pull request #3326
ad898b4 Increase default -blockmaxsize/prioritysize to 750K/50K (Gavin Andresen)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 49f6ec6b95..edfbbf5736 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -124,7 +124,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) pblocktemplate->vTxSigOps.push_back(-1); // updated at end // Largest block you're willing to create: - unsigned int nBlockMaxSize = GetArg("-blockmaxsize", MAX_BLOCK_SIZE_GEN/2); + unsigned int nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE); // Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity: nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize)); |