From 8178db6f0ae5f11fa2d0f5280d138a2113bc9fe3 Mon Sep 17 00:00:00 2001 From: Tei Im Date: Fri, 26 Apr 2024 14:15:11 -0600 Subject: [PATCH] Fix build errors --- erigon-lib/chain/chain_config.go | 2 +- erigon-lib/downloader/downloader.go | 1 - eth/stagedsync/stage_mining_create_block.go | 2 +- eth/stagedsync/stage_mining_force_txs.go | 2 +- turbo/adapter/ethapi/api.go | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/erigon-lib/chain/chain_config.go b/erigon-lib/chain/chain_config.go index 6cf4ed48701..f4e457c80e9 100644 --- a/erigon-lib/chain/chain_config.go +++ b/erigon-lib/chain/chain_config.go @@ -95,7 +95,7 @@ type Config struct { // For deposit contract logs are needed by CL to validate/produce blocks. // All logs should be available to a validating node through eth_getLogs NoPruneContracts map[common.Address]bool `json:"noPruneContracts,omitempty"` - + // Optimism config Optimism *OptimismConfig `json:"optimism,omitempty"` } diff --git a/erigon-lib/downloader/downloader.go b/erigon-lib/downloader/downloader.go index 560d2329faf..345c0caa11a 100644 --- a/erigon-lib/downloader/downloader.go +++ b/erigon-lib/downloader/downloader.go @@ -23,7 +23,6 @@ import ( "encoding/json" "errors" "fmt" - "log" "math/rand" "net/http" "net/url" diff --git a/eth/stagedsync/stage_mining_create_block.go b/eth/stagedsync/stage_mining_create_block.go index 907de2f0989..eafc8e9f927 100644 --- a/eth/stagedsync/stage_mining_create_block.go +++ b/eth/stagedsync/stage_mining_create_block.go @@ -33,7 +33,7 @@ type MiningBlock struct { Receipts types.Receipts Withdrawals []*types.Withdrawal PreparedTxs types.TransactionsStream - + ForceTxs types.TransactionsStream } diff --git a/eth/stagedsync/stage_mining_force_txs.go b/eth/stagedsync/stage_mining_force_txs.go index bed1f12db6b..a3025a5fe89 100644 --- a/eth/stagedsync/stage_mining_force_txs.go +++ b/eth/stagedsync/stage_mining_force_txs.go @@ -14,7 +14,7 @@ func SpawnMiningForceTxsStage(s *StageState, tx kv.RwTx, cfg MiningCreateBlockCf "txs", len(cfg.blockBuilderParameters.Transactions), "notxpool", cfg.blockBuilderParameters.NoTxPool) for i, otx := range cfg.blockBuilderParameters.Transactions { - tx, err := types.UnmarshalTransactionFromBinary(otx) + tx, err := types.UnmarshalTransactionFromBinary(otx, false) if err != nil { return fmt.Errorf("tx %d is invalid: %v", i, err) } diff --git a/turbo/adapter/ethapi/api.go b/turbo/adapter/ethapi/api.go index 698b1436461..3a64ce24d88 100644 --- a/turbo/adapter/ethapi/api.go +++ b/turbo/adapter/ethapi/api.go @@ -35,7 +35,6 @@ import ( "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/eth/tracers/logger" - "github.com/ledgerwatch/log/v3" ) // CallArgs represents the arguments for a call.