diff --git a/cmd/rpcdaemon/main.go b/cmd/rpcdaemon/main.go index f1e1e8a80cb..53cb2180693 100644 --- a/cmd/rpcdaemon/main.go +++ b/cmd/rpcdaemon/main.go @@ -40,7 +40,7 @@ func main() { client, err := rpc.DialContext(ctx, cfg.RollupSequencerHTTP, logger) cancel() if err != nil { - log.Error(err.Error()) + logger.Error(err.Error()) return nil } seqRPCService = client @@ -50,7 +50,7 @@ func main() { client, err := rpc.DialContext(ctx, cfg.RollupHistoricalRPC, logger) cancel() if err != nil { - log.Error(err.Error()) + logger.Error(err.Error()) return nil } historicalRPCService = client diff --git a/core/types/deposit_tx.go b/core/types/deposit_tx.go index c15f81ecc55..1035d93e6c2 100644 --- a/core/types/deposit_tx.go +++ b/core/types/deposit_tx.go @@ -71,10 +71,14 @@ func (tx DepositTx) GetTo() *libcommon.Address { return tx.To } -func (ct DepositTx) GetDataGas() uint64 { +func (tx DepositTx) GetBlobGas() uint64 { return 0 } +func (tx DepositTx) GetBlobHashes() []libcommon.Hash { + return []libcommon.Hash{} +} + func (tx DepositTx) GetGas() uint64 { return tx.Gas } diff --git a/eth/backend.go b/eth/backend.go index 6ca120336c1..88159a8e0f3 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -147,6 +147,7 @@ type Ethereum struct { eth1ExecutionServer *eth1.EthereumExecutionModule ethBackendRPC *privateapi.EthBackendServer + engineBackendRPC *engineapi.EngineServer seqRPCService *rpc.Client historicalRPCService *rpc.Client miningRPC txpool_proto.MiningServer diff --git a/turbo/engineapi/engine_server.go b/turbo/engineapi/engine_server.go index 0067b061148..734b2c17e15 100644 --- a/turbo/engineapi/engine_server.go +++ b/turbo/engineapi/engine_server.go @@ -78,7 +78,7 @@ func NewEngineServer(ctx context.Context, logger log.Logger, config *chain.Confi func (e *EngineServer) Start(httpConfig httpcfg.HttpCfg, db kv.RoDB, blockReader services.FullBlockReader, filters *rpchelper.Filters, stateCache kvcache.Cache, agg *libstate.AggregatorV3, engineReader consensus.EngineReader, eth rpchelper.ApiBackend, txPool txpool.TxpoolClient, mining txpool.MiningClient) { - base := jsonrpc.NewBaseApi(filters, stateCache, blockReader, agg, httpConfig.WithDatadir, httpConfig.EvmCallTimeout, engineReader, httpConfig.Dirs) + base := jsonrpc.NewBaseApi(filters, stateCache, blockReader, agg, httpConfig.WithDatadir, httpConfig.EvmCallTimeout, engineReader, httpConfig.Dirs, nil, nil) ethImpl := jsonrpc.NewEthAPI(base, db, eth, txPool, mining, httpConfig.Gascap, httpConfig.ReturnDataLimit, e.logger)