fixes

Author: gupadhyaya

block/manager.go

@@ -1263,14 +1263,14 @@ func (m *Manager) replayBlocks(
 		if err != nil {
 			return nil, fmt.Errorf("failed to get block data for height %d: %w", i, err)
 		}
-		appHash, err = m.executor.ExecCommitBlock(proxyApp.Consensus(), block, m.logger, state, m.store)
-		if err != nil {
-			return nil, err
-		}
 		// Extra check to ensure the app was not changed in a way it shouldn't have.
 		if len(appHash) > 0 {
 			assertAppHashEqualsOneFromBlock(appHash, block)
 		}
+		appHash, err = m.executor.ExecCommitBlock(proxyApp.Consensus(), block, m.logger, state, m.store)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	assertAppHashEqualsOneFromState(appHash, state)

cmd/rollkit/docs/rollkit_start.md

@@ -41,6 +41,7 @@ rollkit start [flags]
       --rollkit.lazy_aggregator                         wait for transactions, don't build empty blocks
       --rollkit.light                                   run light client
       --rollkit.max_pending_blocks uint                 limit of blocks pending DA submission (0 for no limit)
+      --rollkit.replay                                  replay blocks
       --rollkit.trusted_hash string                     initial trusted hash to start the header exchange service
       --rpc.grpc_laddr string                           GRPC listen address (BroadcastTx only). Port required
       --rpc.laddr string                                RPC listen address. Port required (default "tcp://127.0.0.1:26657")

state/executor.go

@@ -551,7 +551,7 @@ func (e *BlockExecutor) ExecCommitBlock(
 		return nil, fmt.Errorf("expected tx results length to match size of transactions in block. Expected %d, got %d", len(block.Data.Txs), len(resp.TxResults))
 	}
 
-	logger.Info("Executed block", "height", block.Height, "app_hash", fmt.Sprintf("%X", resp.AppHash))
+	logger.Info("Executed block", "height", block.Height(), "app_hash", fmt.Sprintf("%X", resp.AppHash))
 
 	// Commit block
 	_, err = e.proxyApp.Commit(context.TODO())