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:52 +0200 |
| commit | e7bcc4aac3a1a2b62d53c0261e803786123477a8 (patch) | |
| tree | e066222d6fa9b977fda1464548a39752f0da3c15 /src | |
| parent | 4dbcec03ab1e0bc312378cbc16c1b11116f5e506 (diff) | |
| download | bitcoin-e7bcc4aac3a1a2b62d53c0261e803786123477a8.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
Diffstat (limited to 'src')
| -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 1b4630787d..f6deaa29b6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -64,7 +64,7 @@ uint64_t nPruneTarget = 0; 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 d12535e438..4439814ece 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -343,7 +343,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; |