Browse Source

CreateNewBlock was not adding in transaction fees.

miguelfreitas
Gavin Andresen 13 years ago
parent
commit
68649bef93
  1. 5
      src/main.cpp

5
src/main.cpp

@ -3073,8 +3073,8 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
if (!tx.FetchInputs(txdb, mapTestPoolTmp, false, true, mapInputs, fInvalid)) if (!tx.FetchInputs(txdb, mapTestPoolTmp, false, true, mapInputs, fInvalid))
continue; continue;
int64 nFees = tx.GetValueIn(mapInputs)-tx.GetValueOut(); int64 nTxFees = tx.GetValueIn(mapInputs)-tx.GetValueOut();
if (nFees < nMinFee) if (nTxFees < nMinFee)
continue; continue;
nTxSigOps += tx.GetP2SHSigOpCount(mapInputs); nTxSigOps += tx.GetP2SHSigOpCount(mapInputs);
@ -3091,6 +3091,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
nBlockSize += nTxSize; nBlockSize += nTxSize;
++nBlockTx; ++nBlockTx;
nBlockSigOps += nTxSigOps; nBlockSigOps += nTxSigOps;
nFees += nTxFees;
// Add transactions that depend on this one to the priority queue // Add transactions that depend on this one to the priority queue
uint256 hash = tx.GetHash(); uint256 hash = tx.GetHash();

Loading…
Cancel
Save