Merge pull request #2058 from OffchainLabs/fix-forwarder-panic

Fix sequencer forwarder panic on lack of targets
OffchainLabs · Dec 27, 2023 · 66d00da · 66d00da
2 parents 6932d66 + 1fac15d
commit 66d00da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/execution/gethexec/forwarder.go b/execution/gethexec/forwarder.go
@@ -205,6 +205,8 @@ func (f *TxForwarder) Initialize(inctx context.Context) error {
 	f.targets = targets
 	if len(f.rpcClients) > 0 {
 		f.enabled.Store(true)
+	} else if lastError == nil {
+		return errors.New("no non-empty forwarding targets specified")
 	} else {
 		return lastError
 	}

diff --git a/execution/gethexec/sequencer.go b/execution/gethexec/sequencer.go
@@ -487,7 +487,7 @@ func (s *Sequencer) CheckHealth(ctx context.Context) error {
 func (s *Sequencer) ForwardTarget() string {
 	s.activeMutex.Lock()
 	defer s.activeMutex.Unlock()
-	if s.forwarder == nil {
+	if s.forwarder == nil || len(s.forwarder.targets) == 0 {
 		return ""
 	}
 	return s.forwarder.targets[0]
@@ -497,7 +497,7 @@ func (s *Sequencer) ForwardTo(url string) error {
 	s.activeMutex.Lock()
 	defer s.activeMutex.Unlock()
 	if s.forwarder != nil {
-		if s.forwarder.targets[0] == url {
+		if len(s.forwarder.targets) > 0 && s.forwarder.targets[0] == url {
 			log.Warn("attempted to update sequencer forward target with existing target", "url", url)
 			return nil
 		}