Skip to content

Commit beabca2

Browse files
author
Jeff Garzik
committed
Merge pull request #3305 from mikehearn/fee_drop
Drop fees by 10x due to the persistently higher exchange rate.
2 parents 05619d7 + 6a4c196 commit beabca2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/core.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ class CTxOut
156156
// to spend something, then we consider it dust.
157157
// A typical txout is 34 bytes big, and will
158158
// need a CTxIn of at least 148 bytes to spend,
159-
// so dust is a txout less than 54 uBTC
160-
// (5460 satoshis) with default nMinRelayTxFee
159+
// so dust is a txout less than 546 satoshis
160+
// with default nMinRelayTxFee.
161161
return ((nValue*1000)/(3*((int)GetSerializeSize(SER_DISK,0)+148)) < nMinRelayTxFee);
162162
}
163163

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ unsigned int nCoinCacheSize = 5000;
5252
/** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */
5353
int64_t CTransaction::nMinTxFee = 10000; // Override with -mintxfee
5454
/** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */
55-
int64_t CTransaction::nMinRelayTxFee = 10000;
55+
int64_t CTransaction::nMinRelayTxFee = 1000;
5656

5757
static CMedianFilter<int> cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have
5858

src/test/transaction_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,10 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
271271
string reason;
272272
BOOST_CHECK(IsStandardTx(t, reason));
273273

274-
t.vout[0].nValue = 5011; // dust
274+
t.vout[0].nValue = 501; // dust
275275
BOOST_CHECK(!IsStandardTx(t, reason));
276276

277-
t.vout[0].nValue = 6011; // not dust
277+
t.vout[0].nValue = 601; // not dust
278278
BOOST_CHECK(IsStandardTx(t, reason));
279279

280280
t.vout[0].scriptPubKey = CScript() << OP_1;

0 commit comments

Comments
 (0)