Skip to content

Commit

Permalink
fix nil error in bor devnet (#8578)
Browse files Browse the repository at this point in the history
  • Loading branch information
anshalshukla authored Oct 25, 2023
1 parent 52c4489 commit 95424b5
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions eth/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,22 +286,6 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
logger: logger,
}

// Check if we have an already initialized chain and fall back to
// that if so. Otherwise we need to generate a new genesis spec.
blockReader, blockWriter, allSnapshots, agg, err := setUpBlockReader(ctx, chainKv, config.Dirs, config.Snapshot, config.HistoryV3, config.Genesis.Config.Bor != nil, logger)
if err != nil {
return nil, err
}
backend.agg, backend.blockSnapshots, backend.blockReader, backend.blockWriter = agg, allSnapshots, blockReader, blockWriter

if config.HistoryV3 {
backend.chainDB, err = temporal.New(backend.chainDB, agg, systemcontracts.SystemContractCodeLookup[config.Genesis.Config.ChainName])
if err != nil {
return nil, err
}
chainKv = backend.chainDB //nolint
}

var chainConfig *chain.Config
var genesis *types.Block
if err := backend.chainDB.Update(context.Background(), func(tx kv.RwTx) error {
Expand Down Expand Up @@ -329,6 +313,22 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger

logger.Info("Initialised chain configuration", "config", chainConfig, "genesis", genesis.Hash())

// Check if we have an already initialized chain and fall back to
// that if so. Otherwise we need to generate a new genesis spec.
blockReader, blockWriter, allSnapshots, agg, err := setUpBlockReader(ctx, chainKv, config.Dirs, config.Snapshot, config.HistoryV3, chainConfig.Bor != nil, logger)
if err != nil {
return nil, err
}
backend.agg, backend.blockSnapshots, backend.blockReader, backend.blockWriter = agg, allSnapshots, blockReader, blockWriter

if config.HistoryV3 {
backend.chainDB, err = temporal.New(backend.chainDB, agg, systemcontracts.SystemContractCodeLookup[config.Genesis.Config.ChainName])
if err != nil {
return nil, err
}
chainKv = backend.chainDB //nolint
}

if err := backend.setUpSnapDownloader(ctx, config.Downloader); err != nil {
return nil, err
}
Expand Down

0 comments on commit 95424b5

Please sign in to comment.