minor edits

block/manager.go

@@ -65,9 +65,6 @@ type Manager struct {
  // prune anything that might be submitted in the future. Therefore, it must be atomic.
  LastSubmittedHeight atomic.Uint64
 
- // The last height which was finalized after dispute period, obtained from the Hub
- LastFinalizedHeight atomic.Uint64
-
  /*
  Retrieval
  */
@@ -307,16 +304,19 @@ func (m *Manager) syncFromSettlement() error {
  m.LastSubmittedHeight.Store(res.EndHeight)
  m.UpdateTargetHeight(res.EndHeight)
 
- m.triggerStateUpdateSyncing()
- m.triggerStateUpdateValidation()
-
  res, err = m.SLClient.GetLatestFinalizedBatch()
  if errors.Is(err, gerrc.ErrNotFound) {
  // The SL hasn't got any batches for this chain yet.
  m.logger.Info("No finalized batches for chain found in SL.")
  return nil
  }
- m.LastFinalizedHeight.Store(res.EndHeight)
+ // update validation height with latest finalized height (it will be updated only of finalized height is higher)
+ m.State.SetLastValidatedHeight(res.EndHeight)
+
+ // try to sync to last state update submitted on startup
+ m.triggerStateUpdateSyncing()
+ // try to validate all pending state updates on startup
+ m.triggerStateUpdateValidation()
 
  return nil
 }

block/sync.go

@@ -74,6 +74,8 @@ func (m *Manager) SyncLoop(ctx context.Context) error {
 
  }
 
+ m.triggerStateUpdateValidation()
+
  m.logger.Info("Synced.", "current height", m.State.Height(), "last submitted height", m.LastSubmittedHeight.Load())
 
  m.synced.Nudge()
@@ -89,20 +91,20 @@ func (m *Manager) waitForSyncing() {
  }
 }
 
-func (m *Manager) triggerStateUpdateValidation() {
+func (m *Manager) triggerStateUpdateSyncing() {
  // Trigger state update validation.
  select {
- case m.validateC <- struct{}{}:
+ case m.syncingC <- struct{}{}:
  default:
- m.logger.Debug("disregarding new state update, node is still validating")
+ m.logger.Debug("disregarding new state update, node is still syncing")
  }
 }
 
-func (m *Manager) triggerStateUpdateSyncing() {
+func (m *Manager) triggerStateUpdateValidation() {
  // Trigger state update validation.
  select {
- case m.syncingC <- struct{}{}:
+ case m.validateC <- struct{}{}:
  default:
- m.logger.Debug("disregarding new state update, node is still syncing")
+ m.logger.Debug("disregarding new state update, node is still validating")
  }
 }

block/validate.go

@@ -1,6 +1,9 @@
 package block
 
-import "context"
+import (
+ "context"
+ "fmt"
+)
 
 // SyncTargetLoop listens for syncing events (from new state update or from initial syncing) and syncs to the last submitted height.
 // In case the node is already synced, it validate
@@ -14,7 +17,7 @@ func (m *Manager) ValidateLoop(ctx context.Context) error {
 
  m.logger.Info("validating state updates to target height", "targetHeight", m.LastSubmittedHeight.Load())
 
- for currH := m.State.NextValidationHeight(); currH < m.NextHeightToSubmit(); currH = m.State.NextValidationHeight() {
+ for currH := m.State.NextValidationHeight(); currH <= m.LastSubmittedHeight.Load(); currH = m.State.NextValidationHeight() {
 
  // get next batch that needs to be validated from SL
  batch, err := m.SLClient.GetBatchAtHeight(currH)
@@ -32,8 +35,16 @@ func (m *Manager) ValidateLoop(ctx context.Context) error {
  if currH == m.State.NextValidationHeight() {
  panic("validation not progressing")
  }
+
+ // update state with new validation height
+ _, err = m.Store.SaveState(m.State, nil)
+ if err != nil {
+ return fmt.Errorf("save state: %w", err)
+ }
+
  m.logger.Debug("state info validated", "batch end height", batch.EndHeight, "lastValidatedHeight", m.State.GetLastValidatedHeight())
  }
+
  }
  }
 }

types/state.go

@@ -69,7 +69,7 @@ func (s *State) Height() uint64 {
 // SetHeight sets the height saved in the Store if it is higher than the existing height
 // returns OK if the value was updated successfully or did not need to be updated
 func (s *State) SetLastValidatedHeight(height uint64) {
- s.LastValidatedHeight.Store(height)
+ s.LastValidatedHeight.Store(max(s.GetLastValidatedHeight(), height))
 }
 
 // Height returns height of the highest block saved in the Store.