Merge branch 'express-lane-timeboost' into add-timeboosted-broadcastf…

…eedmessage
OffchainLabs · Oct 15, 2024 · a19acb6 · a19acb6
2 parents d3cd8f5 + 651277d
commit a19acb6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/cmd/nitro/nitro.go b/cmd/nitro/nitro.go
@@ -678,6 +678,8 @@ func mainImpl() int {
 
 	execNodeConfig := execNode.ConfigFetcher()
 	if execNodeConfig.Sequencer.Enable && execNodeConfig.Sequencer.Timeboost.Enable {
+		log.Warn("TODO FIX RACE CONDITION sleeping for 10 seconds before starting express lane...")
+		time.Sleep(10 * time.Second)
 		execNode.Sequencer.StartExpressLane(
 			ctx,
 			common.HexToAddress(execNodeConfig.Sequencer.Timeboost.AuctionContractAddress),

diff --git a/execution/gethexec/express_lane_service.go b/execution/gethexec/express_lane_service.go
@@ -187,10 +187,6 @@ func (es *expressLaneService) Start(ctxIn context.Context) {
 	})
 }
 
-func (es *expressLaneService) StopAndWait() {
-	es.StopWaiter.StopAndWait()
-}
-
 func (es *expressLaneService) currentRoundHasController() bool {
 	es.Lock()
 	defer es.Unlock()

diff --git a/execution/gethexec/sequencer.go b/execution/gethexec/sequencer.go
@@ -1253,6 +1253,7 @@ func (s *Sequencer) StartExpressLane(ctx context.Context, auctionContractAddr co
 		log.Crit("Failed to connect to sequencer RPC client", "err", err)
 	}
 	seqClient := ethclient.NewClient(rpcClient)
+
 	els, err := newExpressLaneService(
 		auctionContractAddr,
 		seqClient,
@@ -1268,8 +1269,8 @@ func (s *Sequencer) StartExpressLane(ctx context.Context, auctionContractAddr co
 
 func (s *Sequencer) StopAndWait() {
 	s.StopWaiter.StopAndWait()
-	if s.config().Timeboost.Enable {
-		s.expressLaneService.StopWaiter.StopAndWait()
+	if s.config().Timeboost.Enable && s.expressLaneService != nil {
+		s.expressLaneService.StopAndWait()
 	}
 	if s.txRetryQueue.Len() == 0 && len(s.txQueue) == 0 && s.nonceFailures.Len() == 0 {
 		return