Skip to content

Commit

Permalink
Bump minrelaytxfee default
Browse files Browse the repository at this point in the history
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: bitcoin#6793
Rebased-From: 28e3249 4e2efb3
  • Loading branch information
laanwj committed Oct 11, 2015
1 parent 91ef4d9 commit 842c48d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main.cpp
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/test/transaction_tests.cpp
Expand Up @@ -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;
Expand Down

0 comments on commit 842c48d

Please sign in to comment.