aboutsummaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorMike Hearn <mike@plan99.net>2014-03-10 18:59:12 +0100
committerMike Hearn <mike@plan99.net>2014-03-10 19:17:18 +0100
commit037b4f1485404a69f96ac6c448a97d21315c8663 (patch)
treefecba95feb0e545766945a82f172960d802815d6 /src/main.h
parenta63f8b7b36e39722024a0ba061ca214f00a8f1bd (diff)
downloadbitcoin-037b4f1485404a69f96ac6c448a97d21315c8663.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.
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h
index 1b1aca4e05..b9c8dd7050 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 */