From d7b8d02dac1914643c17fff4ba127c425df3b718 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Sun, 24 Dec 2023 10:28:46 -0700 Subject: [PATCH 1/2] Fix Broadcaster BroadcastMessages sequence numbers --- arbnode/node.go | 2 +- broadcaster/broadcaster.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arbnode/node.go b/arbnode/node.go index accca10e47..951403244f 100644 --- a/arbnode/node.go +++ b/arbnode/node.go @@ -764,7 +764,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 index 38ffb0696c..ed3088ca2e 100644 --- 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 } From 11cd4efb596c76d5f15091cf1be167bbf9880969 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Sun, 24 Dec 2023 10:42:17 -0700 Subject: [PATCH 2/2] Fix unused variable --- arbnode/node.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/arbnode/node.go b/arbnode/node.go index 951403244f..45ef7206e1 100644 --- 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