|
|
|
@ -3,6 +3,8 @@
@@ -3,6 +3,8 @@
|
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
|
|
#include <inttypes.h> |
|
|
|
|
|
|
|
|
|
#include "miner.h" |
|
|
|
|
|
|
|
|
|
#include "core.h" |
|
|
|
@ -186,6 +188,9 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
@@ -186,6 +188,9 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
|
|
|
|
|
unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); |
|
|
|
|
dPriority = tx.ComputePriority(dPriority, nTxSize); |
|
|
|
|
|
|
|
|
|
uint256 hash = tx.GetHash(); |
|
|
|
|
mempool.ApplyDeltas(hash, dPriority, nTotalIn); |
|
|
|
|
|
|
|
|
|
CFeeRate feeRate(nTotalIn-tx.GetValueOut(), nTxSize); |
|
|
|
|
|
|
|
|
|
if (porphan) |
|
|
|
@ -227,10 +232,14 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
@@ -227,10 +232,14 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
// Skip free transactions if we're past the minimum block size:
|
|
|
|
|
if (fSortedByFee && (feeRate < CTransaction::minRelayTxFee) && (nBlockSize + nTxSize >= nBlockMinSize)) |
|
|
|
|
const uint256& hash = tx.GetHash(); |
|
|
|
|
double dPriorityDelta = 0; |
|
|
|
|
int64_t nFeeDelta = 0; |
|
|
|
|
mempool.ApplyDeltas(hash, dPriorityDelta, nFeeDelta); |
|
|
|
|
if (fSortedByFee && (dPriorityDelta <= 0) && (nFeeDelta <= 0) && (feeRate < CTransaction::minRelayTxFee) && (nBlockSize + nTxSize >= nBlockMinSize)) |
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
// Prioritize by fee once past the priority size or we run out of high-priority
|
|
|
|
|
// Prioritise by fee once past the priority size or we run out of high-priority
|
|
|
|
|
// transactions:
|
|
|
|
|
if (!fSortedByFee && |
|
|
|
|
((nBlockSize + nTxSize >= nBlockPrioritySize) || !AllowFree(dPriority))) |
|
|
|
@ -257,7 +266,6 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
@@ -257,7 +266,6 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
CTxUndo txundo; |
|
|
|
|
const uint256& hash = tx.GetHash(); |
|
|
|
|
UpdateCoins(tx, state, view, txundo, pindexPrev->nHeight+1); |
|
|
|
|
|
|
|
|
|
// Added
|
|
|
|
|