diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-09 19:36:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-11 10:37:15 +0200 |
| commit | 842c48dba39e9ad7a74d21106a67e047e3d79ced (patch) | |
| tree | 8e240e41fbd9c4a7d769e2cd6d19ce9122c4a5f2 | |
| parent | 91ef4d93d4952759a6c766fd94eaf2c1df78c372 (diff) | |
| download | bitcoin-842c48dba39e9ad7a74d21106a67e047e3d79ced.tar.xz | |
Bump minrelaytxfee default
To bridge the time until a dynamic method for determining this fee is
merged.
This is especially aimed at the stable releases (0.10, 0.11) because
full mempool limiting, as will be in 0.12, is too invasive and risky to
backport.
Github-Pull: #6793
Rebased-From: 28e3249e53b8ef7516636df0f1406466a513095d 4e2efb3c5fde4b1e332cc032e3dc4082ec4e3cac
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/test/transaction_tests.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index ce87aef68f..b4de509d4c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -56,7 +56,7 @@ unsigned int nCoinCacheSize = 5000; bool fAlerts = DEFAULT_ALERTS; /** Fees smaller than this (in satoshi) are considered zero fee (for relaying and mining) */ -CFeeRate minRelayTxFee = CFeeRate(1000); +CFeeRate minRelayTxFee = CFeeRate(5000); CTxMemPool mempool(::minRelayTxFee); diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 519ce6c319..a732dfa833 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -341,7 +341,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandard) t.vout[0].nValue = 501; // dust BOOST_CHECK(!IsStandardTx(t, reason)); - t.vout[0].nValue = 601; // not dust + t.vout[0].nValue = 2730; // not dust BOOST_CHECK(IsStandardTx(t, reason)); t.vout[0].scriptPubKey = CScript() << OP_1; |