|
|
@ -477,6 +477,55 @@ bool CTransaction::CheckTransaction() const |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int64 CTransaction::GetMinFee(unsigned int nBlockSize, bool fAllowFree, |
|
|
|
|
|
|
|
enum GetMinFee_mode mode) 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; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, |
|
|
|
bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, |
|
|
|
bool* pfMissingInputs) |
|
|
|
bool* pfMissingInputs) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -563,8 +612,11 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, |
|
|
|
unsigned int nSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); |
|
|
|
unsigned int nSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); |
|
|
|
|
|
|
|
|
|
|
|
// Don't accept it if it can't get into a block
|
|
|
|
// Don't accept it if it can't get into a block
|
|
|
|
if (nFees < tx.GetMinFee(1000, true, GMF_RELAY)) |
|
|
|
int64 txMinFee = tx.GetMinFee(1000, true, GMF_RELAY); |
|
|
|
return error("CTxMemPool::accept() : not enough fees"); |
|
|
|
if (nFees < txMinFee) |
|
|
|
|
|
|
|
return error("CTxMemPool::accept() : not enough fees %s, %"PRI64d" < %"PRI64d, |
|
|
|
|
|
|
|
hash.ToString().substr(0,10).c_str(), |
|
|
|
|
|
|
|
nFees, txMinFee); |
|
|
|
|
|
|
|
|
|
|
|
// Continuously rate-limit free transactions
|
|
|
|
// Continuously rate-limit free transactions
|
|
|
|
// This mitigates 'penny-flooding' -- sending thousands of free transactions just to
|
|
|
|
// This mitigates 'penny-flooding' -- sending thousands of free transactions just to
|
|
|
|