Mercurial > hg > bitcoin
diff main.h @ 30:95cf64d958cb draft
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
| author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> |
|---|---|
| date | Sun, 06 Dec 2009 00:29:09 +0000 (2009-12-06) |
| parents | 1488d70ef072 |
| children | 3834ed238a28 |
line wrap: on
line diff
--- a/main.h +++ b/main.h @@ -512,14 +512,19 @@ 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