Merge branch 'main' into alex/adr023_ha-failover_raft7

* main: chore: fix some comments (#2874) chore: bump node in evm-single (#2875) refactor(syncer,cache): use compare and swap loop and add comments (#2873) refactor: use state da height as well (#2872) refactor: retrieve highest da height in cache (#2870) chore: change from event count to start and end height (#2871)
alpe · Jan 28, 2026 · Nov 12, 2025 · Nov 12, 2025 · Nov 17, 2025 · Nov 17, 2025
commit b92a67fb96f790bf71fcbe701a42a88e366a2958
diff --git a/block/internal/cache/generic_cache.go b/block/internal/cache/generic_cache.go
@@ -10,6 +10,7 @@ import (
 	"sync"
 
 	"golang.org/x/sync/errgroup"
+	"sync/atomic"
 )
 
 // Cache is a generic cache that maintains items that are seen and hard confirmed
@@ -275,6 +276,11 @@ func (c *Cache[T]) LoadFromDisk(folderPath string) error {
 		}
 		for k, v := range daIncludedMap {
 			c.daIncluded.Store(k, v)
+			// Update max DA height during load
+			current := c.maxDAHeight.Load()
+			if v > current {
+				c.maxDAHeight.Store(v)
+			}
 		}
 
 		return nil

diff --git a/block/internal/syncing/syncer.go b/block/internal/syncing/syncer.go
@@ -109,7 +109,7 @@ func NewSyncer(
 		headerStore: headerStore,
 		dataStore:   dataStore,
 		lastState:   &atomic.Pointer[types.State]{},
-		daHeight:    &atomic.Uint64{},
+		daRetrieverHeight: &atomic.Uint64{},
 		heightInCh:  make(chan common.DAHeightEvent, 1_000),
 		errorCh:     errorCh,
 		logger:      logger.With().Str("component", "syncer").Logger(),
@@ -143,6 +143,10 @@ func (s *Syncer) Start(ctx context.Context) error {
 		}
 	}
 
+	if !s.waitForGenesis() {
+		return nil
+	}
+
 	// Start main processing loop
 	go s.processLoop()