add back some changes

Author: tac0turtle

block/internal/executing/executor.go

@@ -211,9 +211,6 @@ func (e *Executor) initializeState() error {
 		if err := batch.SetHeight(state.LastBlockHeight); err != nil {
 			return fmt.Errorf("failed to set store height: %w", err)
 		}
-		if err := batch.UpdateState(state); err != nil {
-			return fmt.Errorf("failed to update state: %w", err)
-		}
 		if err := batch.Commit(); err != nil {
 			return fmt.Errorf("failed to commit initial state: %w", err)
 		}
@@ -357,6 +354,20 @@ func (e *Executor) produceBlock() error {
 		if err != nil {
 			return fmt.Errorf("failed to create block: %w", err)
 		}
+
+		// saved early for crash recovery, will be overwritten later with the final signature
+		b, err := e.store.NewBatch(context.Background())
+		if err != nil {
+			return fmt.Errorf("failed to create batch: %w", err)
+		}
+
+		if err = b.SaveBlockData(header, data, &types.Signature{}); err != nil {
+			return fmt.Errorf("failed to save block: %w", err)
+		}
+
+		if err := b.Commit(); err != nil {
+			return fmt.Errorf("failed to commit batch: %w", err)
+		}
 	}
 
 	newState, err := e.applyBlock(e.ctx, header.Header, data)

block/internal/syncing/syncer.go

@@ -345,9 +345,9 @@ func (s *Syncer) tryFetchFromP2P() {
 		s.p2pHandler.ProcessHeaderRange(s.ctx, currentHeight+1, newHeaderHeight, s.heightInCh)
 	}
 
-	// Process data
+	// Process data (if not already processed by headers)
 	newDataHeight := s.dataBroadcaster.Store().Height()
-	if newDataHeight > currentHeight {
+	if newDataHeight != newHeaderHeight && newDataHeight > currentHeight {
 		s.p2pHandler.ProcessDataRange(s.ctx, currentHeight+1, newDataHeight, s.heightInCh)
 	}
 }