diff options
| author | merge-script <falke.marco@gmail.com> | 2021-09-21 09:18:01 +0200 |
|---|---|---|
| committer | merge-script <falke.marco@gmail.com> | 2021-09-21 09:18:01 +0200 |
| commit | eb180d807a0e449d994d0caecfd54ae144153594 (patch) | |
| tree | 11f254d440fbccbbd084f032c91b15ac52c82691 /src | |
| parent | 1260b7e483f11e2379c37a7d4b50435b3791d4ec (diff) | |
| parent | c17f554fcc63e9e1f6ba64750df475d8a8d11f2e (diff) | |
Merge bitcoin/bitcoin#23050: log: change an incorrect fee to fee rate, and vice-versa
c17f554fcc63e9e1f6ba64750df475d8a8d11f2e Fix BlockAssembler::AddToBlock, CTxMemPool::PrioritiseTransaction logging (Jon Atack)
Pull request description:
This is a tale of two fees, er, fee rates... indeed, one is misdescribed as a fee, and the other is incorrectly called a fee rate.
From this review discussion: https://github.com/bitcoin/bitcoin/pull/22689#discussion_r695866211 (thanks to John Newbery).
ACKs for top commit:
laanwj:
Code review ACK c17f554fcc63e9e1f6ba64750df475d8a8d11f2e
Tree-SHA512: 3d9df3209a72562c5f9bbf815923d5b089d04491b8d19caa2c04158c501b47ef01e47f1c32d89adcbaf3c6357329507f65b4bb2963214c3451bbfa61ac812530
Diffstat (limited to 'src')
| -rw-r--r-- | src/miner.cpp | 2 | ||||
| -rw-r--r-- | src/txmempool.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 168ade5507..38c7b4b8cc 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -237,7 +237,7 @@ void BlockAssembler::AddToBlock(CTxMemPool::txiter iter) bool fPrintPriority = gArgs.GetBoolArg("-printpriority", DEFAULT_PRINTPRIORITY); if (fPrintPriority) { - LogPrintf("fee %s txid %s\n", + LogPrintf("fee rate %s txid %s\n", CFeeRate(iter->GetModifiedFee(), iter->GetTxSize()).ToString(), iter->GetTx().GetHash().ToString()); } diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 043564294f..3cf62f3c0e 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -924,7 +924,7 @@ void CTxMemPool::PrioritiseTransaction(const uint256& hash, const CAmount& nFeeD ++nTransactionsUpdated; } } - LogPrintf("PrioritiseTransaction: %s feerate += %s\n", hash.ToString(), FormatMoney(nFeeDelta)); + LogPrintf("PrioritiseTransaction: %s fee += %s\n", hash.ToString(), FormatMoney(nFeeDelta)); } void CTxMemPool::ApplyDelta(const uint256& hash, CAmount &nFeeDelta) const |