fallback in case of height-1

Author: julienrbrt

pkg/store/store.go

@@ -222,10 +222,24 @@ func (s *DefaultStore) GetState(ctx context.Context) (types.State, error) {
 func (s *DefaultStore) GetStateAtHeight(ctx context.Context, height uint64) (types.State, error) {
 	blob, err := s.db.Get(ctx, ds.NewKey(getStateAtHeightKey(height)))
 	if err != nil {
-		if errors.Is(err, ds.ErrNotFound) {
+		currentHeight, err := s.Height(ctx)
+		if err != nil {
+			return types.State{}, fmt.Errorf("failed to retrieve current height: %w", err)
+		}
+
+		// prior to https://github.com/evstack/ev-node/pull/2499 only the last state was stored in the state key
+		if currentHeight == height+1 {
+			blob, err = s.db.Get(ctx, ds.NewKey(statePrefix))
+			if errors.Is(err, ds.ErrNotFound) {
+				return types.State{}, fmt.Errorf("no state found at height %d", height)
+			} else if err != nil {
+				return types.State{}, fmt.Errorf("failed to retrieve state at height %d: %w", height, err)
+			}
+		} else if errors.Is(err, ds.ErrNotFound) {
 			return types.State{}, fmt.Errorf("no state found at height %d", height)
+		} else {
+			return types.State{}, fmt.Errorf("failed to retrieve state at height %d: %w", height, err)
 		}
-		return types.State{}, fmt.Errorf("failed to retrieve state at height %d: %w", height, err)
 	}
 
 	var pbState pb.State