diff options
| author | Mike Hearn <mike@plan99.net> | 2014-03-10 18:59:12 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-03-11 16:45:54 +0100 |
| commit | 1eedbbb3a6bbb0070cf7f11929ea261a8d6c0b11 (patch) | |
| tree | 5458261bc87df8a715b8443c9a427c4b6eec49ce /src/main.h | |
| parent | ff882789af7b24db6095690ae83d0bae38ddb998 (diff) | |
| download | bitcoin-1eedbbb3a6bbb0070cf7f11929ea261a8d6c0b11.tar.xz | |
Make mining fee policy match relay fee policy.
This resolves a case in which a mismatch could be used to bloat up the
mempool by sending transactions that pay enough fee to relay, but not
to be mined, with the default policies.
Rebased-From: 037b4f1
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index 781562854f..4cf70f7271 100644 --- a/src/main.h +++ b/src/main.h @@ -35,8 +35,9 @@ class CInv; /** The maximum allowed size for a serialized block, in bytes (network rule) */ static const unsigned int MAX_BLOCK_SIZE = 1000000; -/** Default for -blockmaxsize, maximum size for mined blocks **/ +/** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/ static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000; +static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0; /** 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 */ |