Skip to content

Commit

Permalink
Fix build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ImTei committed Apr 26, 2024
1 parent e68532b commit 8178db6
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion erigon-lib/chain/chain_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
Expand Down
1 change: 0 additions & 1 deletion erigon-lib/downloader/downloader.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"encoding/json"
"errors"
"fmt"
"log"
"math/rand"
"net/http"
"net/url"
Expand Down
2 changes: 1 addition & 1 deletion eth/stagedsync/stage_mining_create_block.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type MiningBlock struct {
Receipts types.Receipts
Withdrawals []*types.Withdrawal
PreparedTxs types.TransactionsStream

ForceTxs types.TransactionsStream
}

Expand Down
2 changes: 1 addition & 1 deletion eth/stagedsync/stage_mining_force_txs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
1 change: 0 additions & 1 deletion turbo/adapter/ethapi/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 8178db6

Please sign in to comment.