diff options
author | Jeff Garzik <jgarzik@exmulti.com> | 2012-09-18 09:14:53 -0700 |
---|---|---|
committer | Jeff Garzik <jgarzik@exmulti.com> | 2012-09-18 09:14:53 -0700 |
commit | f8c449b5c89226b6939bfd56bd45f2c1e9c42d22 (patch) | |
tree | 2b2a624144bdd6f4340f02866a69a5dbdfc5a68d /src/main.h | |
parent | 085d9c75f402265611fbffde7eff82f640640fb9 (diff) | |
parent | 17f8d6e4001afa81a3e481d24c869cd14301f964 (diff) | |
download | bitcoin-f8c449b5c89226b6939bfd56bd45f2c1e9c42d22.tar.xz |
Merge pull request #1812 from jgarzik/misc-07
Two minor generic cleanups done during OP_DROP hacking
Diffstat (limited to 'src/main.h')
-rw-r--r-- | src/main.h | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/src/main.h b/src/main.h index e61cbdd46b..c01aba10e0 100644 --- a/src/main.h +++ b/src/main.h @@ -540,53 +540,7 @@ public: return dPriority > COIN * 144 / 250; } - int64 GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=true, enum GetMinFee_mode mode=GMF_BLOCK) const - { - // Base fee is either MIN_TX_FEE or MIN_RELAY_TX_FEE - int64 nBaseFee = (mode == GMF_RELAY) ? MIN_RELAY_TX_FEE : MIN_TX_FEE; - - unsigned int nBytes = ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION); - unsigned int nNewBlockSize = nBlockSize + nBytes; - int64 nMinFee = (1 + (int64)nBytes / 1000) * nBaseFee; - - if (fAllowFree) - { - if (nBlockSize == 1) - { - // Transactions under 10K are free - // (about 4500 BTC if made of 50 BTC inputs) - if (nBytes < 10000) - nMinFee = 0; - } - else - { - // Free transaction area - if (nNewBlockSize < 27000) - nMinFee = 0; - } - } - - // To limit dust spam, require MIN_TX_FEE/MIN_RELAY_TX_FEE if any output is less than 0.01 - if (nMinFee < nBaseFee) - { - BOOST_FOREACH(const CTxOut& txout, vout) - if (txout.nValue < CENT) - nMinFee = nBaseFee; - } - - // Raise the price as the block approaches full - if (nBlockSize != 1 && nNewBlockSize >= MAX_BLOCK_SIZE_GEN/2) - { - if (nNewBlockSize >= MAX_BLOCK_SIZE_GEN) - return MAX_MONEY; - nMinFee *= MAX_BLOCK_SIZE_GEN / (MAX_BLOCK_SIZE_GEN - nNewBlockSize); - } - - if (!MoneyRange(nMinFee)) - nMinFee = MAX_MONEY; - return nMinFee; - } - + int64 GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=true, enum GetMinFee_mode mode=GMF_BLOCK) const; bool ReadFromDisk(CDiskTxPos pos, FILE** pfileRet=NULL) { |