chore: run blocksync on statesync retry failure

dashpay · Jan 28, 2025 · 9c7f3a0 · 9c7f3a0
1 parent 29fe133
commit 9c7f3a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/internal/consensus/state_data.go b/internal/consensus/state_data.go
@@ -119,7 +119,7 @@ func (s *StateDataStore) Subscribe(evsw *eventemitter.EventEmitter) {
 	})
 }
 
-// StateData is a copy of the current RoundState nad state.State stored in the store
+// StateData is a copy of the current RoundState and state.State stored in the store
 // Along with data, StateData provides some methods to check or update data inside
 type StateData struct {
 	config *config.ConsensusConfig

diff --git a/internal/statesync/reactor.go b/internal/statesync/reactor.go
@@ -277,9 +277,16 @@ func (r *Reactor) OnStart(ctx context.Context) error {
 	if r.needsStateSync {
 		r.logger.Info("starting state sync")
 		if _, err := r.Sync(ctx); err != nil {
-			if errors.Is(err, errNoSnapshots) {
+			if errors.Is(err, errNoSnapshots) && r.postSyncHook != nil {
+				state, err := r.stateStore.Load()
+				if err != nil {
+					return fmt.Errorf("failed to load state: %w", err)
+				}
+
 				r.logger.Warn("no snapshots available; falling back to block sync", "err", err)
-				return nil
+				if err := r.postSyncHook(ctx, state); err != nil {
+					return fmt.Errorf("post sync failed: %w", err)
+				}
 			}
 			r.logger.Error("state sync failed; shutting down this node", "err", err)
 			return err