Eth JSON-RPC: populate reward in eth_feeHistory #10245
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
magik6k
approved these changes
Feb 13, 2023
magik6k
reviewed
Feb 13, 2023
magik6k
force-pushed
the
fix/feehistory
branch
from
b47bec4
to
bd2bd3a
Compare
magik6k
reviewed
Feb 13, 2023
There was a problem hiding this comment.
Itests fail
eth_fee_history_test.go:55:
Error Trace: /home/circleci/project/itests/eth_fee_history_test.go:55
Error: Not equal:
expected: 17
actual : 16
Test: TestEthFeeHistory
blockminer.go:362: shutting down mining
blockminer.go:362: shutting down mining
--- FAIL: TestEthFeeHistory (9.00s)
ychiaoli18
force-pushed
the
fix/feehistory
branch
from
bd2bd3a
to
c3ee054
Compare
Co-authored-by: Łukasz Magiera <[email protected]>
ychiaoli18
force-pushed
the
fix/feehistory
branch
from
c3ee054
to
b43be25
Compare
raulk
reviewed
Feb 13, 2023
Comment on lines
+48
to
+53
| availablePriorityFee := big.Sub(big.Int(tx.MaxFeePerGas), blkBaseFee) | ||
| if big.Cmp(big.Int(tx.MaxPriorityFeePerGas), availablePriorityFee) <= 0 { | ||
| return tx.MaxPriorityFeePerGas | ||
| } | ||
| return EthBigInt(availablePriorityFee) | ||
| } |
There was a problem hiding this comment.
I rewrote this a little to make it nicer to read.
raulk
reviewed
Feb 13, 2023
node/impl/full/eth.go
Outdated
Comment on lines
2165
to
2181
| var totalGasUsed uint64 | ||
| for _, tx := range txGasRewards { | ||
| totalGasUsed += tx.gas | ||
| } | ||
|
|
||
| rewards := make([]ethtypes.EthBigInt, len(rewardPercentiles)) | ||
| for i := range rewards { | ||
| rewards[i] = ethtypes.EthBigIntZero | ||
| } | ||
|
|
||
| if len(txGasRewards) == 0 { | ||
| return rewards, totalGasUsed | ||
| } | ||
|
|
||
| sort.Sort(txGasRewards) | ||
|
|
||
| var idx int |
There was a problem hiding this comment.
Also adjusted the logic here so that it's easier to follow.
15 tasks
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.
Related Issues
#10236
Proposed Changes
Additional Info
Checklist
Before you mark the PR ready for review, please make sure that:
<PR type>: <area>: <change being made>fix: mempool: Introduce a cache for valid signaturesPR type: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, testarea, e.g. api, chain, state, market, mempool, multisig, networking, paych, proving, sealing, wallet, deps