From a686bca342c34f0a888ee06ccbb71be2e4a71df0 Mon Sep 17 00:00:00 2001
From: hanabi1224 <harlowmoo@gmail.com>
Date: Fri, 21 Nov 2025 18:16:41 +0800
Subject: [PATCH] fix: error caused by --skip-load-actors

---
 scripts/tests/calibnet_stateless_rpc_check.sh | 2 +-
 scripts/tests/harness.sh                      | 2 +-
 src/daemon/mod.rs                             | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/tests/calibnet_stateless_rpc_check.sh b/scripts/tests/calibnet_stateless_rpc_check.sh
index 3c3c88ed0fc3..8b6aaadb7fd8 100755
--- a/scripts/tests/calibnet_stateless_rpc_check.sh
+++ b/scripts/tests/calibnet_stateless_rpc_check.sh
@@ -10,7 +10,7 @@ function forest_run_node_stateless_detached_with_filter_list {
   pkill -9 forest || true
   local filter_list=$1
 
-  $FOREST_PATH --chain calibnet --encrypt-keystore false --log-dir "$LOG_DIRECTORY" --skip-load-actors --stateless --rpc-filter-list "$filter_list" &
+  $FOREST_PATH --chain calibnet --encrypt-keystore false --log-dir "$LOG_DIRECTORY" --stateless --rpc-filter-list "$filter_list" &
   forest_wait_api
 }
 
diff --git a/scripts/tests/harness.sh b/scripts/tests/harness.sh
index 8cdc10278b07..f949b7700ab6 100644
--- a/scripts/tests/harness.sh
+++ b/scripts/tests/harness.sh
@@ -86,7 +86,7 @@ function forest_run_node_stateless_detached {
 		listening_multiaddrs = ["/ip4/127.0.0.1/tcp/0"]
 	EOF
 
-  $FOREST_PATH --chain calibnet --encrypt-keystore false --config "$CONFIG_PATH" --log-dir "$LOG_DIRECTORY" --save-token ./stateless_admin_token --skip-load-actors --stateless &
+  $FOREST_PATH --chain calibnet --encrypt-keystore false --config "$CONFIG_PATH" --log-dir "$LOG_DIRECTORY" --save-token ./stateless_admin_token --stateless &
 }
 
 function forest_wait_api {
diff --git a/src/daemon/mod.rs b/src/daemon/mod.rs
index 0f84bc458c43..40c6621b8f35 100644
--- a/src/daemon/mod.rs
+++ b/src/daemon/mod.rs
@@ -595,8 +595,11 @@ pub(super) async fn start_services(
     if opts.exit_after_init {
         return Ok(());
     }
-    if !opts.stateless {
-        ctx.state_manager.maybe_rewind_heaviest_tipset()?;
+    if !opts.stateless
+        && !opts.skip_load_actors
+        && let Err(e) = ctx.state_manager.maybe_rewind_heaviest_tipset()
+    {
+        tracing::warn!("error in maybe_rewind_heaviest_tipset: {e}");
     }
     let p2p_service = create_p2p_service(&mut services, &mut config, &ctx).await?;
     let mpool = create_mpool(&mut services, &p2p_service, &ctx)?;