feat: implement `eth_feeHistory` #2083

sk1122 · 2023-04-02T22:10:20Z

Ref: #1782

Note: This PR implements eth_feeHistory

Sources

Todo

if max_priority_fee_per_gas is None, decide between using gas_price or 1
try optimize the transaction for loop by caching some things, if possible
works only upto latest block, pending blocks aren't supported yet

codecov-commenter · 2023-04-02T23:43:23Z

Codecov Report

Merging #2083 (b787684) into main (8625373) will increase coverage by 0.02%.
The diff coverage is 87.32%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##             main    #2083      +/-   ##
==========================================
+ Coverage   72.14%   72.17%   +0.02%     
==========================================
  Files         472      474       +2     
  Lines       57098    57295     +197     
==========================================
+ Hits        41191    41350     +159     
- Misses      15907    15945      +38

Flag	Coverage Δ
integration-tests	`19.11% <4.69%> (-0.06%)`	⬇️
unit-tests	`66.85% <86.85%> (+0.03%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
crates/rpc/rpc/src/eth/api/mod.rs	`65.51% <ø> (ø)`
crates/rpc/rpc/src/eth/error.rs	`11.71% <0.00%> (-0.11%)`	⬇️
crates/rpc/rpc-types/src/eth/fee.rs	`63.15% <46.15%> (-36.85%)`	⬇️
crates/rpc/rpc/src/eth/api/fees.rs	`87.50% <87.50%> (ø)`
crates/primitives/src/transaction/mod.rs	`87.86% <93.33%> (+0.22%)`	⬆️
crates/rpc/rpc/src/eth/api/server.rs	`98.14% <96.42%> (+0.17%)`	⬆️

... and 18 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

mattsse · 2023-04-04T08:01:25Z

is this ready for review?
could you please briefly summarize the changes you made?

sk1122 · 2023-04-04T09:41:58Z

is this ready for review? could you please briefly summarize the changes you made?

It is not ready, because I have few questions

if max_priority_fee_per_gas is None, which to use gas_price or 1? afaik max_priority_fee_per_gas will be None for pre-eip-1559 blocks, so should we just return reward as 0 in that case?
are pending blocks supported in current codebase?

sk1122 · 2023-04-06T11:29:46Z

@mattsse what do you think?

mattsse

sorry for the delay..

I skimmed it, I can follow for the most part.

@Rjected mind giving this a closer look and have a look at the geth impl for reference?

mattsse · 2023-04-13T12:09:11Z

crates/rpc/rpc-types/src/eth/fee.rs

+    /// gas used by a block
+    pub gas_used: u128,
+    /// minimum between max_priority_fee_per_gas or max_fee_per_gas - base_fee_for_block
+    pub reward: u128


are these serialized as numbers or hex?

This struct just mirrors an internal geth struct so this shouldn't be serialized

Rjected · 2023-04-19T04:30:03Z

Took this over to try to get this over the line and pass hive tests! Only thing TODO for this PR now:

deduplicate effective_gas_price and effective_tip_per_gas - might have been accidental duplicate work, my bad
remove unwraps

sk1122 · 2023-04-19T09:28:54Z

Thanks for the help @Rjected

Rjected · 2023-04-19T21:32:25Z

On why effective_gas_price exists: I was trying to reimplement EffectiveGasTip from geth, but I didn't see effective_tip_per_gas, so it's almost identical. It seems slightly different in that effective_gas_price supports an optional base fee, with priority_fee_or_price trying to emulate geth's gasTipCap method.

mattsse

lgtm,

we need another feature that installs a task that inserts new items

mattsse · 2023-04-20T07:03:57Z

crates/primitives/src/transaction/mod.rs

@@ -278,6 +278,43 @@ impl Transaction {
        }
    }

+    // TODO: dedup with effective_tip_per_gas


yeh, I'd like to dedup this and unify, naming, because everything surrounding fee/price can be incredibly confusing

good with a followup for this

mattsse · 2023-04-20T07:16:42Z

crates/rpc/rpc/src/eth/api/fees.rs

+            let headers: Vec<Header> = self.inner.client.headers_range(header_range.clone())?;
+            let transactions = self.inner.client.transactions_by_block_range(header_range)?;


I think it is reasonable to always read them from disk, if we add a service task that inserts items to the cache for every new block we can prevent this for the majority of requests

sk1122 added 2 commits April 3, 2023 03:36

feat: implemented eth_feeHistory

b6df3a1

added check that max_priority_fee_per_gas < base_fee

816e9db

sk1122 changed the title ~~feat: implemented eth_feeHistory~~ feat: implement eth_feeHistory Apr 2, 2023

mattsse added the A-rpc Related to the RPC implementation label Apr 13, 2023

mattsse reviewed Apr 13, 2023

View reviewed changes

mattsse assigned Rjected Apr 13, 2023

Rjected added 15 commits April 17, 2023 11:14

cargo fmt

afd2857

add delegation for fee_history

a2a7336

move impl to delegate in EthApi

4cf3d35

use windows for sortedness

4f08493

use trait impl for trait tests

4682f7e

use filter_map for rewards

6a6f407

zip headers and txs for less options

3c8e69e

add effective gas price method

6525522

use effecive gas price method

eb3ee32

Merge branch 'main' into sk1122/eth-feehistory

a277e58

use proper types for base fee

124c998

refactor effective gas to use option

337c552

fix lints

8f09127

push rewards

37f5e6c

remove outdated comment

08bbe58

Rjected marked this pull request as ready for review April 19, 2023 04:35

Rjected requested review from Rjected and gakonst as code owners April 19, 2023 04:35

Rjected mentioned this pull request Apr 19, 2023

ci: hive tests #1348

Merged

fix: use only reward for TxGasAndReward ordering

a95bb6d

Rjected added 2 commits April 19, 2023 17:52

fix: remove unwraps from feeHistory cache calls

cb0b8dc

remove outdated TODO, improve comments

c5a7ea0

Rjected requested a review from mattsse April 20, 2023 04:22

smol touchups

b787684

mattsse approved these changes Apr 20, 2023

View reviewed changes

mattsse mentioned this pull request Apr 20, 2023

Add task for inserting charge history cache items on new blocks #2315

Closed

mattsse merged commit 7e965a3 into paradigmxyz:main Apr 20, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: implement `eth_feeHistory` #2083

feat: implement `eth_feeHistory` #2083

sk1122 commented Apr 2, 2023 •

edited

Loading

codecov-commenter commented Apr 2, 2023 •

edited

Loading

mattsse commented Apr 4, 2023

sk1122 commented Apr 4, 2023 •

edited

Loading

sk1122 commented Apr 6, 2023

mattsse left a comment

mattsse Apr 13, 2023

Rjected Apr 19, 2023

Rjected commented Apr 19, 2023 •

edited

Loading

sk1122 commented Apr 19, 2023

Rjected commented Apr 19, 2023 •

edited

Loading

mattsse left a comment

mattsse Apr 20, 2023

mattsse Apr 20, 2023

		let headers: Vec<Header> = self.inner.client.headers_range(header_range.clone())?;
		let transactions = self.inner.client.transactions_by_block_range(header_range)?;

feat: implement eth_feeHistory #2083

feat: implement eth_feeHistory #2083

Conversation

sk1122 commented Apr 2, 2023 • edited Loading

codecov-commenter commented Apr 2, 2023 • edited Loading

Codecov Report

mattsse commented Apr 4, 2023

sk1122 commented Apr 4, 2023 • edited Loading

sk1122 commented Apr 6, 2023

mattsse left a comment

Choose a reason for hiding this comment

mattsse Apr 13, 2023

Choose a reason for hiding this comment

Rjected Apr 19, 2023

Choose a reason for hiding this comment

Rjected commented Apr 19, 2023 • edited Loading

sk1122 commented Apr 19, 2023

Rjected commented Apr 19, 2023 • edited Loading

mattsse left a comment

Choose a reason for hiding this comment

mattsse Apr 20, 2023

Choose a reason for hiding this comment

mattsse Apr 20, 2023

Choose a reason for hiding this comment

feat: implement `eth_feeHistory` #2083

feat: implement `eth_feeHistory` #2083

sk1122 commented Apr 2, 2023 •

edited

Loading

codecov-commenter commented Apr 2, 2023 •

edited

Loading

sk1122 commented Apr 4, 2023 •

edited

Loading

Rjected commented Apr 19, 2023 •

edited

Loading

Rjected commented Apr 19, 2023 •

edited

Loading