From 79429e3a4aabe361b66b780c6bf1d870f9788d25 Mon Sep 17 00:00:00 2001 From: Jerry Date: Tue, 15 Oct 2024 10:34:58 -0700 Subject: [PATCH] Correctly set gas price to 0 when 'zkevm.allow-free-transactions' is true --- cmd/rpcdaemon/commands/daemon.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/rpcdaemon/commands/daemon.go b/cmd/rpcdaemon/commands/daemon.go index da5c5b248c0..3fd496b5381 100644 --- a/cmd/rpcdaemon/commands/daemon.go +++ b/cmd/rpcdaemon/commands/daemon.go @@ -12,9 +12,9 @@ import ( "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/rpchelper" "github.com/ledgerwatch/erigon/turbo/services" + "github.com/ledgerwatch/erigon/zk/sequencer" "github.com/ledgerwatch/erigon/zk/syncer" txpool2 "github.com/ledgerwatch/erigon/zk/txpool" - "github.com/ledgerwatch/erigon/zk/sequencer" ) // APIList describes the list of available RPC apis @@ -32,7 +32,7 @@ func APIList(db kv.RoDB, borDb kv.RoDB, eth rpchelper.ApiBackend, txPool txpool. base := NewBaseApi(filters, stateCache, blockReader, agg, cfg.WithDatadir, cfg.EvmCallTimeout, engine, cfg.Dirs) base.SetL2RpcUrl(ethCfg.L2RpcUrl) - base.SetGasless(ethCfg.Gasless) + base.SetGasless(ethCfg.AllowFreeTransactions) ethImpl := NewEthAPI(base, db, eth, txPool, mining, cfg.Gascap, cfg.ReturnDataLimit, ethCfg) erigonImpl := NewErigonAPI(base, db, eth) txpoolImpl := NewTxPoolAPI(base, db, txPool, rawPool, rpcUrl) @@ -164,7 +164,7 @@ func AuthAPIList(db kv.RoDB, eth rpchelper.ApiBackend, txPool txpool.TxpoolClien ) (list []rpc.API) { base := NewBaseApi(filters, stateCache, blockReader, agg, cfg.WithDatadir, cfg.EvmCallTimeout, engine, cfg.Dirs) base.SetL2RpcUrl(ethCfg.L2RpcUrl) - base.SetGasless(ethCfg.Gasless) + base.SetGasless(ethCfg.AllowFreeTransactions) ethImpl := NewEthAPI(base, db, eth, txPool, mining, cfg.Gascap, cfg.ReturnDataLimit, ethCfg) engineImpl := NewEngineAPI(base, db, eth, cfg.InternalCL)