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/main.h | |
| 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/main.h')
| -rw-r--r-- | src/main.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main.h b/src/main.h index c52f37cc87..fd5e352cb6 100644 --- a/src/main.h +++ b/src/main.h @@ -35,10 +35,12 @@ class CInv; /** The maximum allowed size for a serialized block, in bytes (network rule) */ static const unsigned int MAX_BLOCK_SIZE = 1000000; -/** The maximum size for mined blocks */ -static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; +/** Default for -blockmaxsize, maximum size for mined blocks **/ +static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000; +/** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/ +static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000; /** The maximum size for transactions we're willing to relay/mine */ -static const unsigned int MAX_STANDARD_TX_SIZE = MAX_BLOCK_SIZE_GEN/5; +static const unsigned int MAX_STANDARD_TX_SIZE = 100000; /** The maximum allowed number of signature check operations in a block (network rule) */ static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; /** The maximum number of orphan transactions kept in memory */ @@ -55,8 +57,6 @@ static const int COINBASE_MATURITY = 100; static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC /** Maximum number of script-checking threads allowed */ static const int MAX_SCRIPTCHECK_THREADS = 16; -/** Default amount of block size reserved for high-priority transactions (in bytes) */ -static const int DEFAULT_BLOCK_PRIORITY_SIZE = 27000; #ifdef USE_UPNP static const int fHaveUPnP = true; #else |