This repository has been archived by the owner on Apr 4, 2024. It is now read-only.
Disable basefee for non london block #662
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
thomas-nguy
requested review from
fedekunze,
jolube and
khoslaventures
as code owners
thomas-nguy
force-pushed
the
thomas/fix-rpc-basefee-for-fork
branch
from
998d5ef
to
10da4f4
Compare
Codecov Report
@@ Coverage Diff @@
## main #662 +/- ##
==========================================
+ Coverage 57.00% 57.02% +0.01%
==========================================
Files 63 63
Lines 5540 5547 +7
==========================================
+ Hits 3158 3163 +5
- Misses 2219 2221 +2
Partials 163 163
|
thomas-nguy
force-pushed
the
thomas/fix-rpc-basefee-for-fork
branch
2 times, most recently
from
1831217
to
2b21f00
Compare
fedekunze
suggested changes
Oct 12, 2021
app/ante/eth.go
Outdated
| @@ -359,7 +359,7 @@ func (ctd CanTransferDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate | |||
| } | |||
|
|
|||
| var baseFee *big.Int | |||
| if !feeMktParams.NoBaseFee { | |||
| if evmtypes.IsLondon(ctx, ctd.evmKeeper.GetParams(ctx), ctd.evmKeeper.ChainID()) && !feeMktParams.NoBaseFee { | |||
There was a problem hiding this comment.
we can pass the params directly instead
Suggested change
| if evmtypes.IsLondon(ctx, ctd.evmKeeper.GetParams(ctx), ctd.evmKeeper.ChainID()) && !feeMktParams.NoBaseFee { | |
| if evmtypes.IsLondon(ctx, params, ethCfg.ChainID) && !feeMktParams.NoBaseFee { |
rpc/ethereum/backend/backend.go
Outdated
Comment on lines
872
to
884
| func (e *EVMBackend) getBaseFee(height int64) (*big.Int, error) { | ||
| cfg := e.ChainConfig() | ||
| if !cfg.IsLondon(new(big.Int).SetInt64(height)) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| baseFee, err := e.BaseFee() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return baseFee, nil | ||
| } |
There was a problem hiding this comment.
please update the BaseFee function instead
x/evm/types/eip1559.go
Outdated
| "math/big" | ||
| ) | ||
|
|
||
| func IsLondon(ctx sdk.Context, params Params, chainID *big.Int) bool { |
There was a problem hiding this comment.
can you add use the ethereum ChainConfig instead?
There was a problem hiding this comment.
it uses github.com/ethereum/go-ethereum/params now. Is it the one you are talking about?
thomas-nguy
force-pushed
the
thomas/fix-rpc-basefee-for-fork
branch
4 times, most recently
from
e1977c3
to
3edc9a8
Compare
fedekunze
suggested changes
Oct 13, 2021
thomas-nguy
force-pushed
the
thomas/fix-rpc-basefee-for-fork
branch
from
661eb5f
to
7f1b7ee
Compare
fedekunze
approved these changes
Oct 13, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Closes: #XXX
Description
Unifying the logic between the rpc endpoint "GasPrice", "EstimateGas", "SendTransaction" and "GetBlock"
For contributor use:
docs/) or specification (x/<module>/spec/)godoccomments.Unreleasedsection inCHANGELOG.mdFiles changedin the Github PR explorerFor admin use:
WIP,R4R,docs, etc)