Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(rpc): use old l1 gas price if l1 not available #1524

Merged
merged 2 commits into from
Dec 3, 2024
Merged

feat(rpc): use old l1 gas price if l1 not available #1524

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab4f38d
feat(rpc): use old l1 gas price if l1 not available
V-Staykov Dec 2, 2024
091362d
Merge branch 'zkevm' into 1523-eth_gasprice-breaks-when-l1-is-unstable
V-Staykov Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions turbo/jsonrpc/eth_system_zk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"time"

"github.com/ledgerwatch/erigon-lib/common/hexutil"
"github.com/ledgerwatch/erigon/ethclient"
"github.com/ledgerwatch/erigon/zkevm/encoding"
"github.com/ledgerwatch/erigon/zkevm/jsonrpc/client"
"github.com/ledgerwatch/log/v3"
Expand Down Expand Up @@ -39,23 +40,15 @@ func (api *APIImpl) GasPrice(ctx context.Context) (*hexutil.Big, error) {
return &price, nil
}

res, err := client.JSONRPCCall(api.l2RpcUrl, "eth_gasPrice")
client, err := ethclient.DialContext(ctx, api.l2RpcUrl)
if err != nil {
return nil, err
}
defer client.Close()

if res.Error != nil {
return nil, fmt.Errorf("RPC error response: %s", res.Error.Message)
}

var resultString string
if err := json.Unmarshal(res.Result, &resultString); err != nil {
return nil, fmt.Errorf("failed to unmarshal result: %v", err)
}

price, ok := big.NewInt(0).SetString(resultString[2:], 16)
if !ok {
return nil, fmt.Errorf("failed to convert result to big.Int")
price, err := client.SuggestGasPrice(ctx)
if err != nil {
return nil, err
}

return (*hexutil.Big)(price), nil
Expand All @@ -71,11 +64,13 @@ func (api *APIImpl) GasPrice_nonRedirected(ctx context.Context) (*hexutil.Big, e
if time.Since(api.L1GasPrice.timestamp) > 3*time.Second || api.L1GasPrice.gasPrice == nil {
l1GasPrice, err := api.l1GasPrice()
if err != nil {
return nil, err
}
api.L1GasPrice = L1GasPrice{
timestamp: time.Now(),
gasPrice: l1GasPrice,
log.Debug("Failed to get L1 gas price: ", err)

} else {
api.L1GasPrice = L1GasPrice{
timestamp: time.Now(),
gasPrice: l1GasPrice,
}
}
}

Expand Down
Loading