changelog

hanabi1224 · hanabi1224 · commit fee02ebb9a11 · 2025-08-19T07:55:46.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,10 @@
 
 - [#5867](https://github.com/ChainSafe/forest/pull/5867) Added `--unordered` to `forest-cli snapshot export` for exporting `CAR` blocks in non-deterministic order for better performance with more parallelization.
 
+- [#5946](https://github.com/ChainSafe/forest/pull/5946) Added `--n-epochs` to `forest-cli state compute` for computating state trees in batch.
+
+- [#5946](https://github.com/ChainSafe/forest/pull/5946) Added `--verbose` to `forest-cli state compute` for printing epochs and tipset keys along with state roots.
+
 - [#5886](https://github.com/ChainSafe/forest/issues/5886) Add `forest-tool archive merge-f3` subcommand for merging a v1 Filecoin snapshot and an F3 snapshot into a v2 Filecoin snapshot.
 
 - [#4976](https://github.com/ChainSafe/forest/issues/4976) Add support for the `Filecoin.EthSubscribe` and `Filecoin.EthUnsubscribe` API methods to enable subscriptions to Ethereum event types: `heads` and `logs`.
diff --git a/src/cli/subcommands/state_cmd.rs b/src/cli/subcommands/state_cmd.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::lotus_json::HasLotusJson;
-use crate::rpc::state::ForestStateCompute;
+use crate::rpc::state::{ForestComputeStateOutput, ForestStateCompute};
 use crate::rpc::{self, prelude::*};
 use crate::shim::address::{CurrentNetwork, Error, Network, StrictAddress};
 use crate::shim::clock::ChainEpoch;
@@ -21,13 +21,17 @@ pub enum StateCommands {
         #[arg(short, long)]
         save_to_file: Option<PathBuf>,
     },
+    /// Compute state trees for epochs
     Compute {
         /// Which epoch to compute the state transition for
         #[arg(long)]
         epoch: ChainEpoch,
         /// Number of tipset epochs to compute state for. Default is 1
         #[arg(short, long)]
         n_epochs: Option<NonZeroUsize>,
+        /// Print epoch and tipset key along with state root
+        #[arg(short, long)]
+        verbose: bool,
     },
     /// Read the state of an actor
     ReadState {
@@ -47,14 +51,27 @@ impl StateCommands {
                     .await?;
                 println!("{ret}");
             }
-            StateCommands::Compute { epoch, n_epochs } => {
-                let state_roots = client
+            StateCommands::Compute {
+                epoch,
+                n_epochs,
+                verbose,
+            } => {
+                let results = client
                     .call(
                         ForestStateCompute::request((epoch, n_epochs))?.with_timeout(Duration::MAX),
                     )
                     .await?;
-                for state_root in state_roots {
-                    println!("{state_root}");
+                for ForestComputeStateOutput {
+                    state_root,
+                    epoch,
+                    tipset_key,
+                } in results
+                {
+                    if verbose {
+                        println!("{state_root} (epoch: {epoch}, tipset key: {tipset_key})");
+                    } else {
+                        println!("{state_root}");
+                    }
                 }
             }
             Self::ReadState { actor_address } => {
diff --git a/src/rpc/methods/state.rs b/src/rpc/methods/state.rs
@@ -1429,7 +1429,7 @@ impl RpcMethod<2> for ForestStateCompute {
     const PERMISSION: Permission = Permission::Read;
 
     type Params = (ChainEpoch, Option<NonZeroUsize>);
-    type Ok = Vec<Cid>;
+    type Ok = Vec<ForestComputeStateOutput>;
 
     async fn handle(
         ctx: Ctx<impl Blockstore + Send + Sync + 'static>,
@@ -1470,13 +1470,18 @@ impl RpcMethod<2> for ForestStateCompute {
 
         let mut results = vec![];
         while let Some(Ok(ts)) = futures.next().await {
+            let epoch = ts.epoch();
+            let tipset_key = ts.key().clone();
             let StateOutput { state_root, .. } = ctx
                 .state_manager
                 .compute_tipset_state(ts, crate::state_manager::NO_CALLBACK, VMTrace::NotTraced)
                 .await?;
-            results.push(state_root);
+            results.push(ForestComputeStateOutput {
+                state_root,
+                epoch,
+                tipset_key,
+            });
         }
-
         Ok(results)
     }
 }
diff --git a/src/rpc/methods/state/types.rs b/src/rpc/methods/state/types.rs
@@ -1,6 +1,7 @@
 // Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
+use crate::blocks::TipsetKey;
 use crate::lotus_json::{LotusJson, lotus_json_with_self};
 use crate::message::Message as _;
 use crate::shim::executor::ApplyRet;
@@ -32,6 +33,20 @@ pub struct ComputeStateOutput {
 
 lotus_json_with_self!(ComputeStateOutput);
 
+#[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct ForestComputeStateOutput {
+    #[schemars(with = "LotusJson<Cid>")]
+    #[serde(with = "crate::lotus_json")]
+    pub state_root: Cid,
+    pub epoch: ChainEpoch,
+    #[schemars(with = "LotusJson<TipsetKey>")]
+    #[serde(with = "crate::lotus_json")]
+    pub tipset_key: TipsetKey,
+}
+
+lotus_json_with_self!(ForestComputeStateOutput);
+
 #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema)]
 #[serde(rename_all = "PascalCase")]
 pub struct ApiInvocResult {
