aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.cpp6
-rw-r--r--main.h21
-rw-r--r--serialize.h2
3 files changed, 17 insertions, 12 deletions
diff --git a/main.cpp b/main.cpp
index 6848342b71..8e32ee7c3c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3197,6 +3197,7 @@ void BitcoinMiner()
while (!mapPriority.empty())
{
// Take highest priority transaction off priority queue
+ double dPriority = (*mapPriority.begin()).first;
CTransaction& tx = *(*mapPriority.begin()).second;
mapPriority.erase(mapPriority.begin());
@@ -3208,8 +3209,9 @@ void BitcoinMiner()
if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
continue;
- // Transaction fee based on block size
- int64 nMinFee = tx.GetMinFee(nBlockSize);
+ // Transaction fee required depends on block size
+ bool fAllowFree = (nBlockSize + nTxSize < 4000 || dPriority > COIN * 144 / 250);
+ int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree);
// Connecting shouldn't fail due to dependency on other memory pool transactions
// because we're already processing them in order of dependency
diff --git a/main.h b/main.h
index d5734103c0..cc150e62b6 100644
--- a/main.h
+++ b/main.h
@@ -528,21 +528,24 @@ public:
return nValueOut;
}
- int64 GetMinFee(unsigned int nBlockSize=1) const
+ int64 GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=true) const
{
// Base fee is 1 cent per kilobyte
unsigned int nBytes = ::GetSerializeSize(*this, SER_NETWORK);
unsigned int nNewBlockSize = nBlockSize + nBytes;
int64 nMinFee = (1 + (int64)nBytes / 1000) * CENT;
- // 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 (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;
+ }
// To limit dust spam, require a 0.01 fee if any output is less than 0.01
if (nMinFee < CENT)
diff --git a/serialize.h b/serialize.h
index 342a03941e..0fc3366c74 100644
--- a/serialize.h
+++ b/serialize.h
@@ -22,7 +22,7 @@ class CDataStream;
class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000;
-static const int VERSION = 31502;
+static const int VERSION = 31503;
static const char* pszSubVer = "";