src/shim/machine/manifest.rs (1)

27-28: Avoid leaking internal field; rely on the accessor instead.

actor_list_cid already has a public accessor (source_cid()), keeping the field private preserves invariants and allows future internal changes without API breakage.

Apply this diff:

-    /// The CID that this manifest was built from
-    pub actor_list_cid: Cid,
+    /// The CID that this manifest was built from
+    actor_list_cid: Cid,

src/cli/subcommands/state_cmd.rs (1)

46-51: Clarify help text to reflect full output (manifest, bundle, and per-actor code CIDs).

Align the CLI help with the actual output to reduce ambiguity.

Apply this diff:

-    /// Returns the built-in actor bundle CIDs for the current network
+    /// Shows built-in actor code CIDs for the current head (heaviest tipset),
+    /// including the manifest and bundle CIDs.

src/rpc/methods/state.rs (4)

3174-3182: Use fully-qualified LotusJson path in schemars for consistency.
Elsewhere in this file (e.g., NetworkParams) we use crate::lotus_json::LotusJson<T>. Aligning avoids import/path surprises in schema generation.

Apply:

-    #[schemars(with = "LotusJson<Cid>")]
+    #[schemars(with = "crate::lotus_json::LotusJson<Cid>")]
     pub manifest: Cid,
-    #[schemars(with = "LotusJson<Cid>")]
+    #[schemars(with = "crate::lotus_json::LotusJson<Cid>")]
     pub bundle: Cid,
-    #[schemars(with = "LotusJson<HashMap<String, Cid>>")]
+    #[schemars(with = "crate::lotus_json::LotusJson<HashMap<String, Cid>>")]
     pub actor_cids: HashMap<String, Cid>,

---

3186-3204: Make CLI text output deterministic by sorting actor names.
Iteration over HashMap is non-deterministic; sorting improves readability and diffs.

         writeln!(f, "Actor CIDs:")?;
         let longest_name = self
             .actor_cids
             .keys()
             .map(|name| name.len())
             .max()
             .unwrap_or(0);
-        for (name, cid) in &self.actor_cids {
-            writeln!(f, "  {:width$} : {}", name, cid, width = longest_name)?;
-        }
+        let mut entries: Vec<_> = self.actor_cids.iter().collect();
+        entries.sort_by(|(a, _), (b, _)| a.cmp(b));
+        for (name, cid) in entries {
+            writeln!(f, "  {:width$} : {}", name, cid, width = longest_name)?;
+        }
         Ok(())

---

3235-3241: Fix error message: it’s matching by manifest (actor list) CID, not bundle CID.
This avoids confusion when troubleshooting.

-            .with_context(|| {
-                format!(
-                    "No actor bundle found for network {} with bundle CID {}",
-                    ctx.chain_config().network,
-                    actors
-                )
-            })?;
+            .with_context(|| {
+                format!(
+                    "No actor bundle metadata found for network {} with manifest (actor list) CID {}",
+                    ctx.chain_config().network,
+                    actors
+                )
+            })?;

---

3252-3252: Replace chain_config().network_version(ts.epoch() - 1) with state_manager.get_network_version(ts.epoch()). Matches other RPC methods (e.g. StateNetworkVersion) and removes the off-by-one risk at epoch 0.

-        let network_version = ctx.chain_config().network_version(ts.epoch() - 1);
+        let network_version = ctx.state_manager.get_network_version(ts.epoch());

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Learnt from: LesnyRumcajs
PR: ChainSafe/forest#5907
File: src/rpc/methods/state.rs:523-570
Timestamp: 2025-08-06T15:44:33.467Z
Learning: LesnyRumcajs prefers to rely on BufWriter's Drop implementation for automatic flushing rather than explicit flush() calls in Forest codebase.

src/rpc/methods/state.rs (2)

3187-3210: Deterministic text output: sort actor names before printing

Current iteration over HashMap yields nondeterministic order. Sort to make the CLI’s text output stable.

Apply this diff:

-        for (name, cid) in &self.actor_cids {
-            writeln!(f, "  {:width$} : {}", name, cid, width = longest_name)?;
-        }
+        let mut entries: Vec<_> = self.actor_cids.iter().collect();
+        entries.sort_by(|(a, _), (b, _)| a.cmp(b));
+        for (name, cid) in entries {
+            writeln!(f, "  {:width$} : {}", name, cid, width = longest_name)?;
+        }

---

3237-3242: Improve mismatch error with actionable details

Include both CIDs to ease diagnostics when manifests differ.

Apply this diff:

-        if current_manifest != bundle.manifest {
-            return Err(anyhow::anyhow!("Actor bundle manifest does not match the manifest in the state tree. This indicates that the node is misconfigured or is running an unsupported network.")
-            .into());
-        }
+        if current_manifest != bundle.manifest {
+            return Err(anyhow::anyhow!(
+                "Actor bundle manifest mismatch: state_actor_list_cid={}, bundle_actor_list_cid={}. \
+This indicates that the node is misconfigured or is running an unsupported network.",
+                current_manifest.actor_list_cid,
+                bundle.manifest.actor_list_cid
+            ).into());
+        }

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Learnt from: LesnyRumcajs
PR: ChainSafe/forest#5907
File: src/rpc/methods/state.rs:523-570
Timestamp: 2025-08-06T15:44:33.467Z
Learning: LesnyRumcajs prefers to rely on BufWriter's Drop implementation for automatic flushing rather than explicit flush() calls in Forest codebase.