diff options
author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-11-21 22:46:19 +0000 |
---|---|---|
committer | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-11-21 22:46:19 +0000 |
commit | 298a7714943dc3f1ebc582ed2426d3b71fb68466 (patch) | |
tree | c3be7eab9824578a8e7a6cdcfa04cae1482f7b15 /main.h | |
parent | 51d9b435cd1fc6efe5fc418e8adb48ef33c9e836 (diff) |
added transaction fee setting in UI options menu,
cut free transaction area from 50KB to 26KB
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@187 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'main.h')
-rw-r--r-- | main.h | 21 |
1 files changed, 13 insertions, 8 deletions
@@ -537,14 +537,19 @@ public: if (fAllowFree) { - // Transactions under 25K are free as long as block size is under 40K - // (about 11,000bc if made of 50bc inputs) - if (nBytes < 25000 && nNewBlockSize < 40000) - nMinFee = 0; - - // Transactions under 3K are free as long as block size is under 50K - if (nBytes < 3000 && nNewBlockSize < 50000) - nMinFee = 0; + if (nBlockSize == 1) + { + // Transactions under 10K are free + // (about 4500bc if made of 50bc inputs) + if (nBytes < 10000) + nMinFee = 0; + } + else + { + // Free transaction area + if (nNewBlockSize < 27000) + nMinFee = 0; + } } // To limit dust spam, require a 0.01 fee if any output is less than 0.01 |