Mercurial > hg > bitcoin

changeset 585:4ac30deba471 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #218 from jgarzik/fee-update Update TX fee to 0.0005 BTC
author Jeff Garzik <jgarzik@exmulti.com>
date Wed, 11 May 2011 18:16:36 -0700
parents c810d8d6be07 (current diff) d8ab48d87649 (diff)
children c45bb1488009 1ebf97e72365 afa7479934ea
files
diffstat 3 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -741,7 +741,7 @@
         // Continuously rate-limit free transactions
         // This mitigates 'penny-flooding' -- sending thousands of free transactions just to
         // be annoying or make other's transactions take longer to confirm.
-        if (nFees < CENT)
+        if (nFees < MIN_TX_FEE)
         {
             static CCriticalSection cs;
             static double dFreeCount;
--- a/src/main.h
+++ b/src/main.h
@@ -19,6 +19,7 @@
 static const int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50;
 static const int64 COIN = 100000000;
 static const int64 CENT = 1000000;
+static const int64 MIN_TX_FEE = 50000;
 static const int64 MAX_MONEY = 21000000 * COIN;
 inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
 static const int COINBASE_MATURITY = 100;
@@ -593,7 +594,7 @@
         // Base fee is 1 cent per kilobyte
         unsigned int nBytes = ::GetSerializeSize(*this, SER_NETWORK);
         unsigned int nNewBlockSize = nBlockSize + nBytes;
-        int64 nMinFee = (1 + (int64)nBytes / 1000) * CENT;
+        int64 nMinFee = (1 + (int64)nBytes / 1000) * MIN_TX_FEE;
 
         if (fAllowFree)
         {
@@ -612,11 +613,11 @@
             }
         }
 
-        // To limit dust spam, require a 0.01 fee if any output is less than 0.01
-        if (nMinFee < CENT)
+        // To limit dust spam, require MIN_TX_FEE if any output is less than 0.01
+        if (nMinFee < MIN_TX_FEE)
             foreach(const CTxOut& txout, vout)
                 if (txout.nValue < CENT)
-                    nMinFee = CENT;
+                    nMinFee = MIN_TX_FEE;
 
         // Raise the price as the block approaches full
         if (nBlockSize != 1 && nNewBlockSize >= MAX_BLOCK_SIZE_GEN/2)
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -196,7 +196,7 @@
 
 bool ThreadSafeAskFee(int64 nFeeRequired, const string& strCaption, wxWindow* parent)
 {
-    if (nFeeRequired < CENT || nFeeRequired <= nTransactionFee || fDaemon)
+    if (nFeeRequired < MIN_TX_FEE || nFeeRequired <= nTransactionFee || fDaemon)
         return true;
     string strMessage = strprintf(
         _("This transaction is over the size limit.  You can still send it for a fee of %s, "