Skip to content

Commit

Permalink
Revert "to fix txpool startup race (#7165)"
Browse files Browse the repository at this point in the history
This reverts commit 36cce22.
  • Loading branch information
AskAlexSharov committed Mar 31, 2023
1 parent 04b5c0c commit cfaec62
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions eth/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -610,14 +610,16 @@ func New(stack *node.Node, config *ethconfig.Config, logger log.Logger) (*Ethere
// 1) Hive tests requires us to do so and starting it from eth_sendRawTransaction is not viable as we have not enough data
// to initialize it properly.
// 2) we cannot propose for block 1 regardless.
{
go func() {
time.Sleep(10 * time.Millisecond)
baseFee := uint64(0)
if currentBlock.BaseFee() != nil {
baseFee = currentBlock.BaseFee().Uint64()
}
backend.notifications.Accumulator.StartChange(currentBlock.NumberU64(), currentBlock.Hash(), nil, false)
backend.notifications.Accumulator.SendAndReset(ctx, backend.notifications.StateChangesConsumer, baseFee, currentBlock.GasLimit())
}

}()

if !config.DeprecatedTxPool.Disable {
backend.txPool2Fetch.ConnectCore()
Expand Down

0 comments on commit cfaec62

Please sign in to comment.