fix transaction fee bug in CreateTransaction, higher size cutoff for free transactions in GetMinFee

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@42 1a98c847-1fd6-4fd8-948a-caf3550aa51b

3 files changed, 17 insertions, 14 deletions

diff --git a/main.cpp b/main.cpp
index ae20e08dd0..6575099f59 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2479,10 +2479,8 @@ void BitcoinMiner()
                     if (tx.IsCoinBase() || !tx.IsFinal())

                         continue;

 

-                    // Transaction fee requirements, mainly only needed for flood control

-                    // Under 10K (about 80 inputs) is free for first 100 transactions

-                    // Base rate is 0.01 per KB

-                    int64 nMinFee = tx.GetMinFee(pblock->vtx.size() < 100);

+                    // Transaction fee based on block size

+                    int64 nMinFee = tx.GetMinFee(nBlockSize);

 

                     map<uint256, CTxIndex> mapTestPoolTmp(mapTestPool);

                     if (!tx.ConnectInputs(txdb, mapTestPoolTmp, CDiskTxPos(1,1,1), 0, nFees, false, true, nMinFee))

@@ -2768,11 +2766,11 @@ bool CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, CK
                 if (nValue < 0)

                     return false;

                 int64 nValueOut = nValue;

-                nValue += nFee;

+                int64 nTotalValue = nValue + nFee;

 

                 // Choose coins to use

                 set<CWalletTx*> setCoins;

-                if (!SelectCoins(nValue, setCoins))

+                if (!SelectCoins(nTotalValue, setCoins))

                     return false;

                 int64 nValueIn = 0;

                 foreach(CWalletTx* pcoin, setCoins)

@@ -2784,7 +2782,7 @@ bool CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, CK
                     wtxNew.vout.push_back(CTxOut(nValueOut, scriptPubKey));

 

                 // Fill a vout back to self with any change

-                if (nValueIn > nValue)

+                if (nValueIn > nTotalValue)

                 {

                     // New private key

                     if (keyRet.IsNull())

@@ -2793,7 +2791,7 @@ bool CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, CK
                     // Fill a vout to ourself

                     CScript scriptPubKey;

                     scriptPubKey << keyRet.GetPubKey() << OP_CHECKSIG;

-                    wtxNew.vout.push_back(CTxOut(nValueIn - nValue, scriptPubKey));

+                    wtxNew.vout.push_back(CTxOut(nValueIn - nTotalValue, scriptPubKey));

                 }

 

                 // Fill a vout to the payee

@@ -2814,9 +2812,9 @@ bool CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, CK
                             SignSignature(*pcoin, wtxNew, nIn++);

 

                 // Check that enough fee is included

-                if (nFee < wtxNew.GetMinFee(true))

+                if (nFee < wtxNew.GetMinFee())

                 {

-                    nFee = nFeeRequiredRet = wtxNew.GetMinFee(true);

+                    nFee = nFeeRequiredRet = wtxNew.GetMinFee();

                     continue;

                 }

 

diff --git a/main.h b/main.h
index 822045a573..716485e93d 100644
--- a/main.h
+++ b/main.h
@@ -512,14 +512,19 @@ public:
         return nValueOut;

     }

 

-    int64 GetMinFee(bool fDiscount=false) const

+    int64 GetMinFee(unsigned int nBlockSize=1) const

     {

         // Base fee is 1 cent per kilobyte

         unsigned int nBytes = ::GetSerializeSize(*this, SER_NETWORK);

         int64 nMinFee = (1 + (int64)nBytes / 1000) * CENT;

 

-        // First 100 transactions in a block are free

-        if (fDiscount && nBytes < 10000)

+        // Transactions under 60K are free as long as block size is under 80K

+        // (about 27,000bc if made of 50bc inputs)

+        if (nBytes < 60000 && nBlockSize < 80000)

+            nMinFee = 0;

+

+        // Transactions under 3K are free as long as block size is under 200K

+        if (nBytes < 3000 && nBlockSize < 200000)

             nMinFee = 0;

 

         // To limit dust spam, require a 0.01 fee if any output is less than 0.01

diff --git a/serialize.h b/serialize.h
index b2d948df96..14a2bed7ec 100644
--- a/serialize.h
+++ b/serialize.h
@@ -20,7 +20,7 @@ class CDataStream;
 class CAutoFile;

 

 static const int VERSION = 106;

-static const char* pszSubVer = " linux-test9";

+static const char* pszSubVer = " test10";