[Pkg-bitcoin-commits] [bitcoin] 108/126: Use a sensible default for blockmaxweight

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.15.1_dfsg-1
in repository bitcoin.

commit 4c82cea99b514193672d8145c7777f3e715694ec
Author: Matt Corallo <git at bluematt.me>
Date:   Fri Aug 25 12:06:13 2017 -0400

    Use a sensible default for blockmaxweight
    
    No sensible user will ever keep the default settings here, so not
    having sensible defaults only serves to screw users who are
    paying less attention, which makes for terrible defaults.
    
    Github-Pull: #11100
    Rebased-From: 3dc263c9b9068ee9793b6c7a0023eff16d70fb8f
---
 src/policy/policy.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/policy/policy.h b/src/policy/policy.h
index 7024713..ef71dd7 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -17,7 +17,7 @@ class CCoinsViewCache;
 class CTxOut;
 
 /** 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 = MAX_BLOCK_WEIGHT - 4000;
 /** 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 */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/bitcoin.git