rename getFeeBid -> getInclusionFee, bugfixes #3838
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dmkozh
reviewed
Jul 19, 2023
src/herder/TxQueueLimiter.cpp
Outdated
| @@ -164,9 +164,13 @@ TxQueueLimiter::canAddTx(TransactionFrameBasePtr const& newTx, | |||
| computeBetterFee( | |||
| mLaneEvictedFeeBid[SurgePricingPriorityQueue::GENERIC_LANE], | |||
| *newTx)); | |||
| // minFeeToBeatEvicted is the minimum _inclusion_ fee to evict txs. For | |||
| // reporting, return _full_ minimum fee | |||
There was a problem hiding this comment.
Maybe rename this to minInclusionFeeToBeatEvicted then?
src/herder/TxQueueLimiter.cpp
Outdated
| @@ -164,9 +164,13 @@ TxQueueLimiter::canAddTx(TransactionFrameBasePtr const& newTx, | |||
| computeBetterFee( | |||
| mLaneEvictedFeeBid[SurgePricingPriorityQueue::GENERIC_LANE], | |||
| *newTx)); | |||
| // minFeeToBeatEvicted is the minimum _inclusion_ fee to evict txs. For | |||
There was a problem hiding this comment.
Maybe also rename mLaneEvictedFeeBid to mLaneEvictedInclusionFee for consistency? I think we just need to get rid of fee bid everywhere eventually for the sake of consistency.
| @@ -963,7 +965,7 @@ TxSetFrame::getTotalBids() const | |||
| total += std::accumulate( | |||
| phase.begin(), phase.end(), int64_t(0), | |||
| [&](int64_t t, TransactionFrameBasePtr const& tx) { | |||
| return t + tx->getFeeBid(); | |||
| return t + tx->getInclusionFee(); | |||
There was a problem hiding this comment.
Shall we also rename this to getTotalInclusionFee?
src/transactions/TransactionUtils.h
Outdated
| @@ -303,6 +303,7 @@ int64_t getPoolWithdrawalAmount(int64_t amountPoolShares, | |||
| void maybeUpdateAccountOnLedgerSeqUpdate(LedgerTxnHeader const& header, | |||
| LedgerTxnEntry& account); | |||
|
|
|||
| // Get min _inclusion_ fee needed for this transaction | |||
There was a problem hiding this comment.
Rename to getMinInclusionFee instead of comment?
marta-lokhova
force-pushed
the
get_fee_bid_audit
branch
from
b180ce7
to
a632219
Compare
|
@dmkozh updated the PR based on your suggestions and rebased it as well. Let me know if it looks good. |
|
r+ e019135 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Extracting these changes from my flooding tess as there is no reason to bundle them together.
I added some comments to help clarify when to use inclusion vs full fee. Reviewers, please help audit inclusion fee usage.