Skip to content
Permalink
Browse files

Merge pull request #3305 from mikehearn/fee_drop

Drop fees by 10x due to the persistently higher exchange rate.
  • Loading branch information
Jeff Garzik
Jeff Garzik committed Feb 24, 2014
2 parents 05619d7 + 6a4c196 commit beabca2be092d0e2a1de26989d4e63a12cce1284
Showing with 5 additions and 5 deletions.
  1. +2 −2 src/core.h
  2. +1 −1 src/main.cpp
  3. +2 −2 src/test/transaction_tests.cpp
@@ -156,8 +156,8 @@ class CTxOut
// to spend something, then we consider it dust.
// A typical txout is 34 bytes big, and will
// need a CTxIn of at least 148 bytes to spend,
// so dust is a txout less than 54 uBTC
// (5460 satoshis) with default nMinRelayTxFee
// so dust is a txout less than 546 satoshis
// with default nMinRelayTxFee.
return ((nValue*1000)/(3*((int)GetSerializeSize(SER_DISK,0)+148)) < nMinRelayTxFee);
}

@@ -52,7 +52,7 @@ unsigned int nCoinCacheSize = 5000;
/** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */
int64_t CTransaction::nMinTxFee = 10000; // Override with -mintxfee
/** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */
int64_t CTransaction::nMinRelayTxFee = 10000;
int64_t CTransaction::nMinRelayTxFee = 1000;

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

@@ -271,10 +271,10 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
string reason;
BOOST_CHECK(IsStandardTx(t, reason));

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

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

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

2 comments on commit beabca2

@Diapolo

This comment has been minimized.

Copy link

Diapolo replied Feb 25, 2014

@cozz Does this require changes to GUI coin-control or the comments in which you also work with magic values?

@Diapolo

This comment has been minimized.

Please sign in to comment.
You can’t perform that action at this time.