Merge pull request #2054 from OffchainLabs/fix-broadcast-messages

Fix Broadcaster BroadcastMessages sequence numbers
OffchainLabs · Dec 24, 2023 · 8f55e38 · 8f55e38
2 parents 492e471 + 11cd4ef
commit 8f55e38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/arbnode/node.go b/arbnode/node.go
@@ -731,8 +731,6 @@ func CreateNode(
 }
 
 func (n *Node) Start(ctx context.Context) error {
-	// config is the static config at start, not a dynamic config
-	config := n.configFetcher.Get()
 	execClient, ok := n.Execution.(*gethexec.ExecutionNode)
 	if !ok {
 		execClient = nil
@@ -764,7 +762,7 @@ func (n *Node) Start(ctx context.Context) error {
 			return fmt.Errorf("error initializing feed broadcast server: %w", err)
 		}
 	}
-	if n.InboxTracker != nil && n.BroadcastServer != nil && config.Sequencer {
+	if n.InboxTracker != nil && n.BroadcastServer != nil {
 		// Even if the sequencer coordinator will populate this backlog,
 		// we want to make sure it's populated before any clients connect.
 		err = n.InboxTracker.PopulateFeedBacklog(n.BroadcastServer)

diff --git a/broadcaster/broadcaster.go b/broadcaster/broadcaster.go
@@ -89,8 +89,8 @@ func (b *Broadcaster) BroadcastMessages(messages []arbostypes.MessageWithMetadat
 		}
 	}()
 	var feedMessages []*m.BroadcastFeedMessage
-	for _, msg := range messages {
-		bfm, err := b.NewBroadcastFeedMessage(msg, seq)
+	for i, msg := range messages {
+		bfm, err := b.NewBroadcastFeedMessage(msg, seq+arbutil.MessageIndex(i))
 		if err != nil {
 			return err
 		}