deep-stack/laconicd-deprecated
4
0
Fork 0
forked from cerc-io/laconicd-deprecated
Code Pull Requests Activity

fix!: london hardfork check logic in json-rpc apis (#1068)

Browse Source
This commit is contained in:
yihuang
2022-04-30 18:11:28 +02:00
committed by GitHub
parent fb13fd4835
commit 556c2cc8a3
16 changed files with 2559 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpc/ethereum/backend/backend.go
+3 -8
View File
@@ -945,7 +945,7 @@ func (e *EVMBackend) RPCMinGasPrice() int64 {
return amt
}
// ChainConfig return the ethereum chain configuration
// ChainConfig return the latest ethereum chain configuration
func (e *EVMBackend) ChainConfig() *params.ChainConfig {
params, err := e.queryClient.Params(e.ctx, &evmtypes.QueryParamsRequest{})
if err != nil {
@@ -991,13 +991,8 @@ func (e *EVMBackend) SuggestGasTipCap(baseFee *big.Int) (*big.Int, error) {
// If the London hard fork is not activated at the current height, the query will
// return nil.
func (e *EVMBackend) BaseFee(height int64) (*big.Int, error) {
cfg := e.ChainConfig()
if !cfg.IsLondon(new(big.Int).SetInt64(height)) {
return nil, nil
}
// return BaseFee if London hard fork is activated and feemarket is not enabled
res, err := e.queryClient.FeeMarket.BaseFee(types.ContextWithHeight(height), &feemarkettypes.QueryBaseFeeRequest{})
// return BaseFee if London hard fork is activated and feemarket is enabled
res, err := e.queryClient.BaseFee(types.ContextWithHeight(height), &evmtypes.QueryBaseFeeRequest{})
if err != nil {
return nil, err
}