From 541cfd73b19d09b131565cbaeac5611562178ea4 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Mon, 11 Aug 2025 17:56:26 +0200
Subject: [PATCH 01/71] Add market actor

---
 src/rpc/registry/actors/market.rs | 55 +++++++++++++++++++++++++++++++
 src/rpc/registry/actors/mod.rs    |  1 +
 src/rpc/registry/methods_reg.rs   |  3 +-
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 src/rpc/registry/actors/market.rs

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
new file mode 100644
index 000000000000..6cdc77c91f63
--- /dev/null
+++ b/src/rpc/registry/actors/market.rs
@@ -0,0 +1,55 @@
+// Copyright 2019-2025 ChainSafe Systems
+// SPDX-License-Identifier: Apache-2.0, MIT
+
+use crate::rpc::registry::methods_reg::{MethodRegistry, register_actor_methods};
+use crate::shim::message::MethodNum;
+use anyhow::Result;
+use cid::Cid;
+
+// Macro for versions 8-10 that only have Exec method
+macro_rules! register_market_versions_8_to_10 {
+    ($registry:expr, $code_cid:expr, $state_version:path) => {{
+        use $state_version::{ConstructorParams, ExecParams, Method};
+
+        register_actor_methods!(
+            $registry,
+            $code_cid,
+            [
+                (Method::Constructor, ConstructorParams),
+                (Method::Exec, ExecParams),
+            ]
+        );
+    }};
+}
+
+// Macro for versions 11-16 that have Exec4
+macro_rules! register_market_versions_11_to_16 {
+    ($registry:expr, $code_cid:expr, $state_version:path) => {{
+        use $state_version::{ConstructorParams, Exec4Params, ExecParams, Method};
+
+        register_actor_methods!(
+            $registry,
+            $code_cid,
+            [
+                (Method::Constructor, ConstructorParams),
+                (Method::Exec, ExecParams),
+                (Method::Exec4, Exec4Params)
+            ]
+        );
+    }};
+}
+
+pub(crate) fn register_actor_methods(registry: &mut MethodRegistry, cid: Cid, version: u64) {
+    match version {
+        8 => register_market_versions_8_to_10!(registry, cid, fil_actor_init_state::v8),
+        9 => register_market_versions_8_to_10!(registry, cid, fil_actor_init_state::v9),
+        10 => register_market_versions_8_to_10!(registry, cid, fil_actor_init_state::v10),
+        11 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v11),
+        12 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v12),
+        13 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v13),
+        14 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v14),
+        15 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v15),
+        16 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v16),
+        _ => {}
+    }
+}
diff --git a/src/rpc/registry/actors/mod.rs b/src/rpc/registry/actors/mod.rs
index 7d995f8e3658..0985b96acfab 100644
--- a/src/rpc/registry/actors/mod.rs
+++ b/src/rpc/registry/actors/mod.rs
@@ -4,6 +4,7 @@
 pub(crate) mod account;
 pub(crate) mod evm;
 pub(crate) mod init;
+pub(crate) mod market;
 pub(crate) mod miner;
 pub(crate) mod multisig;
 pub(crate) mod power;
diff --git a/src/rpc/registry/methods_reg.rs b/src/rpc/registry/methods_reg.rs
index cb9a05bf3e8c..f8834bb86c93 100644
--- a/src/rpc/registry/methods_reg.rs
+++ b/src/rpc/registry/methods_reg.rs
@@ -74,7 +74,7 @@ impl MethodRegistry {
 
     fn register_known_methods(&mut self) {
         use crate::rpc::registry::actors::{
-            account, evm, init, miner, multisig, power, reward, system,
+            account, evm, init, market, miner, multisig, power, reward, system,
         };
 
         for (&cid, &(actor_type, version)) in ACTOR_REGISTRY.iter() {
@@ -89,6 +89,7 @@ impl MethodRegistry {
                 BuiltinActor::Power => power::register_actor_methods(self, cid, version),
                 BuiltinActor::Reward => reward::register_actor_methods(self, cid, version),
                 BuiltinActor::Multisig => multisig::register_actor_methods(self, cid, version),
+                BuiltinActor::Market => market::register_actor_methods(self, cid, version),
                 _ => {}
             }
         }

From 08828a1c3f6fe1cf12b2a9f30fa242a4976295a3 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 13 Aug 2025 18:12:21 +0200
Subject: [PATCH 02/71] Add market module to registry

---
 .../actor_states/methods/market_actor.rs      | 58 ++++++++++++++
 src/lotus_json/actor_states/methods/mod.rs    |  1 +
 src/rpc/registry/actors/market.rs             | 75 ++++++++++++++-----
 3 files changed, 114 insertions(+), 20 deletions(-)
 create mode 100644 src/lotus_json/actor_states/methods/market_actor.rs

diff --git a/src/lotus_json/actor_states/methods/market_actor.rs b/src/lotus_json/actor_states/methods/market_actor.rs
new file mode 100644
index 000000000000..96f54a29c77e
--- /dev/null
+++ b/src/lotus_json/actor_states/methods/market_actor.rs
@@ -0,0 +1,58 @@
+// Copyright 2019-2025 ChainSafe Systems
+// SPDX-License-Identifier: Apache-2.0, MIT
+
+use super::*;
+use crate::shim::address::Address;
+use crate::shim::econ::TokenAmount;
+use ::cid::Cid;
+use fvm_ipld_encoding::RawBytes;
+use jsonrpsee::core::Serialize;
+use paste::paste;
+use schemars::JsonSchema;
+use serde::Deserialize;
+use std::fmt::Debug;
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct WithdrawBalanceParamsLotusJson {
+    #[schemars(with = "LotusJson<Address>")]
+    #[serde(with = "crate::lotus_json")]
+    pub provider_or_client: Address,
+    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[serde(with = "crate::lotus_json")]
+    pub amount: TokenAmount,
+}
+
+macro_rules! impl_lotus_json_for_withdraw_balance_params {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::WithdrawBalanceParams {
+                    type LotusJson = WithdrawBalanceParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            provider_or_client: self.provider_or_client.into(),
+                            amount: self.amount.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            provider_or_client: json.provider_or_client.into(),
+                            amount: json.amount.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_withdraw_balance_params!(9, 10, 11, 12, 13, 14, 15, 16);
diff --git a/src/lotus_json/actor_states/methods/mod.rs b/src/lotus_json/actor_states/methods/mod.rs
index 49d8ecd20ab0..ca93081078c0 100644
--- a/src/lotus_json/actor_states/methods/mod.rs
+++ b/src/lotus_json/actor_states/methods/mod.rs
@@ -7,6 +7,7 @@ mod evm_constructor_params;
 mod init_constructor_params;
 mod init_exec4_params;
 mod init_exec_params;
+mod market_actor;
 mod miner_change_worker_params;
 mod miner_constructor_params;
 mod multisig_actor;
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 6cdc77c91f63..561e27819d70 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -6,34 +6,69 @@ use crate::shim::message::MethodNum;
 use anyhow::Result;
 use cid::Cid;
 
-// Macro for versions 8-10 that only have Exec method
-macro_rules! register_market_versions_8_to_10 {
+macro_rules! register_market_versions_8_to_9 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{ConstructorParams, ExecParams, Method};
+        use $state_version::{self, Method};
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
-                (Method::Constructor, ConstructorParams),
-                (Method::Exec, ExecParams),
+                (Method::Constructor, empty),
+                // (Method::AddBalance, AddBalanceParams),
+                // (Method::WithdrawBalance, WithdrawBalanceParams),
+                // (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
         );
     }};
 }
 
-// Macro for versions 11-16 that have Exec4
-macro_rules! register_market_versions_11_to_16 {
+macro_rules! register_market_versions_10_to_11 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{ConstructorParams, Exec4Params, ExecParams, Method};
+        use $state_version::{self, Method, PublishStorageDealsParams, WithdrawBalanceParams};
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
-                (Method::Constructor, ConstructorParams),
-                (Method::Exec, ExecParams),
-                (Method::Exec4, Exec4Params)
+                (Method::Constructor, empty),
+                // (Method::AddBalance, AddBalanceParams),
+                // (Method::WithdrawBalance, WithdrawBalanceParams),
+                // (Method::PublishStorageDeals, PublishStorageDealsParams),
+            ]
+        );
+    }};
+}
+
+macro_rules! register_market_versions_12 {
+    ($registry:expr, $code_cid:expr, $state_version:path) => {{
+        use $state_version::{Method, PublishStorageDealsParams, WithdrawBalanceParams};
+
+        register_actor_methods!(
+            $registry,
+            $code_cid,
+            [
+                (Method::Constructor, empty),
+                // (Method::AddBalance, AddBalanceParams),
+                // (Method::WithdrawBalance, WithdrawBalanceParams),
+                // (Method::PublishStorageDeals, PublishStorageDealsParams),
+            ]
+        );
+    }};
+}
+
+macro_rules! register_market_versions_13_to_16 {
+    ($registry:expr, $code_cid:expr, $state_version:path) => {{
+        use $state_version::{Method, PublishStorageDealsParams, WithdrawBalanceParams};
+
+        register_actor_methods!(
+            $registry,
+            $code_cid,
+            [
+                (Method::Constructor, empty),
+                // (Method::AddBalance, AddBalanceParams),
+                // (Method::WithdrawBalance, WithdrawBalanceParams),
+                // (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
         );
     }};
@@ -41,15 +76,15 @@ macro_rules! register_market_versions_11_to_16 {
 
 pub(crate) fn register_actor_methods(registry: &mut MethodRegistry, cid: Cid, version: u64) {
     match version {
-        8 => register_market_versions_8_to_10!(registry, cid, fil_actor_init_state::v8),
-        9 => register_market_versions_8_to_10!(registry, cid, fil_actor_init_state::v9),
-        10 => register_market_versions_8_to_10!(registry, cid, fil_actor_init_state::v10),
-        11 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v11),
-        12 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v12),
-        13 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v13),
-        14 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v14),
-        15 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v15),
-        16 => register_market_versions_11_to_16!(registry, cid, fil_actor_init_state::v16),
+        8 => register_market_versions_8_to_9!(registry, cid, fil_actor_market_state::v8),
+        9 => register_market_versions_8_to_9!(registry, cid, fil_actor_market_state::v9),
+        10 => register_market_versions_10_to_11!(registry, cid, fil_actor_market_state::v10),
+        11 => register_market_versions_10_to_11!(registry, cid, fil_actor_market_state::v11),
+        12 => register_market_versions_12!(registry, cid, fil_actor_market_state::v12),
+        13 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v13),
+        14 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v14),
+        15 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v15),
+        16 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v16),
         _ => {}
     }
 }

From 755f1661e1726706cde33a8e8ce093098cb85045 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 13 Aug 2025 18:46:13 +0200
Subject: [PATCH 03/71] Add methods without parameters

---
 src/rpc/registry/actors/market.rs | 52 +++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 561e27819d70..d403e5f30af9 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -8,35 +8,55 @@ use cid::Cid;
 
 macro_rules! register_market_versions_8_to_9 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{self, Method};
+        use $state_version::{Method};
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
-                (Method::Constructor, empty),
                 // (Method::AddBalance, AddBalanceParams),
                 // (Method::WithdrawBalance, WithdrawBalanceParams),
                 // (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
         );
+
+        // Register methods without parameters
+        register_actor_methods!(
+            $registry,
+            $code_cid,
+            [
+                (Method::Constructor, empty),
+                (Method::AddBalance, empty),
+                (Method::CronTick, empty),
+            ]
+        );
     }};
 }
 
 macro_rules! register_market_versions_10_to_11 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{self, Method, PublishStorageDealsParams, WithdrawBalanceParams};
+        use $state_version::{Method, PublishStorageDealsParams, WithdrawBalanceParams};
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
-                (Method::Constructor, empty),
                 // (Method::AddBalance, AddBalanceParams),
                 // (Method::WithdrawBalance, WithdrawBalanceParams),
                 // (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
         );
+
+        // Register methods without parameters
+        register_actor_methods!(
+            $registry,
+            $code_cid,
+            [
+                (Method::Constructor, empty),
+                (Method::AddBalance, empty),
+                (Method::CronTick, empty),
+            ]
+        );
     }};
 }
 
@@ -48,12 +68,22 @@ macro_rules! register_market_versions_12 {
             $registry,
             $code_cid,
             [
-                (Method::Constructor, empty),
                 // (Method::AddBalance, AddBalanceParams),
                 // (Method::WithdrawBalance, WithdrawBalanceParams),
                 // (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
         );
+
+        // Register methods without parameters
+        register_actor_methods!(
+            $registry,
+            $code_cid,
+            [
+                (Method::Constructor, empty),
+                (Method::AddBalance, empty),
+                (Method::CronTick, empty),
+            ]
+        );
     }};
 }
 
@@ -65,12 +95,22 @@ macro_rules! register_market_versions_13_to_16 {
             $registry,
             $code_cid,
             [
-                (Method::Constructor, empty),
                 // (Method::AddBalance, AddBalanceParams),
                 // (Method::WithdrawBalance, WithdrawBalanceParams),
                 // (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
         );
+
+        // Register methods without parameters
+        register_actor_methods!(
+            $registry,
+            $code_cid,
+            [
+                (Method::Constructor, empty),
+                (Method::AddBalance, empty),
+                (Method::CronTick, empty),
+            ]
+        );
     }};
 }
 

From 76d62192bbb3703a4c98949ed8c81ab7ddaade95 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 13 Aug 2025 19:02:13 +0200
Subject: [PATCH 04/71] Add AddBalance method

---
 .../actor_states/methods/market_actor.rs      | 40 +++++++++++++++++++
 src/rpc/registry/actors/market.rs             | 25 +++++-------
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor.rs b/src/lotus_json/actor_states/methods/market_actor.rs
index 96f54a29c77e..73fd6b910946 100644
--- a/src/lotus_json/actor_states/methods/market_actor.rs
+++ b/src/lotus_json/actor_states/methods/market_actor.rs
@@ -23,6 +23,14 @@ pub struct WithdrawBalanceParamsLotusJson {
     pub amount: TokenAmount,
 }
 
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct AddBalanceParamsLotusJson {
+    #[schemars(with = "LotusJson<Address>")]
+    #[serde(with = "crate::lotus_json")]
+    pub provider_or_client: Address,
+}
+
 macro_rules! impl_lotus_json_for_withdraw_balance_params {
     ($($version:literal),+) => {
         $(
@@ -56,3 +64,35 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
 }
 
 impl_lotus_json_for_withdraw_balance_params!(9, 10, 11, 12, 13, 14, 15, 16);
+
+macro_rules! impl_lotus_json_for_add_balance_params {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::AddBalanceParams {
+                    type LotusJson = AddBalanceParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            provider_or_client: self.provider_or_client.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            provider_or_client: json.provider_or_client.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_add_balance_params!(11, 12, 13, 14, 15, 16);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index d403e5f30af9..547223efe230 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -26,7 +26,6 @@ macro_rules! register_market_versions_8_to_9 {
             $code_cid,
             [
                 (Method::Constructor, empty),
-                (Method::AddBalance, empty),
                 (Method::CronTick, empty),
             ]
         );
@@ -51,24 +50,22 @@ macro_rules! register_market_versions_10_to_11 {
         register_actor_methods!(
             $registry,
             $code_cid,
-            [
-                (Method::Constructor, empty),
-                (Method::AddBalance, empty),
-                (Method::CronTick, empty),
-            ]
+            [(Method::Constructor, empty), (Method::CronTick, empty),]
         );
     }};
 }
 
 macro_rules! register_market_versions_12 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{Method, PublishStorageDealsParams, WithdrawBalanceParams};
+        use $state_version::{
+            AddBalanceParams, Method, PublishStorageDealsParams, WithdrawBalanceParams,
+        };
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
-                // (Method::AddBalance, AddBalanceParams),
+                (Method::AddBalance, AddBalanceParams),
                 // (Method::WithdrawBalance, WithdrawBalanceParams),
                 // (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
@@ -78,24 +75,22 @@ macro_rules! register_market_versions_12 {
         register_actor_methods!(
             $registry,
             $code_cid,
-            [
-                (Method::Constructor, empty),
-                (Method::AddBalance, empty),
-                (Method::CronTick, empty),
-            ]
+            [(Method::Constructor, empty), (Method::CronTick, empty),]
         );
     }};
 }
 
 macro_rules! register_market_versions_13_to_16 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{Method, PublishStorageDealsParams, WithdrawBalanceParams};
+        use $state_version::{
+            AddBalanceParams, Method, PublishStorageDealsParams, WithdrawBalanceParams,
+        };
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
-                // (Method::AddBalance, AddBalanceParams),
+                (Method::AddBalance, AddBalanceParams),
                 // (Method::WithdrawBalance, WithdrawBalanceParams),
                 // (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]

From 82b9d907a8494aaa34ae78d28668590368e02cfb Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 14 Aug 2025 11:55:06 +0200
Subject: [PATCH 05/71] Rename module

---
 .../methods/{market_actor.rs => market_actor_params.rs}         | 0
 src/lotus_json/actor_states/methods/mod.rs                      | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/lotus_json/actor_states/methods/{market_actor.rs => market_actor_params.rs} (100%)

diff --git a/src/lotus_json/actor_states/methods/market_actor.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
similarity index 100%
rename from src/lotus_json/actor_states/methods/market_actor.rs
rename to src/lotus_json/actor_states/methods/market_actor_params.rs
diff --git a/src/lotus_json/actor_states/methods/mod.rs b/src/lotus_json/actor_states/methods/mod.rs
index ca93081078c0..56a0ad41d146 100644
--- a/src/lotus_json/actor_states/methods/mod.rs
+++ b/src/lotus_json/actor_states/methods/mod.rs
@@ -7,7 +7,7 @@ mod evm_constructor_params;
 mod init_constructor_params;
 mod init_exec4_params;
 mod init_exec_params;
-mod market_actor;
+mod market_actor_params;
 mod miner_change_worker_params;
 mod miner_constructor_params;
 mod multisig_actor;

From 0761e68771822d7b5670a7b9c25ef713bd73cde8 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 14 Aug 2025 12:37:18 +0200
Subject: [PATCH 06/71] Remove method

---
 src/rpc/registry/actors/market.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 547223efe230..b15c8acd16ad 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -100,11 +100,7 @@ macro_rules! register_market_versions_13_to_16 {
         register_actor_methods!(
             $registry,
             $code_cid,
-            [
-                (Method::Constructor, empty),
-                (Method::AddBalance, empty),
-                (Method::CronTick, empty),
-            ]
+            [(Method::Constructor, empty), (Method::CronTick, empty),]
         );
     }};
 }

From b754541728dc91ae9bda69e2564106ee685b019f Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 14 Aug 2025 13:29:01 +0200
Subject: [PATCH 07/71] Ad WithdrawBalance method

---
 src/rpc/registry/actors/market.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index b15c8acd16ad..dc41c0ec23fb 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -91,8 +91,7 @@ macro_rules! register_market_versions_13_to_16 {
             $code_cid,
             [
                 (Method::AddBalance, AddBalanceParams),
-                // (Method::WithdrawBalance, WithdrawBalanceParams),
-                // (Method::PublishStorageDeals, PublishStorageDealsParams),
+                (Method::WithdrawBalance, WithdrawBalanceParams),
             ]
         );
 

From 1bea3e5e95ac9d74133a9ab4b02c2947e2ebf7f6 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 14 Aug 2025 15:23:49 +0200
Subject: [PATCH 08/71] Add PaddedPieceSize

---
 .../methods/market_actor_params.rs            | 99 ++++++++++++++++---
 src/lotus_json/mod.rs                         |  1 +
 src/lotus_json/padded_piece_size.rs           | 26 +++++
 3 files changed, 115 insertions(+), 11 deletions(-)
 create mode 100644 src/lotus_json/padded_piece_size.rs

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 73fd6b910946..976e8480b035 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -3,9 +3,14 @@
 
 use super::*;
 use crate::shim::address::Address;
+use crate::shim::clock::ChainEpoch;
 use crate::shim::econ::TokenAmount;
+use crate::shim::piece::PaddedPieceSize;
+
 use ::cid::Cid;
-use fvm_ipld_encoding::RawBytes;
+// use fil_actor_market_state::v16::ClientDealProposal;
+// use fil_actor_market_state::v16::Label;
+// use fvm_ipld_encoding::RawBytes;
 use jsonrpsee::core::Serialize;
 use paste::paste;
 use schemars::JsonSchema;
@@ -31,12 +36,51 @@ pub struct AddBalanceParamsLotusJson {
     pub provider_or_client: Address,
 }
 
-macro_rules! impl_lotus_json_for_withdraw_balance_params {
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct DealProposalLotusJson {
+    #[schemars(with = "LotusJson<Cid>")]
+    #[serde(with = "crate::lotus_json")]
+    #[serde(rename = "CodeCID")]
+    pub piece_cid: Cid,
+    #[schemars(with = "LotusJson<PaddedPieceSize>")]
+    #[serde(with = "crate::lotus_json")]
+    pub piece_size: PaddedPieceSize,
+    pub verified_deal: bool,
+    #[schemars(with = "LotusJson<Address>")]
+    #[serde(with = "crate::lotus_json")]
+    pub client: Address,
+    #[schemars(with = "LotusJson<Address>")]
+    #[serde(with = "crate::lotus_json")]
+    pub provider: Address,
+    // pub label: Label,
+    pub start_epoch: ChainEpoch,
+    pub end_epoch: ChainEpoch,
+    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[serde(with = "crate::lotus_json")]
+    pub storage_price_per_epoch: TokenAmount,
+    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[serde(with = "crate::lotus_json")]
+    pub provider_collateral: TokenAmount,
+    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[serde(with = "crate::lotus_json")]
+    pub client_collateral: TokenAmount,
+}
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct PublishStorageDealsParamsLotusJson {
+    // #[schemars(with = "LotusJson<ClientDealProposal>")]
+    // #[serde(with = "crate::lotus_json")]
+    // pub deals: Vec<ClientDealProposal>,
+}
+
+macro_rules! impl_lotus_json_for_add_balance_params {
     ($($version:literal),+) => {
         $(
             paste! {
-                impl HasLotusJson for fil_actor_market_state::[<v $version>]::WithdrawBalanceParams {
-                    type LotusJson = WithdrawBalanceParamsLotusJson;
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::AddBalanceParams {
+                    type LotusJson = AddBalanceParamsLotusJson;
 
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
@@ -47,14 +91,12 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
                             provider_or_client: self.provider_or_client.into(),
-                            amount: self.amount.into(),
                         }
                     }
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
                             provider_or_client: json.provider_or_client.into(),
-                            amount: json.amount.into(),
                         }
                     }
                 }
@@ -63,14 +105,14 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
     };
 }
 
-impl_lotus_json_for_withdraw_balance_params!(9, 10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_add_balance_params!(11, 12, 13, 14, 15, 16);
 
-macro_rules! impl_lotus_json_for_add_balance_params {
+macro_rules! impl_lotus_json_for_withdraw_balance_params {
     ($($version:literal),+) => {
         $(
             paste! {
-                impl HasLotusJson for fil_actor_market_state::[<v $version>]::AddBalanceParams {
-                    type LotusJson = AddBalanceParamsLotusJson;
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::WithdrawBalanceParams {
+                    type LotusJson = WithdrawBalanceParamsLotusJson;
 
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
@@ -81,12 +123,14 @@ macro_rules! impl_lotus_json_for_add_balance_params {
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
                             provider_or_client: self.provider_or_client.into(),
+                            amount: self.amount.into(),
                         }
                     }
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
                             provider_or_client: json.provider_or_client.into(),
+                            amount: json.amount.into(),
                         }
                     }
                 }
@@ -95,4 +139,37 @@ macro_rules! impl_lotus_json_for_add_balance_params {
     };
 }
 
-impl_lotus_json_for_add_balance_params!(11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_withdraw_balance_params!(9, 10, 11, 12, 13, 14, 15, 16);
+
+//PublishStorageDealsParams
+// macro_rules! impl_lotus_json_for_publish_storage_deals_params {
+//     ($($version:literal),+) => {
+//         $(
+//             paste! {
+//                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::PublishStorageDealsParams {
+//                     type LotusJson = PublishStorageDealsParamsLotusJson;
+
+//                     #[cfg(test)]
+//                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
+//                         vec![
+//                         ]
+//                     }
+
+//                     fn into_lotus_json(self) -> Self::LotusJson {
+//                         Self::LotusJson {
+//                             deals: self.deals.into(),
+//                         }
+//                     }
+
+//                     fn from_lotus_json(json: Self::LotusJson) -> Self {
+//                         Self {
+//                             deals: json.deals.into(),
+//                         }
+//                     }
+//                 }
+//             }
+//         )+
+//     };
+// }
+
+// impl_lotus_json_for_publish_storage_deals_params!(9, 10, 11, 12, 13, 14, 15, 16);
diff --git a/src/lotus_json/mod.rs b/src/lotus_json/mod.rs
index 6d2d35c56ec2..1bd098428004 100644
--- a/src/lotus_json/mod.rs
+++ b/src/lotus_json/mod.rs
@@ -231,6 +231,7 @@ mod miner_info; // fil_actor_miner_state::v12::MinerInfo: !quickcheck::Arbitrary
 mod miner_power; // actors::miner::MinerInfo: !quickcheck::Arbitrary
 mod nonempty; // can't make snapshots of generic type
 mod opt; // can't make snapshots of generic type
+mod padded_piece_size;
 mod pending_beneficiary_change; // fil_actor_miner_state::v12::PendingBeneficiaryChange: !quickcheck::Arbitrary
 mod power_claim; // actors::power::Claim: !quickcheck::Arbitrary
 mod raw_bytes; // fvm_ipld_encoding::RawBytes: !quickcheck::Arbitrary
diff --git a/src/lotus_json/padded_piece_size.rs b/src/lotus_json/padded_piece_size.rs
new file mode 100644
index 000000000000..45431d76bc67
--- /dev/null
+++ b/src/lotus_json/padded_piece_size.rs
@@ -0,0 +1,26 @@
+// Copyright 2019-2025 ChainSafe Systems
+// SPDX-License-Identifier: Apache-2.0, MIT
+
+use super::*;
+use crate::shim::piece::PaddedPieceSize;
+
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
+#[schemars(rename = "PaddedPieceSize")]
+pub struct PaddedPieceSizeLotusJson(#[schemars(with = "u64")] PaddedPieceSize);
+
+impl HasLotusJson for PaddedPieceSize {
+    type LotusJson = PaddedPieceSizeLotusJson;
+
+    #[cfg(test)]
+    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+        vec![]
+    }
+
+    fn into_lotus_json(self) -> Self::LotusJson {
+        PaddedPieceSizeLotusJson(self)
+    }
+
+    fn from_lotus_json(PaddedPieceSizeLotusJson(inner): Self::LotusJson) -> Self {
+        inner.into()
+    }
+}

From fb32a311b27c2718104938def958031346ea8bed Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 14 Aug 2025 18:05:41 +0200
Subject: [PATCH 09/71] Implement LabelLotusJson

---
 .../methods/market_actor_params.rs            |  6 ++--
 src/lotus_json/label.rs                       | 36 +++++++++++++++++++
 src/lotus_json/mod.rs                         |  1 +
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 src/lotus_json/label.rs

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 976e8480b035..dc8749650abc 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -9,7 +9,7 @@ use crate::shim::piece::PaddedPieceSize;
 
 use ::cid::Cid;
 // use fil_actor_market_state::v16::ClientDealProposal;
-// use fil_actor_market_state::v16::Label;
+use fil_actor_market_state::v16::Label;
 // use fvm_ipld_encoding::RawBytes;
 use jsonrpsee::core::Serialize;
 use paste::paste;
@@ -53,7 +53,9 @@ pub struct DealProposalLotusJson {
     #[schemars(with = "LotusJson<Address>")]
     #[serde(with = "crate::lotus_json")]
     pub provider: Address,
-    // pub label: Label,
+    #[schemars(with = "LotusJson<Address>")]
+    #[serde(with = "crate::lotus_json")]
+    pub label: Label,
     pub start_epoch: ChainEpoch,
     pub end_epoch: ChainEpoch,
     #[schemars(with = "LotusJson<TokenAmount>")]
diff --git a/src/lotus_json/label.rs b/src/lotus_json/label.rs
new file mode 100644
index 000000000000..652ec359186b
--- /dev/null
+++ b/src/lotus_json/label.rs
@@ -0,0 +1,36 @@
+// Copyright 2019-2025 ChainSafe Systems
+// SPDX-License-Identifier: Apache-2.0, MIT
+
+use super::*;
+use fil_actor_market_state::v16::Label;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
+#[serde(untagged)]
+pub enum LabelLotusJson {
+    String(String),
+    Bytes(Vec<u8>),
+}
+
+impl HasLotusJson for Label {
+    type LotusJson = LabelLotusJson;
+
+    #[cfg(test)]
+    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+        vec![]
+    }
+
+    fn into_lotus_json(self) -> Self::LotusJson {
+        match self {
+            Label::Bytes(bytes) => LabelLotusJson::Bytes(bytes),
+            Label::String(string) => LabelLotusJson::String(string),
+        }
+    }
+
+    fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
+        match lotus_json {
+            LabelLotusJson::Bytes(bytes) => Label::Bytes(bytes),
+            LabelLotusJson::String(string) => Label::String(string),
+        }
+    }
+}
diff --git a/src/lotus_json/mod.rs b/src/lotus_json/mod.rs
index 1bd098428004..1e19f75069ce 100644
--- a/src/lotus_json/mod.rs
+++ b/src/lotus_json/mod.rs
@@ -227,6 +227,7 @@ mod entry;
 mod filter_estimate;
 mod hash_map;
 mod ipld; // NaN != NaN
+mod label;
 mod miner_info; // fil_actor_miner_state::v12::MinerInfo: !quickcheck::Arbitrary
 mod miner_power; // actors::miner::MinerInfo: !quickcheck::Arbitrary
 mod nonempty; // can't make snapshots of generic type

From 5fa58c0486020c208b32188cd001bb8cc46740d4 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Mon, 18 Aug 2025 14:32:33 +0200
Subject: [PATCH 10/71] Implement PublishStorageDealsParamsLotusJson type (wip)

---
 .../methods/market_actor_params.rs            | 106 ++++++----------
 src/lotus_json/client_deal_proposal.rs        |  57 +++++++++
 src/lotus_json/deal_proposal.rs               | 114 ++++++++++++++++++
 src/lotus_json/mod.rs                         |   2 +
 4 files changed, 209 insertions(+), 70 deletions(-)
 create mode 100644 src/lotus_json/client_deal_proposal.rs
 create mode 100644 src/lotus_json/deal_proposal.rs

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index dc8749650abc..057c9a5fa262 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -6,10 +6,9 @@ use crate::shim::address::Address;
 use crate::shim::clock::ChainEpoch;
 use crate::shim::econ::TokenAmount;
 use crate::shim::piece::PaddedPieceSize;
+use fil_actor_market_state::v16::ClientDealProposal;
 
 use ::cid::Cid;
-// use fil_actor_market_state::v16::ClientDealProposal;
-use fil_actor_market_state::v16::Label;
 // use fvm_ipld_encoding::RawBytes;
 use jsonrpsee::core::Serialize;
 use paste::paste;
@@ -36,45 +35,12 @@ pub struct AddBalanceParamsLotusJson {
     pub provider_or_client: Address,
 }
 
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-#[serde(rename_all = "PascalCase")]
-pub struct DealProposalLotusJson {
-    #[schemars(with = "LotusJson<Cid>")]
-    #[serde(with = "crate::lotus_json")]
-    #[serde(rename = "CodeCID")]
-    pub piece_cid: Cid,
-    #[schemars(with = "LotusJson<PaddedPieceSize>")]
-    #[serde(with = "crate::lotus_json")]
-    pub piece_size: PaddedPieceSize,
-    pub verified_deal: bool,
-    #[schemars(with = "LotusJson<Address>")]
-    #[serde(with = "crate::lotus_json")]
-    pub client: Address,
-    #[schemars(with = "LotusJson<Address>")]
-    #[serde(with = "crate::lotus_json")]
-    pub provider: Address,
-    #[schemars(with = "LotusJson<Address>")]
-    #[serde(with = "crate::lotus_json")]
-    pub label: Label,
-    pub start_epoch: ChainEpoch,
-    pub end_epoch: ChainEpoch,
-    #[schemars(with = "LotusJson<TokenAmount>")]
-    #[serde(with = "crate::lotus_json")]
-    pub storage_price_per_epoch: TokenAmount,
-    #[schemars(with = "LotusJson<TokenAmount>")]
-    #[serde(with = "crate::lotus_json")]
-    pub provider_collateral: TokenAmount,
-    #[schemars(with = "LotusJson<TokenAmount>")]
-    #[serde(with = "crate::lotus_json")]
-    pub client_collateral: TokenAmount,
-}
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct PublishStorageDealsParamsLotusJson {
-    // #[schemars(with = "LotusJson<ClientDealProposal>")]
-    // #[serde(with = "crate::lotus_json")]
-    // pub deals: Vec<ClientDealProposal>,
+    #[schemars(with = "LotusJson<ClientDealProposal>")]
+    #[serde(with = "crate::lotus_json")]
+    pub deals: Vec<ClientDealProposal>,
 }
 
 macro_rules! impl_lotus_json_for_add_balance_params {
@@ -143,35 +109,35 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
 
 impl_lotus_json_for_withdraw_balance_params!(9, 10, 11, 12, 13, 14, 15, 16);
 
-//PublishStorageDealsParams
-// macro_rules! impl_lotus_json_for_publish_storage_deals_params {
-//     ($($version:literal),+) => {
-//         $(
-//             paste! {
-//                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::PublishStorageDealsParams {
-//                     type LotusJson = PublishStorageDealsParamsLotusJson;
-
-//                     #[cfg(test)]
-//                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
-//                         vec![
-//                         ]
-//                     }
-
-//                     fn into_lotus_json(self) -> Self::LotusJson {
-//                         Self::LotusJson {
-//                             deals: self.deals.into(),
-//                         }
-//                     }
-
-//                     fn from_lotus_json(json: Self::LotusJson) -> Self {
-//                         Self {
-//                             deals: json.deals.into(),
-//                         }
-//                     }
-//                 }
-//             }
-//         )+
-//     };
-// }
-
-// impl_lotus_json_for_publish_storage_deals_params!(9, 10, 11, 12, 13, 14, 15, 16);
+macro_rules! impl_lotus_json_for_publish_storage_deals_params {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::PublishStorageDealsParams {
+                    type LotusJson = PublishStorageDealsParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            deals: self.deals.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            deals: json.deals.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+//impl_lotus_json_for_publish_storage_deals_params!(9, 10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_publish_storage_deals_params!(16);
diff --git a/src/lotus_json/client_deal_proposal.rs b/src/lotus_json/client_deal_proposal.rs
new file mode 100644
index 000000000000..b4d7859e4aaf
--- /dev/null
+++ b/src/lotus_json/client_deal_proposal.rs
@@ -0,0 +1,57 @@
+// Copyright 2019-2025 ChainSafe Systems
+// SPDX-License-Identifier: Apache-2.0, MIT
+
+use super::*;
+use crate::shim::address::Address;
+use crate::shim::clock::ChainEpoch;
+use crate::shim::crypto::Signature;
+use crate::shim::econ::TokenAmount;
+use crate::shim::piece::PaddedPieceSize;
+
+use ::cid::Cid;
+use fil_actor_market_state::v16::{ClientDealProposal, DealProposal};
+use schemars::JsonSchema;
+use serde::Deserialize;
+use std::fmt::Debug;
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct ClientDealProposalLotusJson {
+    #[schemars(with = "LotusJson<DealProposal>")]
+    #[serde(with = "crate::lotus_json")]
+    pub proposal: DealProposal,
+    #[schemars(with = "LotusJson<Signature>")]
+    #[serde(with = "crate::lotus_json")]
+    pub client_signature: Signature,
+}
+
+impl HasLotusJson for ClientDealProposal {
+    type LotusJson = ClientDealProposalLotusJson;
+
+    #[cfg(test)]
+    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+        vec![]
+    }
+
+    fn into_lotus_json(self) -> Self::LotusJson {
+        let Self {
+            proposal,
+            client_signature,
+        } = self;
+        Self::LotusJson {
+            proposal,
+            client_signature: todo!(), //client_signature.into(),
+        }
+    }
+
+    fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
+        let Self::LotusJson {
+            proposal,
+            client_signature,
+        } = lotus_json;
+        Self {
+            proposal,
+            client_signature: todo!(), //client_signature.into(),
+        }
+    }
+}
diff --git a/src/lotus_json/deal_proposal.rs b/src/lotus_json/deal_proposal.rs
new file mode 100644
index 000000000000..15de6dfd12ab
--- /dev/null
+++ b/src/lotus_json/deal_proposal.rs
@@ -0,0 +1,114 @@
+// Copyright 2019-2025 ChainSafe Systems
+// SPDX-License-Identifier: Apache-2.0, MIT
+
+use super::*;
+use crate::shim::address::Address;
+use crate::shim::clock::ChainEpoch;
+use crate::shim::econ::TokenAmount;
+use crate::shim::piece::PaddedPieceSize;
+
+use ::cid::Cid;
+use fil_actor_market_state::v16::{DealProposal, Label};
+use schemars::JsonSchema;
+use serde::Deserialize;
+use std::fmt::Debug;
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct DealProposalLotusJson {
+    #[schemars(with = "LotusJson<Cid>")]
+    #[serde(with = "crate::lotus_json")]
+    #[serde(rename = "CodeCID")]
+    pub piece_cid: Cid,
+    #[schemars(with = "LotusJson<PaddedPieceSize>")]
+    #[serde(with = "crate::lotus_json")]
+    pub piece_size: PaddedPieceSize,
+    pub verified_deal: bool,
+    #[schemars(with = "LotusJson<Address>")]
+    #[serde(with = "crate::lotus_json")]
+    pub client: Address,
+    #[schemars(with = "LotusJson<Address>")]
+    #[serde(with = "crate::lotus_json")]
+    pub provider: Address,
+    #[schemars(with = "LotusJson<Address>")]
+    #[serde(with = "crate::lotus_json")]
+    pub label: Label,
+    pub start_epoch: ChainEpoch,
+    pub end_epoch: ChainEpoch,
+    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[serde(with = "crate::lotus_json")]
+    pub storage_price_per_epoch: TokenAmount,
+    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[serde(with = "crate::lotus_json")]
+    pub provider_collateral: TokenAmount,
+    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[serde(with = "crate::lotus_json")]
+    pub client_collateral: TokenAmount,
+}
+
+impl HasLotusJson for DealProposal {
+    type LotusJson = DealProposalLotusJson;
+
+    #[cfg(test)]
+    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+        vec![]
+    }
+
+    fn into_lotus_json(self) -> Self::LotusJson {
+        let Self {
+            piece_cid,
+            piece_size,
+            verified_deal,
+            client,
+            provider,
+            label,
+            start_epoch,
+            end_epoch,
+            storage_price_per_epoch,
+            provider_collateral,
+            client_collateral,
+        } = self;
+        Self::LotusJson {
+            piece_cid: piece_cid.into(),
+            piece_size: piece_size.into(),
+            verified_deal: verified_deal.into(),
+            client: client.into(),
+            provider: provider.into(),
+            label: label.into(),
+            start_epoch: start_epoch.into(),
+            end_epoch: end_epoch.into(),
+            storage_price_per_epoch: storage_price_per_epoch.into(),
+            provider_collateral: provider_collateral.into(),
+            client_collateral: client_collateral.into(),
+        }
+    }
+
+    fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
+        let Self::LotusJson {
+            piece_cid,
+            piece_size,
+            verified_deal,
+            client,
+            provider,
+            label,
+            start_epoch,
+            end_epoch,
+            storage_price_per_epoch,
+            provider_collateral,
+            client_collateral,
+        } = lotus_json;
+        Self {
+            piece_cid,
+            piece_size: piece_size.into(),
+            verified_deal,
+            client: client.into(),
+            provider: provider.into(),
+            label,
+            start_epoch,
+            end_epoch,
+            storage_price_per_epoch: storage_price_per_epoch.into(),
+            provider_collateral: provider_collateral.into(),
+            client_collateral: client_collateral.into(),
+        }
+    }
+}
diff --git a/src/lotus_json/mod.rs b/src/lotus_json/mod.rs
index 1e19f75069ce..9e57033cfea5 100644
--- a/src/lotus_json/mod.rs
+++ b/src/lotus_json/mod.rs
@@ -223,6 +223,8 @@ mod allocation;
 mod beneficiary_term; // fil_actor_miner_state::v12::BeneficiaryTerm: !quickcheck::Arbitrary
 mod bit_field; //  fil_actors_shared::fvm_ipld_bitfield::BitField: !quickcheck::Arbitrary
 mod bytecode_hash;
+mod client_deal_proposal;
+mod deal_proposal;
 mod entry;
 mod filter_estimate;
 mod hash_map;

From 0d948ec5cefa41ca3097c9a92f0756ff87095a9b Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Mon, 18 Aug 2025 16:41:46 +0200
Subject: [PATCH 11/71] Refactor

---
 .../methods/market_actor_params.rs            | 224 +++++++++++++++++-
 src/lotus_json/client_deal_proposal.rs        | 100 ++++----
 src/lotus_json/deal_proposal.rs               | 214 ++++++++---------
 src/lotus_json/label.rs                       |  60 ++---
 4 files changed, 399 insertions(+), 199 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 057c9a5fa262..efeb9b78d896 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -5,8 +5,9 @@ use super::*;
 use crate::shim::address::Address;
 use crate::shim::clock::ChainEpoch;
 use crate::shim::econ::TokenAmount;
+use crate::shim::fvm_shared_latest::crypto::signature::Signature;
 use crate::shim::piece::PaddedPieceSize;
-use fil_actor_market_state::v16::ClientDealProposal;
+use fil_actor_market_state::v16::{ClientDealProposal, DealProposal, Label};
 
 use ::cid::Cid;
 // use fvm_ipld_encoding::RawBytes;
@@ -35,14 +36,6 @@ pub struct AddBalanceParamsLotusJson {
     pub provider_or_client: Address,
 }
 
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-#[serde(rename_all = "PascalCase")]
-pub struct PublishStorageDealsParamsLotusJson {
-    #[schemars(with = "LotusJson<ClientDealProposal>")]
-    #[serde(with = "crate::lotus_json")]
-    pub deals: Vec<ClientDealProposal>,
-}
-
 macro_rules! impl_lotus_json_for_add_balance_params {
     ($($version:literal),+) => {
         $(
@@ -109,6 +102,213 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
 
 impl_lotus_json_for_withdraw_balance_params!(9, 10, 11, 12, 13, 14, 15, 16);
 
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
+#[serde(untagged)]
+pub enum LabelLotusJson {
+    String(String),
+    Bytes(Vec<u8>),
+}
+
+macro_rules! impl_lotus_json_for_label {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::Label {
+                    type LotusJson = LabelLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        match self {
+                            Self::Bytes(bytes) => LabelLotusJson::Bytes(bytes),
+                            Self::String(string) => LabelLotusJson::String(string),
+                        }
+                    }
+
+                    fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
+                        match lotus_json {
+                            LabelLotusJson::Bytes(bytes) => Self::Bytes(bytes),
+                            LabelLotusJson::String(string) => Self::String(string),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_label!(15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct DealProposalLotusJson {
+    #[schemars(with = "LotusJson<Cid>")]
+    #[serde(with = "crate::lotus_json")]
+    #[serde(rename = "CodeCID")]
+    pub piece_cid: Cid,
+    #[schemars(with = "LotusJson<PaddedPieceSize>")]
+    #[serde(with = "crate::lotus_json")]
+    pub piece_size: PaddedPieceSize,
+    pub verified_deal: bool,
+    #[schemars(with = "LotusJson<Address>")]
+    #[serde(with = "crate::lotus_json")]
+    pub client: Address,
+    #[schemars(with = "LotusJson<Address>")]
+    #[serde(with = "crate::lotus_json")]
+    pub provider: Address,
+    // #[schemars(with = "LotusJson<Label>")]
+    // #[serde(with = "crate::lotus_json")]
+    // pub label: Label,
+    pub start_epoch: ChainEpoch,
+    pub end_epoch: ChainEpoch,
+    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[serde(with = "crate::lotus_json")]
+    pub storage_price_per_epoch: TokenAmount,
+    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[serde(with = "crate::lotus_json")]
+    pub provider_collateral: TokenAmount,
+    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[serde(with = "crate::lotus_json")]
+    pub client_collateral: TokenAmount,
+}
+
+macro_rules! impl_lotus_json_for_deal_proposal {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::DealProposal {
+                    type LotusJson = DealProposalLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        let Self {
+                            piece_cid,
+                            piece_size,
+                            verified_deal,
+                            client,
+                            provider,
+                            label,
+                            start_epoch,
+                            end_epoch,
+                            storage_price_per_epoch,
+                            provider_collateral,
+                            client_collateral,
+                        } = self;
+                        Self::LotusJson {
+                            piece_cid: piece_cid.into(),
+                            piece_size: piece_size.into(),
+                            verified_deal: verified_deal.into(),
+                            client: client.into(),
+                            provider: provider.into(),
+                            // label: label.into(),
+                            start_epoch: start_epoch.into(),
+                            end_epoch: end_epoch.into(),
+                            storage_price_per_epoch: storage_price_per_epoch.into(),
+                            provider_collateral: provider_collateral.into(),
+                            client_collateral: client_collateral.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
+                        let Self::LotusJson {
+                            piece_cid,
+                            piece_size,
+                            verified_deal,
+                            client,
+                            provider,
+                            // label,
+                            start_epoch,
+                            end_epoch,
+                            storage_price_per_epoch,
+                            provider_collateral,
+                            client_collateral,
+                        } = lotus_json;
+                        Self {
+                            piece_cid,
+                            piece_size: piece_size.into(),
+                            verified_deal,
+                            client: client.into(),
+                            provider: provider.into(),
+                            label: todo!(),
+                            start_epoch,
+                            end_epoch,
+                            storage_price_per_epoch: storage_price_per_epoch.into(),
+                            provider_collateral: provider_collateral.into(),
+                            client_collateral: client_collateral.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_deal_proposal!(15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct ClientDealProposalLotusJson {
+    #[schemars(with = "LotusJson<DealProposal>")]
+    #[serde(with = "crate::lotus_json")]
+    pub proposal: DealProposal,
+    // #[schemars(with = "LotusJson<Signature>")]
+    // #[serde(with = "crate::lotus_json")]
+    // pub client_signature: Signature,
+}
+
+macro_rules! impl_lotus_json_for_client_deal_proposal {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::ClientDealProposal {
+                    type LotusJson = ClientDealProposalLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            proposal: todo!(), //self.proposal.into(),
+                            // TODO
+                            // client_signature: self.client_signature.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            proposal: todo!(), //json.proposal.into(),
+                            // TODO
+                            client_signature: Signature::new_bls(vec![]),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_client_deal_proposal!(15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct PublishStorageDealsParamsLotusJson {
+    #[schemars(with = "LotusJson<ClientDealProposal>")]
+    #[serde(with = "crate::lotus_json")]
+    pub deals: Vec<ClientDealProposal>,
+}
+
 macro_rules! impl_lotus_json_for_publish_storage_deals_params {
     ($($version:literal),+) => {
         $(
@@ -124,13 +324,13 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
 
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
-                            deals: self.deals.into(),
+                            deals: self.deals.into_iter().map(|deal| deal.into()).collect(),
                         }
                     }
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
-                            deals: json.deals.into(),
+                            deals: json.deals.into_iter().map(|deal| deal.into()).collect(),
                         }
                     }
                 }
@@ -140,4 +340,4 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
 }
 
 //impl_lotus_json_for_publish_storage_deals_params!(9, 10, 11, 12, 13, 14, 15, 16);
-impl_lotus_json_for_publish_storage_deals_params!(16);
+impl_lotus_json_for_publish_storage_deals_params!(15, 16);
diff --git a/src/lotus_json/client_deal_proposal.rs b/src/lotus_json/client_deal_proposal.rs
index b4d7859e4aaf..70786e91ef4b 100644
--- a/src/lotus_json/client_deal_proposal.rs
+++ b/src/lotus_json/client_deal_proposal.rs
@@ -1,57 +1,57 @@
-// Copyright 2019-2025 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
+// // Copyright 2019-2025 ChainSafe Systems
+// // SPDX-License-Identifier: Apache-2.0, MIT
 
-use super::*;
-use crate::shim::address::Address;
-use crate::shim::clock::ChainEpoch;
-use crate::shim::crypto::Signature;
-use crate::shim::econ::TokenAmount;
-use crate::shim::piece::PaddedPieceSize;
+// use super::*;
+// use crate::shim::address::Address;
+// use crate::shim::clock::ChainEpoch;
+// use crate::shim::crypto::Signature;
+// use crate::shim::econ::TokenAmount;
+// use crate::shim::piece::PaddedPieceSize;
 
-use ::cid::Cid;
-use fil_actor_market_state::v16::{ClientDealProposal, DealProposal};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use std::fmt::Debug;
+// use ::cid::Cid;
+// use fil_actor_market_state::v16::{ClientDealProposal, DealProposal};
+// use schemars::JsonSchema;
+// use serde::Deserialize;
+// use std::fmt::Debug;
 
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-#[serde(rename_all = "PascalCase")]
-pub struct ClientDealProposalLotusJson {
-    #[schemars(with = "LotusJson<DealProposal>")]
-    #[serde(with = "crate::lotus_json")]
-    pub proposal: DealProposal,
-    #[schemars(with = "LotusJson<Signature>")]
-    #[serde(with = "crate::lotus_json")]
-    pub client_signature: Signature,
-}
+// #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+// #[serde(rename_all = "PascalCase")]
+// pub struct ClientDealProposalLotusJson {
+//     #[schemars(with = "LotusJson<DealProposal>")]
+//     #[serde(with = "crate::lotus_json")]
+//     pub proposal: DealProposal,
+//     #[schemars(with = "LotusJson<Signature>")]
+//     #[serde(with = "crate::lotus_json")]
+//     pub client_signature: Signature,
+// }
 
-impl HasLotusJson for ClientDealProposal {
-    type LotusJson = ClientDealProposalLotusJson;
+// impl HasLotusJson for ClientDealProposal {
+//     type LotusJson = ClientDealProposalLotusJson;
 
-    #[cfg(test)]
-    fn snapshots() -> Vec<(serde_json::Value, Self)> {
-        vec![]
-    }
+//     #[cfg(test)]
+//     fn snapshots() -> Vec<(serde_json::Value, Self)> {
+//         vec![]
+//     }
 
-    fn into_lotus_json(self) -> Self::LotusJson {
-        let Self {
-            proposal,
-            client_signature,
-        } = self;
-        Self::LotusJson {
-            proposal,
-            client_signature: todo!(), //client_signature.into(),
-        }
-    }
+//     fn into_lotus_json(self) -> Self::LotusJson {
+//         let Self {
+//             proposal,
+//             client_signature,
+//         } = self;
+//         Self::LotusJson {
+//             proposal,
+//             client_signature: todo!(), //client_signature.into(),
+//         }
+//     }
 
-    fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
-        let Self::LotusJson {
-            proposal,
-            client_signature,
-        } = lotus_json;
-        Self {
-            proposal,
-            client_signature: todo!(), //client_signature.into(),
-        }
-    }
-}
+//     fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
+//         let Self::LotusJson {
+//             proposal,
+//             client_signature,
+//         } = lotus_json;
+//         Self {
+//             proposal,
+//             client_signature: todo!(), //client_signature.into(),
+//         }
+//     }
+// }
diff --git a/src/lotus_json/deal_proposal.rs b/src/lotus_json/deal_proposal.rs
index 15de6dfd12ab..96db9ae4a77b 100644
--- a/src/lotus_json/deal_proposal.rs
+++ b/src/lotus_json/deal_proposal.rs
@@ -1,114 +1,114 @@
-// Copyright 2019-2025 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
+// // Copyright 2019-2025 ChainSafe Systems
+// // SPDX-License-Identifier: Apache-2.0, MIT
 
-use super::*;
-use crate::shim::address::Address;
-use crate::shim::clock::ChainEpoch;
-use crate::shim::econ::TokenAmount;
-use crate::shim::piece::PaddedPieceSize;
+// use super::*;
+// use crate::shim::address::Address;
+// use crate::shim::clock::ChainEpoch;
+// use crate::shim::econ::TokenAmount;
+// use crate::shim::piece::PaddedPieceSize;
 
-use ::cid::Cid;
-use fil_actor_market_state::v16::{DealProposal, Label};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use std::fmt::Debug;
+// use ::cid::Cid;
+// use fil_actor_market_state::v16::{DealProposal, Label};
+// use schemars::JsonSchema;
+// use serde::Deserialize;
+// use std::fmt::Debug;
 
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-#[serde(rename_all = "PascalCase")]
-pub struct DealProposalLotusJson {
-    #[schemars(with = "LotusJson<Cid>")]
-    #[serde(with = "crate::lotus_json")]
-    #[serde(rename = "CodeCID")]
-    pub piece_cid: Cid,
-    #[schemars(with = "LotusJson<PaddedPieceSize>")]
-    #[serde(with = "crate::lotus_json")]
-    pub piece_size: PaddedPieceSize,
-    pub verified_deal: bool,
-    #[schemars(with = "LotusJson<Address>")]
-    #[serde(with = "crate::lotus_json")]
-    pub client: Address,
-    #[schemars(with = "LotusJson<Address>")]
-    #[serde(with = "crate::lotus_json")]
-    pub provider: Address,
-    #[schemars(with = "LotusJson<Address>")]
-    #[serde(with = "crate::lotus_json")]
-    pub label: Label,
-    pub start_epoch: ChainEpoch,
-    pub end_epoch: ChainEpoch,
-    #[schemars(with = "LotusJson<TokenAmount>")]
-    #[serde(with = "crate::lotus_json")]
-    pub storage_price_per_epoch: TokenAmount,
-    #[schemars(with = "LotusJson<TokenAmount>")]
-    #[serde(with = "crate::lotus_json")]
-    pub provider_collateral: TokenAmount,
-    #[schemars(with = "LotusJson<TokenAmount>")]
-    #[serde(with = "crate::lotus_json")]
-    pub client_collateral: TokenAmount,
-}
+// #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+// #[serde(rename_all = "PascalCase")]
+// pub struct DealProposalLotusJson {
+//     #[schemars(with = "LotusJson<Cid>")]
+//     #[serde(with = "crate::lotus_json")]
+//     #[serde(rename = "CodeCID")]
+//     pub piece_cid: Cid,
+//     #[schemars(with = "LotusJson<PaddedPieceSize>")]
+//     #[serde(with = "crate::lotus_json")]
+//     pub piece_size: PaddedPieceSize,
+//     pub verified_deal: bool,
+//     #[schemars(with = "LotusJson<Address>")]
+//     #[serde(with = "crate::lotus_json")]
+//     pub client: Address,
+//     #[schemars(with = "LotusJson<Address>")]
+//     #[serde(with = "crate::lotus_json")]
+//     pub provider: Address,
+//     #[schemars(with = "LotusJson<Address>")]
+//     #[serde(with = "crate::lotus_json")]
+//     pub label: Label,
+//     pub start_epoch: ChainEpoch,
+//     pub end_epoch: ChainEpoch,
+//     #[schemars(with = "LotusJson<TokenAmount>")]
+//     #[serde(with = "crate::lotus_json")]
+//     pub storage_price_per_epoch: TokenAmount,
+//     #[schemars(with = "LotusJson<TokenAmount>")]
+//     #[serde(with = "crate::lotus_json")]
+//     pub provider_collateral: TokenAmount,
+//     #[schemars(with = "LotusJson<TokenAmount>")]
+//     #[serde(with = "crate::lotus_json")]
+//     pub client_collateral: TokenAmount,
+// }
 
-impl HasLotusJson for DealProposal {
-    type LotusJson = DealProposalLotusJson;
+// impl HasLotusJson for DealProposal {
+//     type LotusJson = DealProposalLotusJson;
 
-    #[cfg(test)]
-    fn snapshots() -> Vec<(serde_json::Value, Self)> {
-        vec![]
-    }
+//     #[cfg(test)]
+//     fn snapshots() -> Vec<(serde_json::Value, Self)> {
+//         vec![]
+//     }
 
-    fn into_lotus_json(self) -> Self::LotusJson {
-        let Self {
-            piece_cid,
-            piece_size,
-            verified_deal,
-            client,
-            provider,
-            label,
-            start_epoch,
-            end_epoch,
-            storage_price_per_epoch,
-            provider_collateral,
-            client_collateral,
-        } = self;
-        Self::LotusJson {
-            piece_cid: piece_cid.into(),
-            piece_size: piece_size.into(),
-            verified_deal: verified_deal.into(),
-            client: client.into(),
-            provider: provider.into(),
-            label: label.into(),
-            start_epoch: start_epoch.into(),
-            end_epoch: end_epoch.into(),
-            storage_price_per_epoch: storage_price_per_epoch.into(),
-            provider_collateral: provider_collateral.into(),
-            client_collateral: client_collateral.into(),
-        }
-    }
+//     fn into_lotus_json(self) -> Self::LotusJson {
+//         let Self {
+//             piece_cid,
+//             piece_size,
+//             verified_deal,
+//             client,
+//             provider,
+//             label,
+//             start_epoch,
+//             end_epoch,
+//             storage_price_per_epoch,
+//             provider_collateral,
+//             client_collateral,
+//         } = self;
+//         Self::LotusJson {
+//             piece_cid: piece_cid.into(),
+//             piece_size: piece_size.into(),
+//             verified_deal: verified_deal.into(),
+//             client: client.into(),
+//             provider: provider.into(),
+//             label: label.into(),
+//             start_epoch: start_epoch.into(),
+//             end_epoch: end_epoch.into(),
+//             storage_price_per_epoch: storage_price_per_epoch.into(),
+//             provider_collateral: provider_collateral.into(),
+//             client_collateral: client_collateral.into(),
+//         }
+//     }
 
-    fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
-        let Self::LotusJson {
-            piece_cid,
-            piece_size,
-            verified_deal,
-            client,
-            provider,
-            label,
-            start_epoch,
-            end_epoch,
-            storage_price_per_epoch,
-            provider_collateral,
-            client_collateral,
-        } = lotus_json;
-        Self {
-            piece_cid,
-            piece_size: piece_size.into(),
-            verified_deal,
-            client: client.into(),
-            provider: provider.into(),
-            label,
-            start_epoch,
-            end_epoch,
-            storage_price_per_epoch: storage_price_per_epoch.into(),
-            provider_collateral: provider_collateral.into(),
-            client_collateral: client_collateral.into(),
-        }
-    }
-}
+//     fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
+//         let Self::LotusJson {
+//             piece_cid,
+//             piece_size,
+//             verified_deal,
+//             client,
+//             provider,
+//             label,
+//             start_epoch,
+//             end_epoch,
+//             storage_price_per_epoch,
+//             provider_collateral,
+//             client_collateral,
+//         } = lotus_json;
+//         Self {
+//             piece_cid,
+//             piece_size: piece_size.into(),
+//             verified_deal,
+//             client: client.into(),
+//             provider: provider.into(),
+//             label,
+//             start_epoch,
+//             end_epoch,
+//             storage_price_per_epoch: storage_price_per_epoch.into(),
+//             provider_collateral: provider_collateral.into(),
+//             client_collateral: client_collateral.into(),
+//         }
+//     }
+// }
diff --git a/src/lotus_json/label.rs b/src/lotus_json/label.rs
index 652ec359186b..2cbb306f4039 100644
--- a/src/lotus_json/label.rs
+++ b/src/lotus_json/label.rs
@@ -1,36 +1,36 @@
-// Copyright 2019-2025 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
+// // Copyright 2019-2025 ChainSafe Systems
+// // SPDX-License-Identifier: Apache-2.0, MIT
 
-use super::*;
-use fil_actor_market_state::v16::Label;
-use serde::{Deserialize, Serialize};
+// use super::*;
+// use fil_actor_market_state::v16::Label;
+// use serde::{Deserialize, Serialize};
 
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
-#[serde(untagged)]
-pub enum LabelLotusJson {
-    String(String),
-    Bytes(Vec<u8>),
-}
+// #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
+// #[serde(untagged)]
+// pub enum LabelLotusJson {
+//     String(String),
+//     Bytes(Vec<u8>),
+// }
 
-impl HasLotusJson for Label {
-    type LotusJson = LabelLotusJson;
+// impl HasLotusJson for Label {
+//     type LotusJson = LabelLotusJson;
 
-    #[cfg(test)]
-    fn snapshots() -> Vec<(serde_json::Value, Self)> {
-        vec![]
-    }
+//     #[cfg(test)]
+//     fn snapshots() -> Vec<(serde_json::Value, Self)> {
+//         vec![]
+//     }
 
-    fn into_lotus_json(self) -> Self::LotusJson {
-        match self {
-            Label::Bytes(bytes) => LabelLotusJson::Bytes(bytes),
-            Label::String(string) => LabelLotusJson::String(string),
-        }
-    }
+//     fn into_lotus_json(self) -> Self::LotusJson {
+//         match self {
+//             Label::Bytes(bytes) => LabelLotusJson::Bytes(bytes),
+//             Label::String(string) => LabelLotusJson::String(string),
+//         }
+//     }
 
-    fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
-        match lotus_json {
-            LabelLotusJson::Bytes(bytes) => Label::Bytes(bytes),
-            LabelLotusJson::String(string) => Label::String(string),
-        }
-    }
-}
+//     fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
+//         match lotus_json {
+//             LabelLotusJson::Bytes(bytes) => Label::Bytes(bytes),
+//             LabelLotusJson::String(string) => Label::String(string),
+//         }
+//     }
+// }

From d3fb39c6cb09808b4d2b8d6011427ff7fe3a4a5c Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Mon, 18 Aug 2025 18:34:14 +0200
Subject: [PATCH 12/71] Use version delegates

---
 .../methods/market_actor_params.rs            | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index efeb9b78d896..00ee0aa1f011 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::*;
+use crate::lotus_json::signature::SignatureLotusJson;
 use crate::shim::address::Address;
 use crate::shim::clock::ChainEpoch;
 use crate::shim::econ::TokenAmount;
@@ -252,17 +253,13 @@ macro_rules! impl_lotus_json_for_deal_proposal {
     };
 }
 
-impl_lotus_json_for_deal_proposal!(15, 16);
+impl_lotus_json_for_deal_proposal!(13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct ClientDealProposalLotusJson {
-    #[schemars(with = "LotusJson<DealProposal>")]
-    #[serde(with = "crate::lotus_json")]
-    pub proposal: DealProposal,
-    // #[schemars(with = "LotusJson<Signature>")]
-    // #[serde(with = "crate::lotus_json")]
-    // pub client_signature: Signature,
+    pub proposal: DealProposalLotusJson,
+    // pub client_signature: SignatureLotusJson,
 }
 
 macro_rules! impl_lotus_json_for_client_deal_proposal {
@@ -280,15 +277,17 @@ macro_rules! impl_lotus_json_for_client_deal_proposal {
 
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
-                            proposal: todo!(), //self.proposal.into(),
-                            // TODO
-                            // client_signature: self.client_signature.into(),
+                            proposal: self.proposal.into_lotus_json(),
+                            // client_signature: {
+                            //     // TODO: shim signature
+                            //     self.client_signature.into().into_lotus_json()
+                            // }
                         }
                     }
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
-                            proposal: todo!(), //json.proposal.into(),
+                            proposal: fil_actor_market_state::[<v $version>]::DealProposal::from_lotus_json(json.proposal),
                             // TODO
                             client_signature: Signature::new_bls(vec![]),
                         }
@@ -299,14 +298,12 @@ macro_rules! impl_lotus_json_for_client_deal_proposal {
     };
 }
 
-impl_lotus_json_for_client_deal_proposal!(15, 16);
+impl_lotus_json_for_client_deal_proposal!(13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct PublishStorageDealsParamsLotusJson {
-    #[schemars(with = "LotusJson<ClientDealProposal>")]
-    #[serde(with = "crate::lotus_json")]
-    pub deals: Vec<ClientDealProposal>,
+    pub deals: Vec<ClientDealProposalLotusJson>,
 }
 
 macro_rules! impl_lotus_json_for_publish_storage_deals_params {
@@ -324,13 +321,15 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
 
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
-                            deals: self.deals.into_iter().map(|deal| deal.into()).collect(),
+                            deals: self.deals.into_iter().map(|d| d.into_lotus_json()).collect(),
                         }
                     }
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
-                            deals: json.deals.into_iter().map(|deal| deal.into()).collect(),
+                            deals: json.deals.into_iter()
+                            .map(|d| fil_actor_market_state::[<v $version>]::ClientDealProposal::from_lotus_json(d)) // delegate
+                            .collect(),
                         }
                     }
                 }
@@ -340,4 +339,4 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
 }
 
 //impl_lotus_json_for_publish_storage_deals_params!(9, 10, 11, 12, 13, 14, 15, 16);
-impl_lotus_json_for_publish_storage_deals_params!(15, 16);
+impl_lotus_json_for_publish_storage_deals_params!(13, 14, 15, 16);

From 53275d45b35126a9fe30eadc130f1c74b507bcd8 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 19 Aug 2025 10:11:06 +0200
Subject: [PATCH 13/71] Add support for Label

---
 .../actor_states/methods/market_actor_params.rs     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 00ee0aa1f011..cc71c0a3136c 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -142,7 +142,7 @@ macro_rules! impl_lotus_json_for_label {
     };
 }
 
-impl_lotus_json_for_label!(15, 16);
+impl_lotus_json_for_label!(13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
@@ -161,9 +161,7 @@ pub struct DealProposalLotusJson {
     #[schemars(with = "LotusJson<Address>")]
     #[serde(with = "crate::lotus_json")]
     pub provider: Address,
-    // #[schemars(with = "LotusJson<Label>")]
-    // #[serde(with = "crate::lotus_json")]
-    // pub label: Label,
+    pub label: LabelLotusJson,
     pub start_epoch: ChainEpoch,
     pub end_epoch: ChainEpoch,
     #[schemars(with = "LotusJson<TokenAmount>")]
@@ -210,7 +208,7 @@ macro_rules! impl_lotus_json_for_deal_proposal {
                             verified_deal: verified_deal.into(),
                             client: client.into(),
                             provider: provider.into(),
-                            // label: label.into(),
+                            label: label.into_lotus_json(),
                             start_epoch: start_epoch.into(),
                             end_epoch: end_epoch.into(),
                             storage_price_per_epoch: storage_price_per_epoch.into(),
@@ -226,7 +224,7 @@ macro_rules! impl_lotus_json_for_deal_proposal {
                             verified_deal,
                             client,
                             provider,
-                            // label,
+                            label,
                             start_epoch,
                             end_epoch,
                             storage_price_per_epoch,
@@ -239,7 +237,7 @@ macro_rules! impl_lotus_json_for_deal_proposal {
                             verified_deal,
                             client: client.into(),
                             provider: provider.into(),
-                            label: todo!(),
+                            label: fil_actor_market_state::[<v $version>]::Label::from_lotus_json(label), // delegate
                             start_epoch,
                             end_epoch,
                             storage_price_per_epoch: storage_price_per_epoch.into(),
@@ -338,5 +336,4 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
     };
 }
 
-//impl_lotus_json_for_publish_storage_deals_params!(9, 10, 11, 12, 13, 14, 15, 16);
 impl_lotus_json_for_publish_storage_deals_params!(13, 14, 15, 16);

From 47ac8e43380893041db7ab50e43e51a8cc46866a Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 19 Aug 2025 10:29:56 +0200
Subject: [PATCH 14/71] Add PublishStorageDeals method

---
 src/rpc/registry/actors/market.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index dc41c0ec23fb..2d95ffc93a67 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -92,6 +92,7 @@ macro_rules! register_market_versions_13_to_16 {
             [
                 (Method::AddBalance, AddBalanceParams),
                 (Method::WithdrawBalance, WithdrawBalanceParams),
+                (Method::PublishStorageDeals, PublishStorageDealsParams)
             ]
         );
 

From 39369f9eec0a73cc2e7c5ddabaaae1a125949173 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 19 Aug 2025 10:48:49 +0200
Subject: [PATCH 15/71] Add more methods

---
 src/rpc/registry/actors/market.rs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 2d95ffc93a67..74b4aa3975f4 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -24,24 +24,21 @@ macro_rules! register_market_versions_8_to_9 {
         register_actor_methods!(
             $registry,
             $code_cid,
-            [
-                (Method::Constructor, empty),
-                (Method::CronTick, empty),
-            ]
+            [(Method::Constructor, empty), (Method::CronTick, empty),]
         );
     }};
 }
 
 macro_rules! register_market_versions_10_to_11 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{Method, PublishStorageDealsParams, WithdrawBalanceParams};
+        use $state_version::{Method, WithdrawBalanceParams};
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
                 // (Method::AddBalance, AddBalanceParams),
-                // (Method::WithdrawBalance, WithdrawBalanceParams),
+                (Method::WithdrawBalance, WithdrawBalanceParams),
                 // (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
         );
@@ -57,16 +54,14 @@ macro_rules! register_market_versions_10_to_11 {
 
 macro_rules! register_market_versions_12 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{
-            AddBalanceParams, Method, PublishStorageDealsParams, WithdrawBalanceParams,
-        };
+        use $state_version::{AddBalanceParams, Method, WithdrawBalanceParams};
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
                 (Method::AddBalance, AddBalanceParams),
-                // (Method::WithdrawBalance, WithdrawBalanceParams),
+                (Method::WithdrawBalance, WithdrawBalanceParams),
                 // (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
         );

From 0f0ba924ffd52f67eb5dd35f69ae1d2e310470c8 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 19 Aug 2025 10:58:05 +0200
Subject: [PATCH 16/71] Add PublishStorageDeals method for v12

---
 .../actor_states/methods/market_actor_params.rs           | 8 ++++----
 src/rpc/registry/actors/market.rs                         | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index cc71c0a3136c..17caf7ca1112 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -142,7 +142,7 @@ macro_rules! impl_lotus_json_for_label {
     };
 }
 
-impl_lotus_json_for_label!(13, 14, 15, 16);
+impl_lotus_json_for_label!(12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
@@ -251,7 +251,7 @@ macro_rules! impl_lotus_json_for_deal_proposal {
     };
 }
 
-impl_lotus_json_for_deal_proposal!(13, 14, 15, 16);
+impl_lotus_json_for_deal_proposal!(12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
@@ -296,7 +296,7 @@ macro_rules! impl_lotus_json_for_client_deal_proposal {
     };
 }
 
-impl_lotus_json_for_client_deal_proposal!(13, 14, 15, 16);
+impl_lotus_json_for_client_deal_proposal!(12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
@@ -336,4 +336,4 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
     };
 }
 
-impl_lotus_json_for_publish_storage_deals_params!(13, 14, 15, 16);
+impl_lotus_json_for_publish_storage_deals_params!(12, 13, 14, 15, 16);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 74b4aa3975f4..fe6f369e7fcf 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -54,7 +54,9 @@ macro_rules! register_market_versions_10_to_11 {
 
 macro_rules! register_market_versions_12 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{AddBalanceParams, Method, WithdrawBalanceParams};
+        use $state_version::{
+            AddBalanceParams, Method, PublishStorageDealsParams, WithdrawBalanceParams,
+        };
 
         register_actor_methods!(
             $registry,
@@ -62,7 +64,7 @@ macro_rules! register_market_versions_12 {
             [
                 (Method::AddBalance, AddBalanceParams),
                 (Method::WithdrawBalance, WithdrawBalanceParams),
-                // (Method::PublishStorageDeals, PublishStorageDealsParams),
+                (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
         );
 

From 5d6d1727085e5954576c934a75b4cff0e6218a72 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:33:31 +0200
Subject: [PATCH 17/71] Add more methods for v8-v9

---
 .../methods/market_actor_params.rs            | 20 +++++++++----------
 src/rpc/registry/actors/market.rs             |  8 +++++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 17caf7ca1112..43c5062bbcbf 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -2,13 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::*;
-use crate::lotus_json::signature::SignatureLotusJson;
 use crate::shim::address::Address;
 use crate::shim::clock::ChainEpoch;
 use crate::shim::econ::TokenAmount;
-use crate::shim::fvm_shared_latest::crypto::signature::Signature;
 use crate::shim::piece::PaddedPieceSize;
-use fil_actor_market_state::v16::{ClientDealProposal, DealProposal, Label};
 
 use ::cid::Cid;
 // use fvm_ipld_encoding::RawBytes;
@@ -67,7 +64,7 @@ macro_rules! impl_lotus_json_for_add_balance_params {
     };
 }
 
-impl_lotus_json_for_add_balance_params!(11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_add_balance_params!(10, 11, 12, 13, 14, 15, 16);
 
 macro_rules! impl_lotus_json_for_withdraw_balance_params {
     ($($version:literal),+) => {
@@ -142,7 +139,7 @@ macro_rules! impl_lotus_json_for_label {
     };
 }
 
-impl_lotus_json_for_label!(12, 13, 14, 15, 16);
+impl_lotus_json_for_label!(10, 11, 12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
@@ -251,7 +248,7 @@ macro_rules! impl_lotus_json_for_deal_proposal {
     };
 }
 
-impl_lotus_json_for_deal_proposal!(12, 13, 14, 15, 16);
+impl_lotus_json_for_deal_proposal!(10, 11, 12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
@@ -261,7 +258,7 @@ pub struct ClientDealProposalLotusJson {
 }
 
 macro_rules! impl_lotus_json_for_client_deal_proposal {
-    ($($version:literal),+) => {
+    ($type_suffix:path: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::ClientDealProposal {
@@ -286,8 +283,8 @@ macro_rules! impl_lotus_json_for_client_deal_proposal {
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
                             proposal: fil_actor_market_state::[<v $version>]::DealProposal::from_lotus_json(json.proposal),
-                            // TODO
-                            client_signature: Signature::new_bls(vec![]),
+                            // TODO: shim signature
+                            client_signature: $type_suffix::Signature::new_bls(vec![]),
                         }
                     }
                 }
@@ -296,7 +293,8 @@ macro_rules! impl_lotus_json_for_client_deal_proposal {
     };
 }
 
-impl_lotus_json_for_client_deal_proposal!(12, 13, 14, 15, 16);
+impl_lotus_json_for_client_deal_proposal!(fvm_shared3::crypto::signature: 10, 11);
+impl_lotus_json_for_client_deal_proposal!(fvm_shared4::crypto::signature: 12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
@@ -336,4 +334,4 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
     };
 }
 
-impl_lotus_json_for_publish_storage_deals_params!(12, 13, 14, 15, 16);
+impl_lotus_json_for_publish_storage_deals_params!(10, 11, 12, 13, 14, 15, 16);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index fe6f369e7fcf..f3df1f22e288 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -31,15 +31,17 @@ macro_rules! register_market_versions_8_to_9 {
 
 macro_rules! register_market_versions_10_to_11 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{Method, WithdrawBalanceParams};
+        use $state_version::{
+            AddBalanceParams, Method, PublishStorageDealsParams, WithdrawBalanceParams,
+        };
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
-                // (Method::AddBalance, AddBalanceParams),
+                (Method::AddBalance, AddBalanceParams),
                 (Method::WithdrawBalance, WithdrawBalanceParams),
-                // (Method::PublishStorageDeals, PublishStorageDealsParams),
+                (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
         );
 

From 13cf35d1ee0219ec8e7c686efca5064938dc7283 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 19 Aug 2025 12:14:02 +0200
Subject: [PATCH 18/71] Add v8-v9 methods

---
 .../actor_states/methods/market_actor_params.rs       | 11 ++++++-----
 src/rpc/registry/actors/market.rs                     | 10 ++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 43c5062bbcbf..1fa97a7b97d0 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -64,7 +64,7 @@ macro_rules! impl_lotus_json_for_add_balance_params {
     };
 }
 
-impl_lotus_json_for_add_balance_params!(10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_add_balance_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 
 macro_rules! impl_lotus_json_for_withdraw_balance_params {
     ($($version:literal),+) => {
@@ -98,7 +98,7 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
     };
 }
 
-impl_lotus_json_for_withdraw_balance_params!(9, 10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_withdraw_balance_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
 #[serde(untagged)]
@@ -139,7 +139,7 @@ macro_rules! impl_lotus_json_for_label {
     };
 }
 
-impl_lotus_json_for_label!(10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_label!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
@@ -248,7 +248,7 @@ macro_rules! impl_lotus_json_for_deal_proposal {
     };
 }
 
-impl_lotus_json_for_deal_proposal!(10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_deal_proposal!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
@@ -293,6 +293,7 @@ macro_rules! impl_lotus_json_for_client_deal_proposal {
     };
 }
 
+impl_lotus_json_for_client_deal_proposal!(fvm_shared2::crypto::signature: 8, 9);
 impl_lotus_json_for_client_deal_proposal!(fvm_shared3::crypto::signature: 10, 11);
 impl_lotus_json_for_client_deal_proposal!(fvm_shared4::crypto::signature: 12, 13, 14, 15, 16);
 
@@ -334,4 +335,4 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
     };
 }
 
-impl_lotus_json_for_publish_storage_deals_params!(10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_publish_storage_deals_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index f3df1f22e288..81dcfde371da 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -8,15 +8,17 @@ use cid::Cid;
 
 macro_rules! register_market_versions_8_to_9 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{Method};
+        use $state_version::{
+            AddBalanceParams, Method, PublishStorageDealsParams, WithdrawBalanceParams,
+        };
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
-                // (Method::AddBalance, AddBalanceParams),
-                // (Method::WithdrawBalance, WithdrawBalanceParams),
-                // (Method::PublishStorageDeals, PublishStorageDealsParams),
+                (Method::AddBalance, AddBalanceParams),
+                (Method::WithdrawBalance, WithdrawBalanceParams),
+                (Method::PublishStorageDeals, PublishStorageDealsParams),
             ]
         );
 

From 43b9ea5c54bd1d6916d193bb7b05fb60e43a49ff Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 19 Aug 2025 13:04:04 +0200
Subject: [PATCH 19/71] Remove files

---
 src/lotus_json/client_deal_proposal.rs |  57 -------------
 src/lotus_json/deal_proposal.rs        | 114 -------------------------
 src/lotus_json/label.rs                |  36 --------
 3 files changed, 207 deletions(-)
 delete mode 100644 src/lotus_json/client_deal_proposal.rs
 delete mode 100644 src/lotus_json/deal_proposal.rs
 delete mode 100644 src/lotus_json/label.rs

diff --git a/src/lotus_json/client_deal_proposal.rs b/src/lotus_json/client_deal_proposal.rs
deleted file mode 100644
index 70786e91ef4b..000000000000
--- a/src/lotus_json/client_deal_proposal.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-// // Copyright 2019-2025 ChainSafe Systems
-// // SPDX-License-Identifier: Apache-2.0, MIT
-
-// use super::*;
-// use crate::shim::address::Address;
-// use crate::shim::clock::ChainEpoch;
-// use crate::shim::crypto::Signature;
-// use crate::shim::econ::TokenAmount;
-// use crate::shim::piece::PaddedPieceSize;
-
-// use ::cid::Cid;
-// use fil_actor_market_state::v16::{ClientDealProposal, DealProposal};
-// use schemars::JsonSchema;
-// use serde::Deserialize;
-// use std::fmt::Debug;
-
-// #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-// #[serde(rename_all = "PascalCase")]
-// pub struct ClientDealProposalLotusJson {
-//     #[schemars(with = "LotusJson<DealProposal>")]
-//     #[serde(with = "crate::lotus_json")]
-//     pub proposal: DealProposal,
-//     #[schemars(with = "LotusJson<Signature>")]
-//     #[serde(with = "crate::lotus_json")]
-//     pub client_signature: Signature,
-// }
-
-// impl HasLotusJson for ClientDealProposal {
-//     type LotusJson = ClientDealProposalLotusJson;
-
-//     #[cfg(test)]
-//     fn snapshots() -> Vec<(serde_json::Value, Self)> {
-//         vec![]
-//     }
-
-//     fn into_lotus_json(self) -> Self::LotusJson {
-//         let Self {
-//             proposal,
-//             client_signature,
-//         } = self;
-//         Self::LotusJson {
-//             proposal,
-//             client_signature: todo!(), //client_signature.into(),
-//         }
-//     }
-
-//     fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
-//         let Self::LotusJson {
-//             proposal,
-//             client_signature,
-//         } = lotus_json;
-//         Self {
-//             proposal,
-//             client_signature: todo!(), //client_signature.into(),
-//         }
-//     }
-// }
diff --git a/src/lotus_json/deal_proposal.rs b/src/lotus_json/deal_proposal.rs
deleted file mode 100644
index 96db9ae4a77b..000000000000
--- a/src/lotus_json/deal_proposal.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-// // Copyright 2019-2025 ChainSafe Systems
-// // SPDX-License-Identifier: Apache-2.0, MIT
-
-// use super::*;
-// use crate::shim::address::Address;
-// use crate::shim::clock::ChainEpoch;
-// use crate::shim::econ::TokenAmount;
-// use crate::shim::piece::PaddedPieceSize;
-
-// use ::cid::Cid;
-// use fil_actor_market_state::v16::{DealProposal, Label};
-// use schemars::JsonSchema;
-// use serde::Deserialize;
-// use std::fmt::Debug;
-
-// #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-// #[serde(rename_all = "PascalCase")]
-// pub struct DealProposalLotusJson {
-//     #[schemars(with = "LotusJson<Cid>")]
-//     #[serde(with = "crate::lotus_json")]
-//     #[serde(rename = "CodeCID")]
-//     pub piece_cid: Cid,
-//     #[schemars(with = "LotusJson<PaddedPieceSize>")]
-//     #[serde(with = "crate::lotus_json")]
-//     pub piece_size: PaddedPieceSize,
-//     pub verified_deal: bool,
-//     #[schemars(with = "LotusJson<Address>")]
-//     #[serde(with = "crate::lotus_json")]
-//     pub client: Address,
-//     #[schemars(with = "LotusJson<Address>")]
-//     #[serde(with = "crate::lotus_json")]
-//     pub provider: Address,
-//     #[schemars(with = "LotusJson<Address>")]
-//     #[serde(with = "crate::lotus_json")]
-//     pub label: Label,
-//     pub start_epoch: ChainEpoch,
-//     pub end_epoch: ChainEpoch,
-//     #[schemars(with = "LotusJson<TokenAmount>")]
-//     #[serde(with = "crate::lotus_json")]
-//     pub storage_price_per_epoch: TokenAmount,
-//     #[schemars(with = "LotusJson<TokenAmount>")]
-//     #[serde(with = "crate::lotus_json")]
-//     pub provider_collateral: TokenAmount,
-//     #[schemars(with = "LotusJson<TokenAmount>")]
-//     #[serde(with = "crate::lotus_json")]
-//     pub client_collateral: TokenAmount,
-// }
-
-// impl HasLotusJson for DealProposal {
-//     type LotusJson = DealProposalLotusJson;
-
-//     #[cfg(test)]
-//     fn snapshots() -> Vec<(serde_json::Value, Self)> {
-//         vec![]
-//     }
-
-//     fn into_lotus_json(self) -> Self::LotusJson {
-//         let Self {
-//             piece_cid,
-//             piece_size,
-//             verified_deal,
-//             client,
-//             provider,
-//             label,
-//             start_epoch,
-//             end_epoch,
-//             storage_price_per_epoch,
-//             provider_collateral,
-//             client_collateral,
-//         } = self;
-//         Self::LotusJson {
-//             piece_cid: piece_cid.into(),
-//             piece_size: piece_size.into(),
-//             verified_deal: verified_deal.into(),
-//             client: client.into(),
-//             provider: provider.into(),
-//             label: label.into(),
-//             start_epoch: start_epoch.into(),
-//             end_epoch: end_epoch.into(),
-//             storage_price_per_epoch: storage_price_per_epoch.into(),
-//             provider_collateral: provider_collateral.into(),
-//             client_collateral: client_collateral.into(),
-//         }
-//     }
-
-//     fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
-//         let Self::LotusJson {
-//             piece_cid,
-//             piece_size,
-//             verified_deal,
-//             client,
-//             provider,
-//             label,
-//             start_epoch,
-//             end_epoch,
-//             storage_price_per_epoch,
-//             provider_collateral,
-//             client_collateral,
-//         } = lotus_json;
-//         Self {
-//             piece_cid,
-//             piece_size: piece_size.into(),
-//             verified_deal,
-//             client: client.into(),
-//             provider: provider.into(),
-//             label,
-//             start_epoch,
-//             end_epoch,
-//             storage_price_per_epoch: storage_price_per_epoch.into(),
-//             provider_collateral: provider_collateral.into(),
-//             client_collateral: client_collateral.into(),
-//         }
-//     }
-// }
diff --git a/src/lotus_json/label.rs b/src/lotus_json/label.rs
deleted file mode 100644
index 2cbb306f4039..000000000000
--- a/src/lotus_json/label.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// // Copyright 2019-2025 ChainSafe Systems
-// // SPDX-License-Identifier: Apache-2.0, MIT
-
-// use super::*;
-// use fil_actor_market_state::v16::Label;
-// use serde::{Deserialize, Serialize};
-
-// #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
-// #[serde(untagged)]
-// pub enum LabelLotusJson {
-//     String(String),
-//     Bytes(Vec<u8>),
-// }
-
-// impl HasLotusJson for Label {
-//     type LotusJson = LabelLotusJson;
-
-//     #[cfg(test)]
-//     fn snapshots() -> Vec<(serde_json::Value, Self)> {
-//         vec![]
-//     }
-
-//     fn into_lotus_json(self) -> Self::LotusJson {
-//         match self {
-//             Label::Bytes(bytes) => LabelLotusJson::Bytes(bytes),
-//             Label::String(string) => LabelLotusJson::String(string),
-//         }
-//     }
-
-//     fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
-//         match lotus_json {
-//             LabelLotusJson::Bytes(bytes) => Label::Bytes(bytes),
-//             LabelLotusJson::String(string) => Label::String(string),
-//         }
-//     }
-// }

From b6abcd240e94609c568cb7e5b15d46bfed031f4c Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:58:23 +0200
Subject: [PATCH 20/71] Add SectorDeals (wip)

---
 .../methods/market_actor_params.rs            | 130 ++++++++++++++++++
 src/lotus_json/mod.rs                         |   3 -
 2 files changed, 130 insertions(+), 3 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 1fa97a7b97d0..51a2f31bd98d 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -4,8 +4,11 @@
 use super::*;
 use crate::shim::address::Address;
 use crate::shim::clock::ChainEpoch;
+use crate::shim::deal::DealID;
 use crate::shim::econ::TokenAmount;
 use crate::shim::piece::PaddedPieceSize;
+use crate::shim::sector::RegisteredSealProof;
+use crate::shim::sector::SectorNumber;
 
 use ::cid::Cid;
 // use fvm_ipld_encoding::RawBytes;
@@ -336,3 +339,130 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
 }
 
 impl_lotus_json_for_publish_storage_deals_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct SectorDealsLotusJson {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sector_number: Option<SectorNumber>,
+    #[schemars(with = "LotusJson<RegisteredSealProof>")]
+    // #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(with = "crate::lotus_json")]
+    pub sector_type: RegisteredSealProof,
+    pub sector_expiry: ChainEpoch,
+    #[schemars(with = "LotusJson<DealID>")]
+    #[serde(with = "crate::lotus_json")]
+    pub deal_ids: Vec<DealID>,
+}
+
+macro_rules! impl_lotus_json_for_sector_deals {
+    // Handling versions where `sector_number` should be None (v8, v9, v11, v12)
+    (no_sector_number: $type_suffix:path: $($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::SectorDeals {
+                    type LotusJson = SectorDealsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            sector_number: None,
+                            sector_type: self.sector_type.into(),
+                            sector_expiry: self.sector_expiry.into_lotus_json(),
+                            deal_ids: self.deal_ids.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            sector_expiry: json.sector_expiry.into(),
+                            sector_type: json.sector_type.into(),
+                            deal_ids: json.deal_ids.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+    ($type_suffix:path: $($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::SectorDeals {
+                    type LotusJson = SectorDealsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            sector_number: Some(self.sector_number.into_lotus_json()),
+                            sector_type: self.sector_type.into(),
+                            sector_expiry: self.sector_expiry.into_lotus_json(),
+                            deal_ids: self.deal_ids.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            sector_number: json.sector_number.unwrap_or_default(),
+                            sector_type: json.sector_type.into(),
+                            sector_expiry: json.sector_expiry.into(),
+                            deal_ids: json.deal_ids.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_sector_deals!(no_sector_number: fvm_shared3::sector: 11, 12);
+impl_lotus_json_for_sector_deals!(fvm_shared4::sector: 13, 14, 15, 16);
+
+// #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+// #[serde(rename_all = "PascalCase")]
+// pub struct VerifyDealsForActivationParamsLotusJson {
+//     pub sectors: Vec<SectorDealsLotusJson>,
+// }
+
+// macro_rules! impl_lotus_json_for_publish_storage_deals_params {
+//     ($($version:literal),+) => {
+//         $(
+//             paste! {
+//                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::VerifyDealsForActivationParams {
+//                     type LotusJson = VerifyDealsForActivationParamsLotusJson;
+
+//                     #[cfg(test)]
+//                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
+//                         vec![
+//                         ]
+//                     }
+
+//                     fn into_lotus_json(self) -> Self::LotusJson {
+//                         Self::LotusJson {
+//                             sectors: self.sectors.into_iter().map(|s| s.into_lotus_json()).collect(),
+//                         }
+//                     }
+
+//                     fn from_lotus_json(json: Self::LotusJson) -> Self {
+//                         Self {
+//                             sectors: json.sectors.into_iter()
+//                             .map(|s| fil_actor_market_state::[<v $version>]::VerifyDealsForActivationParams::from_lotus_json(s)) // delegate
+//                             .collect(),
+//                         }
+//                     }
+//                 }
+//             }
+//         )+
+//     };
+// }
+
+// impl_lotus_json_for_publish_storage_deals_params!(16);
diff --git a/src/lotus_json/mod.rs b/src/lotus_json/mod.rs
index 9e57033cfea5..1bd098428004 100644
--- a/src/lotus_json/mod.rs
+++ b/src/lotus_json/mod.rs
@@ -223,13 +223,10 @@ mod allocation;
 mod beneficiary_term; // fil_actor_miner_state::v12::BeneficiaryTerm: !quickcheck::Arbitrary
 mod bit_field; //  fil_actors_shared::fvm_ipld_bitfield::BitField: !quickcheck::Arbitrary
 mod bytecode_hash;
-mod client_deal_proposal;
-mod deal_proposal;
 mod entry;
 mod filter_estimate;
 mod hash_map;
 mod ipld; // NaN != NaN
-mod label;
 mod miner_info; // fil_actor_miner_state::v12::MinerInfo: !quickcheck::Arbitrary
 mod miner_power; // actors::miner::MinerInfo: !quickcheck::Arbitrary
 mod nonempty; // can't make snapshots of generic type

From fd5145578618eb45ce28b4ac914481c603336e45 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 19 Aug 2025 19:52:04 +0200
Subject: [PATCH 21/71] Add optional sector_type

---
 .../methods/market_actor_params.rs            | 51 +++++++++++++++----
 src/shim/sector.rs                            |  6 +++
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 51a2f31bd98d..5f154340ec31 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -346,9 +346,9 @@ pub struct SectorDealsLotusJson {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub sector_number: Option<SectorNumber>,
     #[schemars(with = "LotusJson<RegisteredSealProof>")]
-    // #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(with = "crate::lotus_json")]
-    pub sector_type: RegisteredSealProof,
+    pub sector_type: Option<RegisteredSealProof>,
     pub sector_expiry: ChainEpoch,
     #[schemars(with = "LotusJson<DealID>")]
     #[serde(with = "crate::lotus_json")]
@@ -356,8 +356,40 @@ pub struct SectorDealsLotusJson {
 }
 
 macro_rules! impl_lotus_json_for_sector_deals {
-    // Handling versions where `sector_number` should be None (v8, v9, v11, v12)
-    (no_sector_number: $type_suffix:path: $($version:literal),+) => {
+    // Handling version where both `sector_number` and `sector_type` should be None (v8)
+    ($type_suffix:path: no_sector_number: no_sector_type: $($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::SectorDeals {
+                    type LotusJson = SectorDealsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            sector_number: None,
+                            sector_type: None,
+                            sector_expiry: self.sector_expiry.into_lotus_json(),
+                            deal_ids: self.deal_ids.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            sector_expiry: json.sector_expiry.into(),
+                            deal_ids: json.deal_ids.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+    // Handling versions where `sector_number` should be None (v9, v10, v11, v12)
+    ($type_suffix:path: no_sector_number: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::SectorDeals {
@@ -372,7 +404,7 @@ macro_rules! impl_lotus_json_for_sector_deals {
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
                             sector_number: None,
-                            sector_type: self.sector_type.into(),
+                            sector_type: Some(self.sector_type.into()),
                             sector_expiry: self.sector_expiry.into_lotus_json(),
                             deal_ids: self.deal_ids.into(),
                         }
@@ -381,7 +413,7 @@ macro_rules! impl_lotus_json_for_sector_deals {
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
                             sector_expiry: json.sector_expiry.into(),
-                            sector_type: json.sector_type.into(),
+                            sector_type: json.sector_type.unwrap_or(RegisteredSealProof::invalid()).into(),
                             deal_ids: json.deal_ids.into(),
                         }
                     }
@@ -404,7 +436,7 @@ macro_rules! impl_lotus_json_for_sector_deals {
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
                             sector_number: Some(self.sector_number.into_lotus_json()),
-                            sector_type: self.sector_type.into(),
+                            sector_type: Some(self.sector_type.into()),
                             sector_expiry: self.sector_expiry.into_lotus_json(),
                             deal_ids: self.deal_ids.into(),
                         }
@@ -413,7 +445,7 @@ macro_rules! impl_lotus_json_for_sector_deals {
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
                             sector_number: json.sector_number.unwrap_or_default(),
-                            sector_type: json.sector_type.into(),
+                            sector_type: json.sector_type.unwrap_or(RegisteredSealProof::invalid()).into(),
                             sector_expiry: json.sector_expiry.into(),
                             deal_ids: json.deal_ids.into(),
                         }
@@ -424,7 +456,8 @@ macro_rules! impl_lotus_json_for_sector_deals {
     };
 }
 
-impl_lotus_json_for_sector_deals!(no_sector_number: fvm_shared3::sector: 11, 12);
+impl_lotus_json_for_sector_deals!(fvm_shared2::sector: no_sector_number: no_sector_type: 8);
+impl_lotus_json_for_sector_deals!(fvm_shared3::sector: no_sector_number: 9, 10, 11, 12);
 impl_lotus_json_for_sector_deals!(fvm_shared4::sector: 13, 14, 15, 16);
 
 // #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
diff --git a/src/shim/sector.rs b/src/shim/sector.rs
index 908a3f0b46fd..32b3332e89c1 100644
--- a/src/shim/sector.rs
+++ b/src/shim/sector.rs
@@ -134,6 +134,12 @@ registered_seal_proof_conversion!(
     RegisteredSealProofV4
 );
 
+impl RegisteredSealProof {
+    pub fn invalid() -> Self {
+        RegisteredSealProof(RegisteredSealProofV4::Invalid(0))
+    }
+}
+
 #[cfg(test)]
 impl quickcheck::Arbitrary for RegisteredSealProof {
     fn arbitrary(g: &mut quickcheck::Gen) -> Self {

From 1212dcb0658fc109fb2923dba0628700205e93a2 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 20 Aug 2025 08:43:38 +0200
Subject: [PATCH 22/71] Add VerifyDealsForActivation method for v13-v16

---
 .../methods/market_actor_params.rs            | 80 ++++++++++---------
 src/rpc/registry/actors/market.rs             |  9 ++-
 2 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 5f154340ec31..5ed72c835a2d 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -460,42 +460,44 @@ impl_lotus_json_for_sector_deals!(fvm_shared2::sector: no_sector_number: no_sect
 impl_lotus_json_for_sector_deals!(fvm_shared3::sector: no_sector_number: 9, 10, 11, 12);
 impl_lotus_json_for_sector_deals!(fvm_shared4::sector: 13, 14, 15, 16);
 
-// #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-// #[serde(rename_all = "PascalCase")]
-// pub struct VerifyDealsForActivationParamsLotusJson {
-//     pub sectors: Vec<SectorDealsLotusJson>,
-// }
-
-// macro_rules! impl_lotus_json_for_publish_storage_deals_params {
-//     ($($version:literal),+) => {
-//         $(
-//             paste! {
-//                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::VerifyDealsForActivationParams {
-//                     type LotusJson = VerifyDealsForActivationParamsLotusJson;
-
-//                     #[cfg(test)]
-//                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
-//                         vec![
-//                         ]
-//                     }
-
-//                     fn into_lotus_json(self) -> Self::LotusJson {
-//                         Self::LotusJson {
-//                             sectors: self.sectors.into_iter().map(|s| s.into_lotus_json()).collect(),
-//                         }
-//                     }
-
-//                     fn from_lotus_json(json: Self::LotusJson) -> Self {
-//                         Self {
-//                             sectors: json.sectors.into_iter()
-//                             .map(|s| fil_actor_market_state::[<v $version>]::VerifyDealsForActivationParams::from_lotus_json(s)) // delegate
-//                             .collect(),
-//                         }
-//                     }
-//                 }
-//             }
-//         )+
-//     };
-// }
-
-// impl_lotus_json_for_publish_storage_deals_params!(16);
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct VerifyDealsForActivationParamsLotusJson {
+    pub sectors: Vec<SectorDealsLotusJson>,
+}
+
+macro_rules! impl_lotus_json_for_publish_storage_deals_params {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::VerifyDealsForActivationParams {
+                    type LotusJson = VerifyDealsForActivationParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            sectors: self.sectors.into_iter().map(|s| s.into_lotus_json()).collect(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            sectors: json
+                                .sectors
+                                .into_iter()
+                                .map(|s| fil_actor_market_state::[<v $version>]::SectorDeals::from_lotus_json(s)) // delegate
+                                .collect(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_publish_storage_deals_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 81dcfde371da..87f689132c5f 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -84,7 +84,8 @@ macro_rules! register_market_versions_12 {
 macro_rules! register_market_versions_13_to_16 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, Method, PublishStorageDealsParams, WithdrawBalanceParams,
+            AddBalanceParams, Method, PublishStorageDealsParams, VerifyDealsForActivationParams,
+            WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -93,7 +94,11 @@ macro_rules! register_market_versions_13_to_16 {
             [
                 (Method::AddBalance, AddBalanceParams),
                 (Method::WithdrawBalance, WithdrawBalanceParams),
-                (Method::PublishStorageDeals, PublishStorageDealsParams)
+                (Method::PublishStorageDeals, PublishStorageDealsParams),
+                (
+                    Method::VerifyDealsForActivation,
+                    VerifyDealsForActivationParams
+                ),
             ]
         );
 

From 7f0fa1e21e95831b8ae241b82174e2cbbde4a65a Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 20 Aug 2025 09:08:40 +0200
Subject: [PATCH 23/71] Add VerifyDealsForActivation method for v18-v12

---
 src/rpc/registry/actors/market.rs | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 87f689132c5f..628d43a6584b 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -9,7 +9,8 @@ use cid::Cid;
 macro_rules! register_market_versions_8_to_9 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, Method, PublishStorageDealsParams, WithdrawBalanceParams,
+            AddBalanceParams, Method, PublishStorageDealsParams, VerifyDealsForActivationParams,
+            WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -19,6 +20,10 @@ macro_rules! register_market_versions_8_to_9 {
                 (Method::AddBalance, AddBalanceParams),
                 (Method::WithdrawBalance, WithdrawBalanceParams),
                 (Method::PublishStorageDeals, PublishStorageDealsParams),
+                (
+                    Method::VerifyDealsForActivation,
+                    VerifyDealsForActivationParams
+                ),
             ]
         );
 
@@ -34,7 +39,8 @@ macro_rules! register_market_versions_8_to_9 {
 macro_rules! register_market_versions_10_to_11 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, Method, PublishStorageDealsParams, WithdrawBalanceParams,
+            AddBalanceParams, Method, PublishStorageDealsParams, VerifyDealsForActivationParams,
+            WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -44,6 +50,10 @@ macro_rules! register_market_versions_10_to_11 {
                 (Method::AddBalance, AddBalanceParams),
                 (Method::WithdrawBalance, WithdrawBalanceParams),
                 (Method::PublishStorageDeals, PublishStorageDealsParams),
+                (
+                    Method::VerifyDealsForActivation,
+                    VerifyDealsForActivationParams
+                ),
             ]
         );
 
@@ -59,7 +69,8 @@ macro_rules! register_market_versions_10_to_11 {
 macro_rules! register_market_versions_12 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, Method, PublishStorageDealsParams, WithdrawBalanceParams,
+            AddBalanceParams, Method, PublishStorageDealsParams, VerifyDealsForActivationParams,
+            WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -69,6 +80,10 @@ macro_rules! register_market_versions_12 {
                 (Method::AddBalance, AddBalanceParams),
                 (Method::WithdrawBalance, WithdrawBalanceParams),
                 (Method::PublishStorageDeals, PublishStorageDealsParams),
+                (
+                    Method::VerifyDealsForActivation,
+                    VerifyDealsForActivationParams
+                ),
             ]
         );
 

From c1496238fe06aa408b1d2647305b7138f35be7f0 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 20 Aug 2025 11:38:53 +0200
Subject: [PATCH 24/71] Handle signature versions

---
 .../methods/market_actor_params.rs            | 67 ++++++++++++++-----
 1 file changed, 49 insertions(+), 18 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 5ed72c835a2d..7b1b24eda599 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -4,6 +4,7 @@
 use super::*;
 use crate::shim::address::Address;
 use crate::shim::clock::ChainEpoch;
+use crate::shim::crypto::{Signature, SignatureType};
 use crate::shim::deal::DealID;
 use crate::shim::econ::TokenAmount;
 use crate::shim::piece::PaddedPieceSize;
@@ -255,17 +256,37 @@ impl_lotus_json_for_deal_proposal!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
-pub struct ClientDealProposalLotusJson {
+pub struct ClientDealProposalV2LotusJson {
     pub proposal: DealProposalLotusJson,
-    // pub client_signature: SignatureLotusJson,
+    #[schemars(with = "LotusJson<fvm_shared2::crypto::signature::Signature>")]
+    #[serde(with = "crate::lotus_json")]
+    pub client_signature: fvm_shared2::crypto::signature::Signature,
+}
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct ClientDealProposalV3LotusJson {
+    pub proposal: DealProposalLotusJson,
+    #[schemars(with = "LotusJson<fvm_shared3::crypto::signature::Signature>")]
+    #[serde(with = "crate::lotus_json")]
+    pub client_signature: fvm_shared3::crypto::signature::Signature,
+}
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct ClientDealProposalV4LotusJson {
+    pub proposal: DealProposalLotusJson,
+    #[schemars(with = "LotusJson<fvm_shared4::crypto::signature::Signature>")]
+    #[serde(with = "crate::lotus_json")]
+    pub client_signature: fvm_shared4::crypto::signature::Signature,
 }
 
 macro_rules! impl_lotus_json_for_client_deal_proposal {
-    ($type_suffix:path: $($version:literal),+) => {
+    ($type_suffix:path: $lotus_json_type:ty: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::ClientDealProposal {
-                    type LotusJson = ClientDealProposalLotusJson;
+                    type LotusJson = $lotus_json_type;
 
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
@@ -276,18 +297,14 @@ macro_rules! impl_lotus_json_for_client_deal_proposal {
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
                             proposal: self.proposal.into_lotus_json(),
-                            // client_signature: {
-                            //     // TODO: shim signature
-                            //     self.client_signature.into().into_lotus_json()
-                            // }
+                            client_signature: self.client_signature.into(),
                         }
                     }
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
                             proposal: fil_actor_market_state::[<v $version>]::DealProposal::from_lotus_json(json.proposal),
-                            // TODO: shim signature
-                            client_signature: $type_suffix::Signature::new_bls(vec![]),
+                            client_signature: json.client_signature.into(),
                         }
                     }
                 }
@@ -296,22 +313,34 @@ macro_rules! impl_lotus_json_for_client_deal_proposal {
     };
 }
 
-impl_lotus_json_for_client_deal_proposal!(fvm_shared2::crypto::signature: 8, 9);
-impl_lotus_json_for_client_deal_proposal!(fvm_shared3::crypto::signature: 10, 11);
-impl_lotus_json_for_client_deal_proposal!(fvm_shared4::crypto::signature: 12, 13, 14, 15, 16);
+impl_lotus_json_for_client_deal_proposal!(fvm_shared2::crypto::signature: ClientDealProposalV2LotusJson: 8, 9);
+impl_lotus_json_for_client_deal_proposal!(fvm_shared3::crypto::signature: ClientDealProposalV3LotusJson: 10, 11);
+impl_lotus_json_for_client_deal_proposal!(fvm_shared4::crypto::signature: ClientDealProposalV4LotusJson: 12, 13, 14, 15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct PublishStorageDealsParamsV2LotusJson {
+    pub deals: Vec<ClientDealProposalV2LotusJson>,
+}
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct PublishStorageDealsParamsV3LotusJson {
+    pub deals: Vec<ClientDealProposalV3LotusJson>,
+}
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
-pub struct PublishStorageDealsParamsLotusJson {
-    pub deals: Vec<ClientDealProposalLotusJson>,
+pub struct PublishStorageDealsParamsV4LotusJson {
+    pub deals: Vec<ClientDealProposalV4LotusJson>,
 }
 
 macro_rules! impl_lotus_json_for_publish_storage_deals_params {
-    ($($version:literal),+) => {
+    ($lotus_json_type:ty: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::PublishStorageDealsParams {
-                    type LotusJson = PublishStorageDealsParamsLotusJson;
+                    type LotusJson = $lotus_json_type;
 
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
@@ -338,7 +367,9 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
     };
 }
 
-impl_lotus_json_for_publish_storage_deals_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_publish_storage_deals_params!(PublishStorageDealsParamsV2LotusJson: 8, 9);
+impl_lotus_json_for_publish_storage_deals_params!(PublishStorageDealsParamsV3LotusJson: 10, 11);
+impl_lotus_json_for_publish_storage_deals_params!(PublishStorageDealsParamsV4LotusJson: 12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]

From c37d562bf5b3c5c0da10c6a0714be7cc2ce9438e Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 20 Aug 2025 11:41:18 +0200
Subject: [PATCH 25/71] Remove commented-out code

---
 Cargo.lock | 30 +++++++++++++++---------------
 Cargo.toml | 18 ------------------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b446afa64a69..bcbc48e6b838 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2602,7 +2602,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_account_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "frc42_dispatch",
  "frc42_macros",
@@ -2617,7 +2617,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_cron_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "fvm_ipld_encoding",
  "fvm_shared 2.11.1",
@@ -2630,7 +2630,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_datacap_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "fil_actors_shared",
  "frc42_dispatch",
@@ -2649,7 +2649,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_eam_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "fil_actor_evm_state",
  "fvm_ipld_encoding",
@@ -2662,7 +2662,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_evm_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2681,7 +2681,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_init_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "anyhow",
  "cid",
@@ -2700,7 +2700,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_market_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "anyhow",
  "cid",
@@ -2726,7 +2726,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_miner_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "anyhow",
  "bitflags 2.9.2",
@@ -2755,7 +2755,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_multisig_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "anyhow",
  "cid",
@@ -2777,7 +2777,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_paych_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2794,7 +2794,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_power_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "anyhow",
  "cid",
@@ -2816,7 +2816,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_reward_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "fil_actors_shared",
  "fvm_ipld_encoding",
@@ -2831,7 +2831,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_system_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2847,7 +2847,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_verifreg_state"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "anyhow",
  "cid",
@@ -2867,7 +2867,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actors_shared"
-version = "22.2.0"
+version = "22.4.0"
 dependencies = [
  "anyhow",
  "cid",
diff --git a/Cargo.toml b/Cargo.toml
index 4965c06b9145..80234cf901b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,23 +68,6 @@ educe = { version = "0.6.0", features = ["Debug"], default-features = false }
 enumflags2 = "0.7"
 ethereum-types = { version = "0.15", features = ["ethbloom"] }
 ez-jsonrpc-types = "0.5"
-# <<<<<<< Updated upstream
-# fil_actor_account_state = { version = "22.4" }
-# fil_actor_cron_state = { version = "22.4" }
-# fil_actor_datacap_state = { version = "22.4" }
-# fil_actor_eam_state = { version = "22.4" }
-# fil_actor_evm_state = { version = "22.4" }
-# fil_actor_init_state = { version = "22.4" }
-# fil_actor_market_state = { version = "22.4" }
-# fil_actor_miner_state = { version = "22.4" }
-# fil_actor_multisig_state = { version = "22.4" }
-# fil_actor_paych_state = { version = "22.4" }
-# fil_actor_power_state = { version = "22.4" }
-# fil_actor_reward_state = { version = "22.4" }
-# fil_actor_system_state = { version = "22.4" }
-# fil_actor_verifreg_state = { version = "22.4" }
-# fil_actors_shared = { version = "22.4", features = ["json"] }
-# =======
 fil_actor_account_state = { path = "../fil-actor-states/actors/account" }
 fil_actor_cron_state = { path = "../fil-actor-states/actors/cron" }
 fil_actor_datacap_state = { path = "../fil-actor-states/actors/datacap" }
@@ -100,7 +83,6 @@ fil_actor_reward_state = { path = "../fil-actor-states/actors/reward" }
 fil_actor_system_state = { path = "../fil-actor-states/actors/system" }
 fil_actor_verifreg_state = { path = "../fil-actor-states/actors/verifreg" }
 fil_actors_shared = { path = "../fil-actor-states/fil_actors_shared", features = ["json"] }
-# >>>>>>> Stashed changes
 flate2 = "1"
 flume = { workspace = true }
 fs_extra = "1"

From eb03d3be3f02e652d7fd3c5c3967aa11ef753910 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 21 Aug 2025 10:19:02 +0200
Subject: [PATCH 26/71] Remove comments

---
 src/rpc/registry/actors/market.rs | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index f5ceaedee2c1..628d43a6584b 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -96,34 +96,6 @@ macro_rules! register_market_versions_12 {
     }};
 }
 
-// var Methods = map[abi.MethodNum]builtin.MethodMeta{
-// 	1: builtin.NewMethodMeta("Constructor", *new(func(*abi.EmptyValue) *abi.EmptyValue)), // Constructor
-// 	2: builtin.NewMethodMeta("AddBalance", *new(func(*address.Address) *abi.EmptyValue)), // AddBalance
-// 	builtin.MustGenerateFRCMethodNum("AddBalance"): builtin.NewMethodMeta("AddBalanceExported", *new(func(*address.Address) *abi.EmptyValue)), // AddBalanceExported
-// 	3: builtin.NewMethodMeta("WithdrawBalance", *new(func(*WithdrawBalanceParams) *abi.TokenAmount)), // WithdrawBalance
-// 	builtin.MustGenerateFRCMethodNum("WithdrawBalance"): builtin.NewMethodMeta("WithdrawBalanceExported", *new(func(*WithdrawBalanceParams) *abi.TokenAmount)), // WithdrawBalanceExported
-// 	4: builtin.NewMethodMeta("PublishStorageDeals", *new(func(*PublishStorageDealsParams) *PublishStorageDealsReturn)), // PublishStorageDeals
-// 	builtin.MustGenerateFRCMethodNum("PublishStorageDeals"): builtin.NewMethodMeta("PublishStorageDealsExported", *new(func(*PublishStorageDealsParams) *PublishStorageDealsReturn)), // PublishStorageDealsExported
-// 	5: builtin.NewMethodMeta("VerifyDealsForActivation", *new(func(*VerifyDealsForActivationParams) *VerifyDealsForActivationReturn)), // VerifyDealsForActivation
-// 	6: builtin.NewMethodMeta("ActivateDeals", *new(func(*ActivateDealsParams) *abi.EmptyValue)),                                       // ActivateDeals
-// 	7: builtin.NewMethodMeta("OnMinerSectorsTerminate", *new(func(*OnMinerSectorsTerminateParams) *abi.EmptyValue)),                   // OnMinerSectorsTerminate
-// 	8: builtin.NewMethodMeta("ComputeDataCommitment", nil),                                                                            // deprecated
-// 	9: builtin.NewMethodMeta("CronTick", *new(func(*abi.EmptyValue) *abi.EmptyValue)),                                                 // CronTick
-// 	builtin.MustGenerateFRCMethodNum("GetBalance"):                builtin.NewMethodMeta("GetBalanceExported", *new(func(*address.Address) *GetBalanceReturn)),                                               // GetBalanceExported
-// 	builtin.MustGenerateFRCMethodNum("GetDealDataCommitment"):     builtin.NewMethodMeta("GetDealDataCommitmentExported", *new(func(*GetDealDataCommitmentParams) *GetDealDataCommitmentReturn)),             // GetDealDataCommitmentExported
-// 	builtin.MustGenerateFRCMethodNum("GetDealClient"):             builtin.NewMethodMeta("GetDealClientExported", *new(func(*GetDealClientParams) *GetDealClientReturn)),                                     // GetDealClientExported
-// 	builtin.MustGenerateFRCMethodNum("GetDealProvider"):           builtin.NewMethodMeta("GetDealProviderExported", *new(func(*GetDealProviderParams) *GetDealProviderReturn)),                               // GetDealProviderExported
-// 	builtin.MustGenerateFRCMethodNum("GetDealLabel"):              builtin.NewMethodMeta("GetDealLabelExported", *new(func(*GetDealLabelParams) *GetDealLabelReturn)),                                        // GetDealLabelExported
-// 	builtin.MustGenerateFRCMethodNum("GetDealTerm"):               builtin.NewMethodMeta("GetDealTermExported", *new(func(*GetDealTermParams) *GetDealTermReturn)),                                           // GetDealTermExported
-// 	builtin.MustGenerateFRCMethodNum("GetDealTotalPrice"):         builtin.NewMethodMeta("GetDealTotalPriceExported", *new(func(*GetDealTotalPriceParams) *GetDealTotalPriceReturn)),                         // GetDealTotalPriceExported
-// 	builtin.MustGenerateFRCMethodNum("GetDealClientCollateral"):   builtin.NewMethodMeta("GetDealClientCollateralExported", *new(func(*GetDealClientCollateralParams) *GetDealClientCollateralReturn)),       // GetDealClientCollateralExported
-// 	builtin.MustGenerateFRCMethodNum("GetDealProviderCollateral"): builtin.NewMethodMeta("GetDealProviderCollateralExported", *new(func(*GetDealProviderCollateralParams) *GetDealProviderCollateralReturn)), // GetDealProviderCollateralExported
-// 	builtin.MustGenerateFRCMethodNum("GetDealVerified"):           builtin.NewMethodMeta("GetDealVerifiedExported", *new(func(*GetDealVerifiedParams) *GetDealVerifiedReturn)),                               // GetDealVerifiedExported
-// 	builtin.MustGenerateFRCMethodNum("GetDealActivation"):         builtin.NewMethodMeta("GetDealActivationExported", *new(func(*GetDealActivationParams) *GetDealActivationReturn)),                         // GetDealActivationExported
-// 	builtin.MustGenerateFRCMethodNum("GetDealSector"):             builtin.NewMethodMeta("GetDealSectorExported", *new(func(*GetDealSectorParams) *GetDealSectorReturn)),                                     // GetDealSectorExported
-// 	builtin.MethodSectorContentChanged:                            builtin.NewMethodMeta("SectorContentChanged", *new(func(*miner.SectorContentChangedParams) *miner.SectorContentChangedReturn)),            // SectorContentChanged
-// 	builtin.MustGenerateFRCMethodNum("SettleDealPayments"):        builtin.NewMethodMeta("SettleDealPaymentsExported", *new(func(*SettleDealPaymentsParams) *SettleDealPaymentsReturn)),                      // SettleDealPaymentsExported
-// }
 macro_rules! register_market_versions_13_to_16 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{

From d073937620e6712b4801df4790ed9201362ea617 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 21 Aug 2025 11:51:59 +0200
Subject: [PATCH 27/71] Add ActivateDeals method for v8-v11

---
 .../methods/market_actor_params.rs            | 43 +++++++++++++++++++
 src/rpc/registry/actors/market.rs             | 10 +++--
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 7b1b24eda599..2366b47a629b 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -532,3 +532,46 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
 }
 
 impl_lotus_json_for_publish_storage_deals_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct ActivateDealsParamsLotusJson {
+    #[schemars(with = "LotusJson<DealID>")]
+    #[serde(with = "crate::lotus_json")]
+    pub deal_ids: Vec<DealID>,
+    pub sector_expiry: ChainEpoch,
+}
+
+macro_rules! impl_lotus_json_for_activate_deals_params {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::ActivateDealsParams {
+                    type LotusJson = ActivateDealsParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            deal_ids: self.deal_ids.into(),
+                            sector_expiry: self.sector_expiry.into_lotus_json(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            deal_ids: json.deal_ids.into(),
+                            sector_expiry: json.sector_expiry.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_activate_deals_params!(8, 9, 10, 11);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 628d43a6584b..d4e9a2f2b048 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -9,8 +9,8 @@ use cid::Cid;
 macro_rules! register_market_versions_8_to_9 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, Method, PublishStorageDealsParams, VerifyDealsForActivationParams,
-            WithdrawBalanceParams,
+            ActivateDealsParams, AddBalanceParams, Method, PublishStorageDealsParams,
+            VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -24,6 +24,7 @@ macro_rules! register_market_versions_8_to_9 {
                     Method::VerifyDealsForActivation,
                     VerifyDealsForActivationParams
                 ),
+                (Method::ActivateDeals, ActivateDealsParams)
             ]
         );
 
@@ -39,8 +40,8 @@ macro_rules! register_market_versions_8_to_9 {
 macro_rules! register_market_versions_10_to_11 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, Method, PublishStorageDealsParams, VerifyDealsForActivationParams,
-            WithdrawBalanceParams,
+            ActivateDealsParams, AddBalanceParams, Method, PublishStorageDealsParams,
+            VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -54,6 +55,7 @@ macro_rules! register_market_versions_10_to_11 {
                     Method::VerifyDealsForActivation,
                     VerifyDealsForActivationParams
                 ),
+                (Method::ActivateDeals, ActivateDealsParams)
             ]
         );
 

From 03ebf869d655dd7c4c82e3c0145c8b399d1a92f4 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 21 Aug 2025 14:19:56 +0200
Subject: [PATCH 28/71] Add BatchActivateDeals method for v12-v16

---
 .../methods/market_actor_params.rs            | 45 +++++++++++++++++++
 src/rpc/registry/actors/market.rs             | 10 +++--
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 2366b47a629b..f3fe0f049c95 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -575,3 +575,48 @@ macro_rules! impl_lotus_json_for_activate_deals_params {
 }
 
 impl_lotus_json_for_activate_deals_params!(8, 9, 10, 11);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct BatchActivateDealsParamsLotusJson {
+    pub sectors: Vec<SectorDealsLotusJson>,
+    pub compute_cid: bool,
+}
+
+macro_rules! impl_lotus_json_for_batch_activate_deals_params {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::BatchActivateDealsParams {
+                    type LotusJson = BatchActivateDealsParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            sectors: self.sectors.into_iter().map(|s| s.into_lotus_json()).collect(),
+                            compute_cid: self.compute_cid.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            sectors: json
+                                .sectors
+                                .into_iter()
+                                .map(|s| fil_actor_market_state::[<v $version>]::SectorDeals::from_lotus_json(s)) // delegate
+                                .collect(),
+                            compute_cid: json.compute_cid.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_batch_activate_deals_params!(12, 13, 14, 15, 16);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index d4e9a2f2b048..fde9a4f13603 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -71,8 +71,8 @@ macro_rules! register_market_versions_10_to_11 {
 macro_rules! register_market_versions_12 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, Method, PublishStorageDealsParams, VerifyDealsForActivationParams,
-            WithdrawBalanceParams,
+            AddBalanceParams, BatchActivateDealsParams, Method, PublishStorageDealsParams,
+            VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -86,6 +86,7 @@ macro_rules! register_market_versions_12 {
                     Method::VerifyDealsForActivation,
                     VerifyDealsForActivationParams
                 ),
+                (Method::BatchActivateDeals, BatchActivateDealsParams)
             ]
         );
 
@@ -101,8 +102,8 @@ macro_rules! register_market_versions_12 {
 macro_rules! register_market_versions_13_to_16 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, Method, PublishStorageDealsParams, VerifyDealsForActivationParams,
-            WithdrawBalanceParams,
+            AddBalanceParams, BatchActivateDealsParams, Method, PublishStorageDealsParams,
+            VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -116,6 +117,7 @@ macro_rules! register_market_versions_13_to_16 {
                     Method::VerifyDealsForActivation,
                     VerifyDealsForActivationParams
                 ),
+                (Method::BatchActivateDeals, BatchActivateDealsParams)
             ]
         );
 

From 4d0087b816a8dce0009621920b859a5f7e8394ba Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:54:17 +0200
Subject: [PATCH 29/71] Add OnMinerSectorsTerminate method for all versions

---
 .../methods/market_actor_params.rs            | 83 +++++++++++++++++++
 src/rpc/registry/actors/market.rs             | 40 ++++++---
 2 files changed, 111 insertions(+), 12 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index f3fe0f049c95..05d0d93f9315 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -10,6 +10,7 @@ use crate::shim::econ::TokenAmount;
 use crate::shim::piece::PaddedPieceSize;
 use crate::shim::sector::RegisteredSealProof;
 use crate::shim::sector::SectorNumber;
+use fil_actors_shared::fvm_ipld_bitfield::BitField;
 
 use ::cid::Cid;
 // use fvm_ipld_encoding::RawBytes;
@@ -620,3 +621,85 @@ macro_rules! impl_lotus_json_for_batch_activate_deals_params {
 }
 
 impl_lotus_json_for_batch_activate_deals_params!(12, 13, 14, 15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct OnMinerSectorsTerminateParamsLotusJsonV8 {
+    pub epoch: ChainEpoch,
+    #[schemars(with = "LotusJson<DealID>")]
+    #[serde(with = "crate::lotus_json")]
+    pub deal_ids: Vec<DealID>,
+}
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct OnMinerSectorsTerminateParamsLotusJsonV13 {
+    pub epoch: ChainEpoch,
+    #[schemars(with = "LotusJson<BitField>")]
+    #[serde(with = "crate::lotus_json")]
+    pub sectors: BitField,
+}
+
+macro_rules! impl_lotus_json_for_on_miner_sectors_terminate_params {
+    (OnMinerSectorsTerminateParamsLotusJsonV8: $($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::OnMinerSectorsTerminateParams {
+                    type LotusJson = OnMinerSectorsTerminateParamsLotusJsonV8;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            epoch: self.epoch.into(),
+                            deal_ids: self.deal_ids.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            epoch: json.epoch.into(),
+                            deal_ids: json.deal_ids.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+    (OnMinerSectorsTerminateParamsLotusJsonV13: $($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::OnMinerSectorsTerminateParams {
+                    type LotusJson = OnMinerSectorsTerminateParamsLotusJsonV13;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            epoch: self.epoch.into(),
+                            sectors: self.sectors.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            epoch: json.epoch.into(),
+                            sectors: json.sectors.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_on_miner_sectors_terminate_params!(OnMinerSectorsTerminateParamsLotusJsonV8: 8, 9, 10, 11, 12);
+impl_lotus_json_for_on_miner_sectors_terminate_params!(OnMinerSectorsTerminateParamsLotusJsonV13: 13, 14, 15, 16);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index fde9a4f13603..641572115518 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -9,8 +9,8 @@ use cid::Cid;
 macro_rules! register_market_versions_8_to_9 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            ActivateDealsParams, AddBalanceParams, Method, PublishStorageDealsParams,
-            VerifyDealsForActivationParams, WithdrawBalanceParams,
+            ActivateDealsParams, AddBalanceParams, Method, OnMinerSectorsTerminateParams,
+            PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -24,7 +24,11 @@ macro_rules! register_market_versions_8_to_9 {
                     Method::VerifyDealsForActivation,
                     VerifyDealsForActivationParams
                 ),
-                (Method::ActivateDeals, ActivateDealsParams)
+                (Method::ActivateDeals, ActivateDealsParams),
+                (
+                    Method::OnMinerSectorsTerminate,
+                    OnMinerSectorsTerminateParams
+                )
             ]
         );
 
@@ -40,8 +44,8 @@ macro_rules! register_market_versions_8_to_9 {
 macro_rules! register_market_versions_10_to_11 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            ActivateDealsParams, AddBalanceParams, Method, PublishStorageDealsParams,
-            VerifyDealsForActivationParams, WithdrawBalanceParams,
+            ActivateDealsParams, AddBalanceParams, Method, OnMinerSectorsTerminateParams,
+            PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -55,7 +59,11 @@ macro_rules! register_market_versions_10_to_11 {
                     Method::VerifyDealsForActivation,
                     VerifyDealsForActivationParams
                 ),
-                (Method::ActivateDeals, ActivateDealsParams)
+                (Method::ActivateDeals, ActivateDealsParams),
+                (
+                    Method::OnMinerSectorsTerminate,
+                    OnMinerSectorsTerminateParams
+                )
             ]
         );
 
@@ -71,8 +79,8 @@ macro_rules! register_market_versions_10_to_11 {
 macro_rules! register_market_versions_12 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, BatchActivateDealsParams, Method, PublishStorageDealsParams,
-            VerifyDealsForActivationParams, WithdrawBalanceParams,
+            AddBalanceParams, BatchActivateDealsParams, Method, OnMinerSectorsTerminateParams,
+            PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -86,7 +94,11 @@ macro_rules! register_market_versions_12 {
                     Method::VerifyDealsForActivation,
                     VerifyDealsForActivationParams
                 ),
-                (Method::BatchActivateDeals, BatchActivateDealsParams)
+                (Method::BatchActivateDeals, BatchActivateDealsParams),
+                (
+                    Method::OnMinerSectorsTerminate,
+                    OnMinerSectorsTerminateParams
+                )
             ]
         );
 
@@ -102,8 +114,8 @@ macro_rules! register_market_versions_12 {
 macro_rules! register_market_versions_13_to_16 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, BatchActivateDealsParams, Method, PublishStorageDealsParams,
-            VerifyDealsForActivationParams, WithdrawBalanceParams,
+            AddBalanceParams, BatchActivateDealsParams, Method, OnMinerSectorsTerminateParams,
+            PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -117,7 +129,11 @@ macro_rules! register_market_versions_13_to_16 {
                     Method::VerifyDealsForActivation,
                     VerifyDealsForActivationParams
                 ),
-                (Method::BatchActivateDeals, BatchActivateDealsParams)
+                (Method::BatchActivateDeals, BatchActivateDealsParams),
+                (
+                    Method::OnMinerSectorsTerminate,
+                    OnMinerSectorsTerminateParams
+                )
             ]
         );
 

From 60493f7bfce113c9049b0c5a28141e719881eaf5 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Fri, 22 Aug 2025 18:51:06 +0200
Subject: [PATCH 30/71] Add OnMinerSectorsTerminate method for v8 to v11

---
 .../methods/market_actor_params.rs            | 86 +++++++++++++++++++
 src/rpc/registry/actors/market.rs             | 16 ++--
 2 files changed, 96 insertions(+), 6 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 05d0d93f9315..de204abfdf24 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -703,3 +703,89 @@ macro_rules! impl_lotus_json_for_on_miner_sectors_terminate_params {
 
 impl_lotus_json_for_on_miner_sectors_terminate_params!(OnMinerSectorsTerminateParamsLotusJsonV8: 8, 9, 10, 11, 12);
 impl_lotus_json_for_on_miner_sectors_terminate_params!(OnMinerSectorsTerminateParamsLotusJsonV13: 13, 14, 15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+pub struct SectorDataSpecLotusJson {
+    #[schemars(with = "LotusJson<DealID>")]
+    #[serde(with = "crate::lotus_json")]
+    pub deal_ids: Vec<DealID>,
+    #[schemars(with = "LotusJson<RegisteredSealProof>")]
+    #[serde(with = "crate::lotus_json")]
+    pub sector_type: RegisteredSealProof,
+}
+
+macro_rules! impl_lotus_json_for_sector_data_spec {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::SectorDataSpec {
+                    type LotusJson = SectorDataSpecLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            deal_ids: self.deal_ids.into(),
+                            sector_type: self.sector_type.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            deal_ids: json.deal_ids.into(),
+                            sector_type: json.sector_type.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_sector_data_spec!(8, 9, 10, 11);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct ComputeDataCommitmentParamsLotusJson {
+    pub inputs: Vec<SectorDataSpecLotusJson>,
+}
+
+macro_rules! impl_lotus_json_for_compute_data_commitment_params {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::ComputeDataCommitmentParams {
+                    type LotusJson = ComputeDataCommitmentParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                           inputs: self.inputs.into_iter().map(|s| s.into_lotus_json()).collect(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            inputs: json
+                                .inputs
+                                .into_iter()
+                                .map(|s| fil_actor_market_state::[<v $version>]::SectorDataSpec::from_lotus_json(s)) // delegate
+                                .collect(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_compute_data_commitment_params!(8, 9, 10, 11);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 641572115518..8e2a1ef399d4 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -9,8 +9,9 @@ use cid::Cid;
 macro_rules! register_market_versions_8_to_9 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            ActivateDealsParams, AddBalanceParams, Method, OnMinerSectorsTerminateParams,
-            PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
+            ActivateDealsParams, AddBalanceParams, ComputeDataCommitmentParams, Method,
+            OnMinerSectorsTerminateParams, PublishStorageDealsParams,
+            VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -28,7 +29,8 @@ macro_rules! register_market_versions_8_to_9 {
                 (
                     Method::OnMinerSectorsTerminate,
                     OnMinerSectorsTerminateParams
-                )
+                ),
+                (Method::ComputeDataCommitment, ComputeDataCommitmentParams)
             ]
         );
 
@@ -44,8 +46,9 @@ macro_rules! register_market_versions_8_to_9 {
 macro_rules! register_market_versions_10_to_11 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            ActivateDealsParams, AddBalanceParams, Method, OnMinerSectorsTerminateParams,
-            PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
+            ActivateDealsParams, AddBalanceParams, ComputeDataCommitmentParams, Method,
+            OnMinerSectorsTerminateParams, PublishStorageDealsParams,
+            VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -63,7 +66,8 @@ macro_rules! register_market_versions_10_to_11 {
                 (
                     Method::OnMinerSectorsTerminate,
                     OnMinerSectorsTerminateParams
-                )
+                ),
+                (Method::ComputeDataCommitment, ComputeDataCommitmentParams)
             ]
         );
 

From 8b4d3296deb6a3415cefdfae6a21b7098a9f4905 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Mon, 25 Aug 2025 12:15:17 +0200
Subject: [PATCH 31/71] Add exported methods (wip)

---
 .../methods/market_actor_params.rs            | 40 ++++++++++
 src/rpc/registry/actors/market.rs             | 74 +++++++++++++++++--
 2 files changed, 107 insertions(+), 7 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index de204abfdf24..1f3832c80796 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -789,3 +789,43 @@ macro_rules! impl_lotus_json_for_compute_data_commitment_params {
 }
 
 impl_lotus_json_for_compute_data_commitment_params!(8, 9, 10, 11);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct DealQueryParamsLotusJson {
+    #[schemars(with = "LotusJson<DealID>")]
+    #[serde(with = "crate::lotus_json")]
+    pub id: DealID,
+}
+
+macro_rules! impl_lotus_json_for_deal_query_params {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::DealQueryParams {
+                    type LotusJson = DealQueryParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            id: self.id.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            id: json.id.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_deal_query_params!(10, 11, 12, 13, 14, 15, 16);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 8e2a1ef399d4..924d6864d7d8 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::rpc::registry::methods_reg::{MethodRegistry, register_actor_methods};
+use crate::shim::address::Address;
 use crate::shim::message::MethodNum;
 use anyhow::Result;
 use cid::Cid;
@@ -46,9 +47,9 @@ macro_rules! register_market_versions_8_to_9 {
 macro_rules! register_market_versions_10_to_11 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            ActivateDealsParams, AddBalanceParams, ComputeDataCommitmentParams, Method,
-            OnMinerSectorsTerminateParams, PublishStorageDealsParams,
-            VerifyDealsForActivationParams, WithdrawBalanceParams,
+            ActivateDealsParams, AddBalanceParams, ComputeDataCommitmentParams,
+            GetDealDataCommitmentParams, Method, OnMinerSectorsTerminateParams,
+            PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -77,14 +78,34 @@ macro_rules! register_market_versions_10_to_11 {
             $code_cid,
             [(Method::Constructor, empty), (Method::CronTick, empty),]
         );
+
+        // Register exported methods
+        register_actor_methods!(
+            $registry,
+            $code_cid,
+            [
+                (Method::AddBalanceExported, AddBalanceParams),
+                (Method::WithdrawBalanceExported, WithdrawBalanceParams),
+                (
+                    Method::PublishStorageDealsExported,
+                    PublishStorageDealsParams
+                ),
+                (Method::GetBalanceExported, Address),
+                (
+                    Method::GetDealDataCommitmentExported,
+                    GetDealDataCommitmentParams
+                ),
+            ]
+        );
     }};
 }
 
 macro_rules! register_market_versions_12 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, BatchActivateDealsParams, Method, OnMinerSectorsTerminateParams,
-            PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
+            AddBalanceParams, BatchActivateDealsParams, GetDealDataCommitmentParams, Method,
+            OnMinerSectorsTerminateParams, PublishStorageDealsParams,
+            VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -112,14 +133,34 @@ macro_rules! register_market_versions_12 {
             $code_cid,
             [(Method::Constructor, empty), (Method::CronTick, empty),]
         );
+
+        // Register exported methods
+        register_actor_methods!(
+            $registry,
+            $code_cid,
+            [
+                (Method::AddBalanceExported, AddBalanceParams),
+                (Method::WithdrawBalanceExported, WithdrawBalanceParams),
+                (
+                    Method::PublishStorageDealsExported,
+                    PublishStorageDealsParams
+                ),
+                (Method::GetBalanceExported, Address),
+                (
+                    Method::GetDealDataCommitmentExported,
+                    GetDealDataCommitmentParams
+                ),
+            ]
+        );
     }};
 }
 
 macro_rules! register_market_versions_13_to_16 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, BatchActivateDealsParams, Method, OnMinerSectorsTerminateParams,
-            PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
+            AddBalanceParams, BatchActivateDealsParams, GetDealDataCommitmentParams, Method,
+            OnMinerSectorsTerminateParams, PublishStorageDealsParams,
+            VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -147,6 +188,25 @@ macro_rules! register_market_versions_13_to_16 {
             $code_cid,
             [(Method::Constructor, empty), (Method::CronTick, empty),]
         );
+
+        // Register exported methods
+        register_actor_methods!(
+            $registry,
+            $code_cid,
+            [
+                (Method::AddBalanceExported, AddBalanceParams),
+                (Method::WithdrawBalanceExported, WithdrawBalanceParams),
+                (
+                    Method::PublishStorageDealsExported,
+                    PublishStorageDealsParams
+                ),
+                (Method::GetBalanceExported, Address),
+                (
+                    Method::GetDealDataCommitmentExported,
+                    GetDealDataCommitmentParams
+                ),
+            ]
+        );
     }};
 }
 

From e1780c6c3371659c8e76c5aaf1d151a16471d9d6 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Mon, 25 Aug 2025 16:46:00 +0200
Subject: [PATCH 32/71] Add more exported methods

---
 src/rpc/registry/actors/market.rs | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 924d6864d7d8..b25c6629cdb5 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -48,7 +48,8 @@ macro_rules! register_market_versions_10_to_11 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
             ActivateDealsParams, AddBalanceParams, ComputeDataCommitmentParams,
-            GetDealDataCommitmentParams, Method, OnMinerSectorsTerminateParams,
+            GetDealClientParams, GetDealDataCommitmentParams, GetDealLabelParams,
+            GetDealProviderParams, GetDealTermParams, Method, OnMinerSectorsTerminateParams,
             PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
@@ -95,6 +96,10 @@ macro_rules! register_market_versions_10_to_11 {
                     Method::GetDealDataCommitmentExported,
                     GetDealDataCommitmentParams
                 ),
+                (Method::GetDealClientExported, GetDealClientParams),
+                (Method::GetDealProviderExported, GetDealProviderParams),
+                (Method::GetDealLabelExported, GetDealLabelParams),
+                (Method::GetDealTermExported, GetDealTermParams)
             ]
         );
     }};
@@ -103,8 +108,9 @@ macro_rules! register_market_versions_10_to_11 {
 macro_rules! register_market_versions_12 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, BatchActivateDealsParams, GetDealDataCommitmentParams, Method,
-            OnMinerSectorsTerminateParams, PublishStorageDealsParams,
+            AddBalanceParams, BatchActivateDealsParams, GetDealClientParams,
+            GetDealDataCommitmentParams, GetDealLabelParams, GetDealProviderParams,
+            GetDealTermParams, Method, OnMinerSectorsTerminateParams, PublishStorageDealsParams,
             VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
@@ -150,6 +156,10 @@ macro_rules! register_market_versions_12 {
                     Method::GetDealDataCommitmentExported,
                     GetDealDataCommitmentParams
                 ),
+                (Method::GetDealClientExported, GetDealClientParams),
+                (Method::GetDealProviderExported, GetDealProviderParams),
+                (Method::GetDealLabelExported, GetDealLabelParams),
+                (Method::GetDealTermExported, GetDealTermParams)
             ]
         );
     }};
@@ -158,8 +168,9 @@ macro_rules! register_market_versions_12 {
 macro_rules! register_market_versions_13_to_16 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, BatchActivateDealsParams, GetDealDataCommitmentParams, Method,
-            OnMinerSectorsTerminateParams, PublishStorageDealsParams,
+            AddBalanceParams, BatchActivateDealsParams, GetDealClientParams,
+            GetDealDataCommitmentParams, GetDealLabelParams, GetDealProviderParams,
+            GetDealTermParams, Method, OnMinerSectorsTerminateParams, PublishStorageDealsParams,
             VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
@@ -205,6 +216,10 @@ macro_rules! register_market_versions_13_to_16 {
                     Method::GetDealDataCommitmentExported,
                     GetDealDataCommitmentParams
                 ),
+                (Method::GetDealClientExported, GetDealClientParams),
+                (Method::GetDealProviderExported, GetDealProviderParams),
+                (Method::GetDealLabelExported, GetDealLabelParams),
+                (Method::GetDealTermExported, GetDealTermParams)
             ]
         );
     }};

From a99c6b6631002970b7d6b78242071f3af3298c21 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Mon, 25 Aug 2025 17:42:56 +0200
Subject: [PATCH 33/71] Add more methods

---
 src/rpc/registry/actors/market.rs | 63 +++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 12 deletions(-)

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index b25c6629cdb5..8db205bf0798 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -4,7 +4,6 @@
 use crate::rpc::registry::methods_reg::{MethodRegistry, register_actor_methods};
 use crate::shim::address::Address;
 use crate::shim::message::MethodNum;
-use anyhow::Result;
 use cid::Cid;
 
 macro_rules! register_market_versions_8_to_9 {
@@ -48,8 +47,10 @@ macro_rules! register_market_versions_10_to_11 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
             ActivateDealsParams, AddBalanceParams, ComputeDataCommitmentParams,
-            GetDealClientParams, GetDealDataCommitmentParams, GetDealLabelParams,
-            GetDealProviderParams, GetDealTermParams, Method, OnMinerSectorsTerminateParams,
+            GetDealActivationParams, GetDealClientCollateralParams, GetDealClientParams,
+            GetDealDataCommitmentParams, GetDealLabelParams, GetDealProviderCollateralParams,
+            GetDealProviderParams, GetDealTermParams, GetDealTotalPriceParams,
+            GetDealVerifiedParams, Method, OnMinerSectorsTerminateParams,
             PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
@@ -99,7 +100,18 @@ macro_rules! register_market_versions_10_to_11 {
                 (Method::GetDealClientExported, GetDealClientParams),
                 (Method::GetDealProviderExported, GetDealProviderParams),
                 (Method::GetDealLabelExported, GetDealLabelParams),
-                (Method::GetDealTermExported, GetDealTermParams)
+                (Method::GetDealTermExported, GetDealTermParams),
+                (Method::GetDealTotalPriceExported, GetDealTotalPriceParams),
+                (
+                    Method::GetDealClientCollateralExported,
+                    GetDealClientCollateralParams
+                ),
+                (
+                    Method::GetDealProviderCollateralExported,
+                    GetDealProviderCollateralParams
+                ),
+                (Method::GetDealVerifiedExported, GetDealVerifiedParams),
+                (Method::GetDealActivationExported, GetDealActivationParams),
             ]
         );
     }};
@@ -108,9 +120,11 @@ macro_rules! register_market_versions_10_to_11 {
 macro_rules! register_market_versions_12 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, BatchActivateDealsParams, GetDealClientParams,
-            GetDealDataCommitmentParams, GetDealLabelParams, GetDealProviderParams,
-            GetDealTermParams, Method, OnMinerSectorsTerminateParams, PublishStorageDealsParams,
+            AddBalanceParams, BatchActivateDealsParams, GetDealActivationParams,
+            GetDealClientCollateralParams, GetDealClientParams, GetDealDataCommitmentParams,
+            GetDealLabelParams, GetDealProviderCollateralParams, GetDealProviderParams,
+            GetDealTermParams, GetDealTotalPriceParams, GetDealVerifiedParams, Method,
+            OnMinerSectorsTerminateParams, PublishStorageDealsParams,
             VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
@@ -159,7 +173,18 @@ macro_rules! register_market_versions_12 {
                 (Method::GetDealClientExported, GetDealClientParams),
                 (Method::GetDealProviderExported, GetDealProviderParams),
                 (Method::GetDealLabelExported, GetDealLabelParams),
-                (Method::GetDealTermExported, GetDealTermParams)
+                (Method::GetDealTermExported, GetDealTermParams),
+                (Method::GetDealTotalPriceExported, GetDealTotalPriceParams),
+                (
+                    Method::GetDealClientCollateralExported,
+                    GetDealClientCollateralParams
+                ),
+                (
+                    Method::GetDealProviderCollateralExported,
+                    GetDealProviderCollateralParams
+                ),
+                (Method::GetDealVerifiedExported, GetDealVerifiedParams),
+                (Method::GetDealActivationExported, GetDealActivationParams),
             ]
         );
     }};
@@ -168,9 +193,11 @@ macro_rules! register_market_versions_12 {
 macro_rules! register_market_versions_13_to_16 {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            AddBalanceParams, BatchActivateDealsParams, GetDealClientParams,
-            GetDealDataCommitmentParams, GetDealLabelParams, GetDealProviderParams,
-            GetDealTermParams, Method, OnMinerSectorsTerminateParams, PublishStorageDealsParams,
+            AddBalanceParams, BatchActivateDealsParams, GetDealActivationParams,
+            GetDealClientCollateralParams, GetDealClientParams, GetDealDataCommitmentParams,
+            GetDealLabelParams, GetDealProviderCollateralParams, GetDealProviderParams,
+            GetDealSectorParams, GetDealTermParams, GetDealTotalPriceParams, GetDealVerifiedParams,
+            Method, OnMinerSectorsTerminateParams, PublishStorageDealsParams,
             VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
@@ -219,7 +246,19 @@ macro_rules! register_market_versions_13_to_16 {
                 (Method::GetDealClientExported, GetDealClientParams),
                 (Method::GetDealProviderExported, GetDealProviderParams),
                 (Method::GetDealLabelExported, GetDealLabelParams),
-                (Method::GetDealTermExported, GetDealTermParams)
+                (Method::GetDealTermExported, GetDealTermParams),
+                (Method::GetDealTotalPriceExported, GetDealTotalPriceParams),
+                (
+                    Method::GetDealClientCollateralExported,
+                    GetDealClientCollateralParams
+                ),
+                (
+                    Method::GetDealProviderCollateralExported,
+                    GetDealProviderCollateralParams
+                ),
+                (Method::GetDealVerifiedExported, GetDealVerifiedParams),
+                (Method::GetDealActivationExported, GetDealActivationParams),
+                (Method::GetDealSectorExported, GetDealSectorParams)
             ]
         );
     }};

From 1af9d776f4e4949073e8584e0f96b57e556dc446 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 26 Aug 2025 12:26:02 +0200
Subject: [PATCH 34/71] Add SettleDealPayments exported method

---
 .../methods/market_actor_params.rs            | 40 +++++++++++++++++++
 src/rpc/registry/actors/market.rs             |  5 ++-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 1f3832c80796..358753872a63 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -829,3 +829,43 @@ macro_rules! impl_lotus_json_for_deal_query_params {
 }
 
 impl_lotus_json_for_deal_query_params!(10, 11, 12, 13, 14, 15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct SettleDealPaymentsParamsLotusJson {
+    #[schemars(with = "LotusJson<BitField>")]
+    #[serde(with = "crate::lotus_json")]
+    pub deal_ids: BitField,
+}
+
+macro_rules! impl_lotus_json_for_settle_deal_payments_params {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::SettleDealPaymentsParams {
+                    type LotusJson = SettleDealPaymentsParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            deal_ids: self.deal_ids.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            deal_ids: json.deal_ids.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_settle_deal_payments_params!(13, 14, 15, 16);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 8db205bf0798..abf5b715671e 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -198,7 +198,7 @@ macro_rules! register_market_versions_13_to_16 {
             GetDealLabelParams, GetDealProviderCollateralParams, GetDealProviderParams,
             GetDealSectorParams, GetDealTermParams, GetDealTotalPriceParams, GetDealVerifiedParams,
             Method, OnMinerSectorsTerminateParams, PublishStorageDealsParams,
-            VerifyDealsForActivationParams, WithdrawBalanceParams,
+            SettleDealPaymentsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
         register_actor_methods!(
@@ -258,7 +258,8 @@ macro_rules! register_market_versions_13_to_16 {
                 ),
                 (Method::GetDealVerifiedExported, GetDealVerifiedParams),
                 (Method::GetDealActivationExported, GetDealActivationParams),
-                (Method::GetDealSectorExported, GetDealSectorParams)
+                (Method::GetDealSectorExported, GetDealSectorParams),
+                (Method::SettleDealPaymentsExported, SettleDealPaymentsParams)
             ]
         );
     }};

From 6956d02e342d5c544665569dc1615cd58672f4a0 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 26 Aug 2025 17:26:10 +0200
Subject: [PATCH 35/71] Add SectorContentChanged exported method

---
 .../methods/miner_change_worker_params.rs     | 150 ++++++++++++++++++
 src/rpc/registry/actors/market.rs             |  39 ++++-
 2 files changed, 182 insertions(+), 7 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/miner_change_worker_params.rs b/src/lotus_json/actor_states/methods/miner_change_worker_params.rs
index bf3fd71253c4..dbfff99ded1f 100644
--- a/src/lotus_json/actor_states/methods/miner_change_worker_params.rs
+++ b/src/lotus_json/actor_states/methods/miner_change_worker_params.rs
@@ -2,8 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 use super::*;
 use crate::shim::address::Address;
+use crate::shim::clock::ChainEpoch;
+use crate::shim::piece::PaddedPieceSize;
+use crate::shim::sector::SectorNumber;
+use fvm_ipld_encoding::RawBytes;
 use paste::paste;
 
+use ::cid::Cid;
+
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct MinerChangeWorkerParamsLotusJson {
@@ -66,3 +72,147 @@ macro_rules!  impl_lotus_json_for_miner_change_worker_param {
 }
 
 impl_lotus_json_for_miner_change_worker_param!(8, 9, 10, 11, 12, 13, 14, 15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct PieceChangeLotusJson {
+    #[schemars(with = "LotusJson<Cid>")]
+    #[serde(with = "crate::lotus_json")]
+    pub data: Cid,
+    #[schemars(with = "LotusJson<PaddedPieceSize>")]
+    #[serde(with = "crate::lotus_json")]
+    pub size: PaddedPieceSize,
+    #[schemars(with = "LotusJson<RawBytes>")]
+    #[serde(with = "crate::lotus_json")]
+    pub payload: RawBytes,
+}
+
+macro_rules! impl_lotus_json_piece_change {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_miner_state::[<v $version>]::PieceChange {
+                    type LotusJson = PieceChangeLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            data: self.data.into(),
+                            size: self.size.into(),
+                            payload: self.payload.into(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            data: json.data.into(),
+                            size: json.size.into(),
+                            payload: json.payload.into(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_piece_change!(13, 14, 15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct SectorChangesLotusJson {
+    #[schemars(with = "LotusJson<Vec<Address>>")]
+    #[serde(with = "crate::lotus_json")]
+    pub sector: SectorNumber,
+    #[schemars(with = "LotusJson<ChainEpoch>")]
+    #[serde(with = "crate::lotus_json")]
+    pub minimum_commitment_epoch: ChainEpoch,
+    pub added: Vec<PieceChangeLotusJson>,
+}
+
+macro_rules! impl_lotus_json_sector_changes {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_miner_state::[<v $version>]::SectorChanges {
+                    type LotusJson = SectorChangesLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            sector: self.sector.into(),
+                            minimum_commitment_epoch: self.minimum_commitment_epoch.into(),
+                            added: self.added.into_iter()
+                                .map(|pc| pc.into_lotus_json())
+                                .collect(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            sector: json.sector.into(),
+                            minimum_commitment_epoch: json.minimum_commitment_epoch.into(),
+                            added: json.added.into_iter()
+                                .map(|pc| fil_actor_miner_state::[<v $version>]::PieceChange::from_lotus_json(pc),)
+                                .collect(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_sector_changes!(13, 14, 15, 16);
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct SectorContentChangedParamsLotusJson {
+    pub sectors: Vec<SectorChangesLotusJson>,
+}
+
+macro_rules! impl_lotus_json_sector_content_changed_params {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_miner_state::[<v $version>]::SectorContentChangedParams {
+                    type LotusJson = SectorContentChangedParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            sectors: self.sectors.into_iter()
+                                .map(|sc| sc.into_lotus_json())
+                                .collect(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            sectors: json.sectors.into_iter()
+                                .map(|sc| fil_actor_miner_state::[<v $version>]::SectorChanges::from_lotus_json(sc),)
+                                .collect(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_sector_content_changed_params!(13, 14, 15, 16);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index abf5b715671e..afdd82ef0edd 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -191,8 +191,8 @@ macro_rules! register_market_versions_12 {
 }
 
 macro_rules! register_market_versions_13_to_16 {
-    ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{
+    ($registry:expr, $code_cid:expr, $market_state_version:path, $miner_state_version:path) => {{
+        use $market_state_version::{
             AddBalanceParams, BatchActivateDealsParams, GetDealActivationParams,
             GetDealClientCollateralParams, GetDealClientParams, GetDealDataCommitmentParams,
             GetDealLabelParams, GetDealProviderCollateralParams, GetDealProviderParams,
@@ -200,6 +200,7 @@ macro_rules! register_market_versions_13_to_16 {
             Method, OnMinerSectorsTerminateParams, PublishStorageDealsParams,
             SettleDealPaymentsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
+        use $miner_state_version::{self, SectorContentChangedParams};
 
         register_actor_methods!(
             $registry,
@@ -259,7 +260,11 @@ macro_rules! register_market_versions_13_to_16 {
                 (Method::GetDealVerifiedExported, GetDealVerifiedParams),
                 (Method::GetDealActivationExported, GetDealActivationParams),
                 (Method::GetDealSectorExported, GetDealSectorParams),
-                (Method::SettleDealPaymentsExported, SettleDealPaymentsParams)
+                (Method::SettleDealPaymentsExported, SettleDealPaymentsParams),
+                (
+                    Method::SectorContentChangedExported,
+                    SectorContentChangedParams
+                )
             ]
         );
     }};
@@ -272,10 +277,30 @@ pub(crate) fn register_actor_methods(registry: &mut MethodRegistry, cid: Cid, ve
         10 => register_market_versions_10_to_11!(registry, cid, fil_actor_market_state::v10),
         11 => register_market_versions_10_to_11!(registry, cid, fil_actor_market_state::v11),
         12 => register_market_versions_12!(registry, cid, fil_actor_market_state::v12),
-        13 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v13),
-        14 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v14),
-        15 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v15),
-        16 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v16),
+        13 => register_market_versions_13_to_16!(
+            registry,
+            cid,
+            fil_actor_market_state::v13,
+            fil_actor_miner_state::v13
+        ),
+        14 => register_market_versions_13_to_16!(
+            registry,
+            cid,
+            fil_actor_market_state::v14,
+            fil_actor_miner_state::v14
+        ),
+        15 => register_market_versions_13_to_16!(
+            registry,
+            cid,
+            fil_actor_market_state::v15,
+            fil_actor_miner_state::v15
+        ),
+        16 => register_market_versions_13_to_16!(
+            registry,
+            cid,
+            fil_actor_market_state::v16,
+            fil_actor_miner_state::v16
+        ),
         _ => {}
     }
 }

From defedc3579c4f6ef59238efa836607bbf474a240 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 27 Aug 2025 10:05:48 +0200
Subject: [PATCH 36/71] Fix compilation issue

---
 src/rpc/registry/actors/market.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index afdd82ef0edd..106645a50183 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -200,7 +200,13 @@ macro_rules! register_market_versions_13_to_16 {
             Method, OnMinerSectorsTerminateParams, PublishStorageDealsParams,
             SettleDealPaymentsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
-        use $miner_state_version::{self, SectorContentChangedParams};
+        // When using a macro variable for a module path in a `use` statement,
+        // Rust can get confused if we write `use $miner_state_version::SectorContentChangedParams;` directly.
+        // Wrapping the imported item in `{ ... }` disambiguates the path for the compiler and ensures
+        // the import works correctly even when `$miner_state_version` expands to a module path.
+        // Also, to avoid rustfmt automatically reformatting this line, we use #[rustfmt::skip].
+        #[rustfmt::skip]
+        use $miner_state_version::{SectorContentChangedParams};
 
         register_actor_methods!(
             $registry,

From 625a955d48ba5cbd7a0374c162527c41d6691843 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 27 Aug 2025 12:39:36 +0200
Subject: [PATCH 37/71] Add a first market actor StateDecodeParams

---
 .../actor_states/methods/market_actor_params.rs   |  2 +-
 src/tool/subcommands/api_cmd/api_compare_tests.rs | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 358753872a63..84439f2613da 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -24,7 +24,7 @@ use std::fmt::Debug;
 #[serde(rename_all = "PascalCase")]
 pub struct WithdrawBalanceParamsLotusJson {
     #[schemars(with = "LotusJson<Address>")]
-    #[serde(with = "crate::lotus_json")]
+    #[serde(with = "crate::lotus_json", rename = "ProviderOrClientAddress")]
     pub provider_or_client: Address,
     #[schemars(with = "LotusJson<TokenAmount>")]
     #[serde(with = "crate::lotus_json")]
diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 1b28f2e57e0e..e39333428ea2 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -1876,6 +1876,7 @@ fn state_decode_params_api_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>
     tests.extend(datacap_actor_state_decode_params_tests(tipset)?);
     tests.extend(multisig_actor_state_decode_params_tests(tipset)?);
     tests.extend(verified_reg_actor_state_decode_params_tests(tipset)?);
+    tests.extend(market_actor_state_decode_params_tests(tipset)?);
 
     Ok(tests)
 }
@@ -2676,6 +2677,20 @@ fn verified_reg_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Resu
     ])
 }
 
+fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>> {
+    let market_actor_withdraw_balance_params = fil_actor_market_state::v16::WithdrawBalanceParams {
+        provider_or_client: Address::new_id(1000).into(),
+        amount: TokenAmount::default().into(),
+    };
+
+    Ok(vec![RpcTest::identity(StateDecodeParams::request((
+        Address::MARKET_ACTOR,
+        fil_actor_market_state::v16::Method::WithdrawBalance as u64,
+        to_vec(&market_actor_withdraw_balance_params)?,
+        tipset.key().into(),
+    ))?)])
+}
+
 fn read_state_api_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>> {
     let tests = vec![
         RpcTest::identity(StateReadState::request((

From 81169bef0a410cdbe88fb67c3b9568fd5787145b Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 27 Aug 2025 15:33:31 +0200
Subject: [PATCH 38/71] Add test for AddBalance method

---
 .../methods/market_actor_params.rs            | 12 +++----
 .../subcommands/api_cmd/api_compare_tests.rs  | 32 +++++++++++++++----
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 84439f2613da..0b54e6206494 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -33,11 +33,11 @@ pub struct WithdrawBalanceParamsLotusJson {
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
-pub struct AddBalanceParamsLotusJson {
+pub struct AddBalanceParamsLotusJson(
     #[schemars(with = "LotusJson<Address>")]
     #[serde(with = "crate::lotus_json")]
-    pub provider_or_client: Address,
-}
+    Address,
+);
 
 macro_rules! impl_lotus_json_for_add_balance_params {
     ($($version:literal),+) => {
@@ -53,14 +53,12 @@ macro_rules! impl_lotus_json_for_add_balance_params {
                     }
 
                     fn into_lotus_json(self) -> Self::LotusJson {
-                        Self::LotusJson {
-                            provider_or_client: self.provider_or_client.into(),
-                        }
+                        AddBalanceParamsLotusJson(self.provider_or_client.into())
                     }
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
-                            provider_or_client: json.provider_or_client.into(),
+                            provider_or_client: json.0.into(),
                         }
                     }
                 }
diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index e39333428ea2..e0a731fcb8df 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2678,17 +2678,37 @@ fn verified_reg_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Resu
 }
 
 fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>> {
+    let market_actor_add_balance_params = fil_actor_market_state::v16::AddBalanceParams {
+        provider_or_client: fvm_shared4::address::Address::new_id(1000),
+    };
     let market_actor_withdraw_balance_params = fil_actor_market_state::v16::WithdrawBalanceParams {
         provider_or_client: Address::new_id(1000).into(),
         amount: TokenAmount::default().into(),
     };
 
-    Ok(vec![RpcTest::identity(StateDecodeParams::request((
-        Address::MARKET_ACTOR,
-        fil_actor_market_state::v16::Method::WithdrawBalance as u64,
-        to_vec(&market_actor_withdraw_balance_params)?,
-        tipset.key().into(),
-    ))?)])
+    // let market_actor_publish_storage_deals_params =
+    //     fil_actor_market_state::v16::PublishStorageDealsParams { deals: vec![] };
+
+    Ok(vec![
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::AddBalance as u64,
+            to_vec(&market_actor_add_balance_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::WithdrawBalance as u64,
+            to_vec(&market_actor_withdraw_balance_params)?,
+            tipset.key().into(),
+        ))?),
+        // RpcTest::identity(StateDecodeParams::request((
+        //     Address::MARKET_ACTOR,
+        //     fil_actor_market_state::v16::Method::PublishStorageDeals as u64,
+        //     to_vec(&market_actor_publish_storage_deals_params)?,
+        //     tipset.key().into(),
+        // ))?),
+    ])
 }
 
 fn read_state_api_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>> {

From 581ac6430f6391d6a024d497597dbe5d1d16830d Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 27 Aug 2025 17:02:56 +0200
Subject: [PATCH 39/71] Add test for OnMinerSectorsTerminate

---
 src/tool/subcommands/api_cmd/api_compare_tests.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index e0a731fcb8df..60885a2c7148 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2689,6 +2689,15 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
     // let market_actor_publish_storage_deals_params =
     //     fil_actor_market_state::v16::PublishStorageDealsParams { deals: vec![] };
 
+    let market_actor_on_miner_sectors_terminate_params =
+        fil_actor_market_state::v16::OnMinerSectorsTerminateParams {
+            epoch: 123,
+            sectors: {
+                let mut bf = BitField::new();
+                bf.set(3);
+                bf
+            },
+        };
     Ok(vec![
         RpcTest::identity(StateDecodeParams::request((
             Address::MARKET_ACTOR,
@@ -2708,6 +2717,12 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
         //     to_vec(&market_actor_publish_storage_deals_params)?,
         //     tipset.key().into(),
         // ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::OnMinerSectorsTerminate as u64,
+            to_vec(&market_actor_on_miner_sectors_terminate_params)?,
+            tipset.key().into(),
+        ))?),
     ])
 }
 

From a2c662d25d680c1b78c1e23c791aaf5082ce7878 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 28 Aug 2025 08:37:40 +0200
Subject: [PATCH 40/71] Add more tests

---
 .../subcommands/api_cmd/api_compare_tests.rs  | 70 ++++++++++++++++---
 1 file changed, 62 insertions(+), 8 deletions(-)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 60885a2c7148..fc410ed85bc2 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -23,6 +23,7 @@ use crate::rpc::types::{ApiTipsetKey, MessageFilter, MessageLookup};
 use crate::rpc::{Permission, prelude::*};
 use crate::shim::actors::MarketActorStateLoad as _;
 use crate::shim::actors::market;
+// use crate::shim::clock::ChainEpoch;
 use crate::shim::executor::Receipt;
 use crate::shim::sector::{SectorSize, StoragePower};
 use crate::shim::{
@@ -2678,6 +2679,49 @@ fn verified_reg_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Resu
 }
 
 fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>> {
+    fn create_deal_proposal(
+        client: fvm_shared4::address::Address,
+        provider: fvm_shared4::address::Address,
+        client_collateral: fvm_shared4::econ::TokenAmount,
+        provider_collateral: fvm_shared4::econ::TokenAmount,
+        start_epoch: fvm_shared4::clock::ChainEpoch,
+        end_epoch: fvm_shared4::clock::ChainEpoch,
+    ) -> fil_actor_market_state::v16::DealProposal {
+        let piece_cid = Cid::default();
+        let piece_size = fvm_shared4::piece::PaddedPieceSize(2048);
+        let storage_price_per_epoch = fvm_shared4::econ::TokenAmount::from_atto(10u8);
+
+        fil_actor_market_state::v16::DealProposal {
+            piece_cid,
+            piece_size,
+            verified_deal: false,
+            client,
+            provider,
+            label: fil_actor_market_state::v16::Label::String("label".to_string()),
+            start_epoch,
+            end_epoch,
+            storage_price_per_epoch,
+            provider_collateral,
+            client_collateral,
+        }
+    }
+    fn create_client_deal_proposal() -> fil_actor_market_state::v16::ClientDealProposal {
+        let proposal = create_deal_proposal(
+            fvm_shared4::address::Address::new_id(1000).into(),
+            fvm_shared4::address::Address::new_id(1000).into(),
+            fvm_shared4::econ::TokenAmount::from_atto(10u8),
+            fvm_shared4::econ::TokenAmount::from_atto(10u8),
+            0,
+            10,
+        );
+        fil_actor_market_state::v16::ClientDealProposal {
+            proposal,
+            client_signature: fvm_shared4::crypto::signature::Signature::new_bls(
+                b"test_signature".to_vec(),
+            ),
+        }
+    }
+
     let market_actor_add_balance_params = fil_actor_market_state::v16::AddBalanceParams {
         provider_or_client: fvm_shared4::address::Address::new_id(1000),
     };
@@ -2686,8 +2730,12 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
         amount: TokenAmount::default().into(),
     };
 
-    // let market_actor_publish_storage_deals_params =
-    //     fil_actor_market_state::v16::PublishStorageDealsParams { deals: vec![] };
+    let market_actor_publish_storage_deals_params =
+        fil_actor_market_state::v16::PublishStorageDealsParams {
+            deals: vec![create_client_deal_proposal()],
+        };
+
+    let market_actor_get_balance_exported_params = Address::new_id(1000);
 
     let market_actor_on_miner_sectors_terminate_params =
         fil_actor_market_state::v16::OnMinerSectorsTerminateParams {
@@ -2711,18 +2759,24 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_withdraw_balance_params)?,
             tipset.key().into(),
         ))?),
-        // RpcTest::identity(StateDecodeParams::request((
-        //     Address::MARKET_ACTOR,
-        //     fil_actor_market_state::v16::Method::PublishStorageDeals as u64,
-        //     to_vec(&market_actor_publish_storage_deals_params)?,
-        //     tipset.key().into(),
-        // ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::PublishStorageDeals as u64,
+            to_vec(&market_actor_publish_storage_deals_params)?,
+            tipset.key().into(),
+        ))?),
         RpcTest::identity(StateDecodeParams::request((
             Address::MARKET_ACTOR,
             fil_actor_market_state::v16::Method::OnMinerSectorsTerminate as u64,
             to_vec(&market_actor_on_miner_sectors_terminate_params)?,
             tipset.key().into(),
         ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetBalanceExported as u64,
+            to_vec(&market_actor_get_balance_exported_params)?,
+            tipset.key().into(),
+        ))?),
     ])
 }
 

From 03a7148a310ba02dac3927758c6c75cf6241850b Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 28 Aug 2025 09:17:08 +0200
Subject: [PATCH 41/71] Add more api compare tests

---
 .../subcommands/api_cmd/api_compare_tests.rs  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index fc410ed85bc2..5011ab46ad33 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2735,6 +2735,16 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             deals: vec![create_client_deal_proposal()],
         };
 
+    let market_actor_verify_deals_for_activation_params =
+        fil_actor_market_state::v16::PublishStorageDealsParams {
+            deals: vec![create_client_deal_proposal()],
+        };
+
+    let market_actor_batch_activate_deals_params =
+        fil_actor_market_state::v16::PublishStorageDealsParams {
+            deals: vec![create_client_deal_proposal()],
+        };
+
     let market_actor_get_balance_exported_params = Address::new_id(1000);
 
     let market_actor_on_miner_sectors_terminate_params =
@@ -2759,6 +2769,18 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_withdraw_balance_params)?,
             tipset.key().into(),
         ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::VerifyDealsForActivation as u64,
+            to_vec(&market_actor_verify_deals_for_activation_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::BatchActivateDeals as u64,
+            to_vec(&market_actor_batch_activate_deals_params)?,
+            tipset.key().into(),
+        ))?),
         RpcTest::identity(StateDecodeParams::request((
             Address::MARKET_ACTOR,
             fil_actor_market_state::v16::Method::PublishStorageDeals as u64,

From a3e45d5d53dd394c591b85da92a45006b2c7a76c Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 28 Aug 2025 11:14:03 +0200
Subject: [PATCH 42/71] Add exported method tests

---
 .../subcommands/api_cmd/api_compare_tests.rs  | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 5011ab46ad33..55849095380f 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2745,8 +2745,6 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             deals: vec![create_client_deal_proposal()],
         };
 
-    let market_actor_get_balance_exported_params = Address::new_id(1000);
-
     let market_actor_on_miner_sectors_terminate_params =
         fil_actor_market_state::v16::OnMinerSectorsTerminateParams {
             epoch: 123,
@@ -2756,6 +2754,12 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
                 bf
             },
         };
+
+    let market_actor_get_balance_exported_params = Address::new_id(1000);
+
+    let market_actor_get_deal_data_commitment_params =
+        fil_actor_market_state::v16::DealQueryParams { id: 0 };
+
     Ok(vec![
         RpcTest::identity(StateDecodeParams::request((
             Address::MARKET_ACTOR,
@@ -2793,12 +2797,36 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_on_miner_sectors_terminate_params)?,
             tipset.key().into(),
         ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::AddBalanceExported as u64,
+            to_vec(&market_actor_get_balance_exported_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::WithdrawBalanceExported as u64,
+            to_vec(&market_actor_withdraw_balance_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::PublishStorageDealsExported as u64,
+            to_vec(&market_actor_publish_storage_deals_params)?,
+            tipset.key().into(),
+        ))?),
         RpcTest::identity(StateDecodeParams::request((
             Address::MARKET_ACTOR,
             fil_actor_market_state::v16::Method::GetBalanceExported as u64,
             to_vec(&market_actor_get_balance_exported_params)?,
             tipset.key().into(),
         ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetDealDataCommitmentExported as u64,
+            to_vec(&market_actor_get_deal_data_commitment_params)?,
+            tipset.key().into(),
+        ))?),
     ])
 }
 

From d2decaf81a3e681aa2e658ecfdd5c488530dfbf9 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 28 Aug 2025 11:24:10 +0200
Subject: [PATCH 43/71] Add more exported method tests

---
 .../subcommands/api_cmd/api_compare_tests.rs  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 55849095380f..826ad92cc182 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2827,6 +2827,60 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_get_deal_data_commitment_params)?,
             tipset.key().into(),
         ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetDealClientExported as u64,
+            to_vec(&market_actor_get_deal_data_commitment_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetDealProviderExported as u64,
+            to_vec(&market_actor_get_deal_data_commitment_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetDealLabelExported as u64,
+            to_vec(&market_actor_get_deal_data_commitment_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetDealTermExported as u64,
+            to_vec(&market_actor_get_deal_data_commitment_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetDealTotalPriceExported as u64,
+            to_vec(&market_actor_get_deal_data_commitment_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetDealClientCollateralExported as u64,
+            to_vec(&market_actor_get_deal_data_commitment_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetDealProviderCollateralExported as u64,
+            to_vec(&market_actor_get_deal_data_commitment_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetDealVerifiedExported as u64,
+            to_vec(&market_actor_get_deal_data_commitment_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetDealActivationExported as u64,
+            to_vec(&market_actor_get_deal_data_commitment_params)?,
+            tipset.key().into(),
+        ))?),
     ])
 }
 

From e7f44d9b9818b72e493b921b8d43ae1de6d02bd1 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Mon, 1 Sep 2025 17:09:08 +0000
Subject: [PATCH 44/71] Fix incorrect type

---
 src/tool/subcommands/api_cmd/api_compare_tests.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index dc6122f478df..72de4d59abd2 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2740,6 +2740,15 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
         }
     }
 
+    fn create_sector_deals() -> fil_actor_market_state::v16::SectorDeals {
+        fil_actor_market_state::v16::SectorDeals {
+            sector_number: 1,
+            sector_type: fvm_shared4::sector::RegisteredSealProof::StackedDRG2KiBV1,
+            sector_expiry: 100,
+            deal_ids: vec![0, 1],
+        }
+    }
+
     let market_actor_add_balance_params = fil_actor_market_state::v16::AddBalanceParams {
         provider_or_client: fvm_shared4::address::Address::new_id(1000),
     };
@@ -2754,8 +2763,8 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
         };
 
     let market_actor_verify_deals_for_activation_params =
-        fil_actor_market_state::v16::PublishStorageDealsParams {
-            deals: vec![create_client_deal_proposal()],
+        fil_actor_market_state::v16::VerifyDealsForActivationParams {
+            sectors: vec![create_sector_deals()],
         };
 
     let market_actor_batch_activate_deals_params =

From 4d83566fb2569f8513961c536b79ec10e05ea313 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Mon, 1 Sep 2025 20:04:18 +0000
Subject: [PATCH 45/71] Fix test

---
 Cargo.lock                                    | 30 -------------------
 Cargo.toml                                    | 30 +++++++++----------
 .../methods/market_actor_params.rs            | 16 ++++------
 .../subcommands/api_cmd/api_compare_tests.rs  |  1 -
 4 files changed, 20 insertions(+), 57 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 758ca09b513f..d50d79c17524 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2626,8 +2626,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_account_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b2a4996d6e0b3528ea2ec519202d7f2a1eb35505b60533d6cbb0cdae303cbd0"
 dependencies = [
  "frc42_dispatch",
  "frc42_macros",
@@ -2643,8 +2641,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_cron_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "184a20b927a6c532012f36693725897c99b7f5b08d944f1a186c0e0f36ebdd83"
 dependencies = [
  "fvm_ipld_encoding",
  "fvm_shared 2.11.2",
@@ -2658,8 +2654,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_datacap_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2896c5058151cda8d4edeb9f7e1d54c096174bfed5ef2191c8c801fff9293d"
 dependencies = [
  "fil_actors_shared",
  "frc42_dispatch",
@@ -2679,8 +2673,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_eam_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854af28510a8353686827f5d57f9db307547e0901d604a5eab874f823903ccbf"
 dependencies = [
  "fil_actor_evm_state",
  "fvm_ipld_encoding",
@@ -2694,8 +2686,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_evm_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aefe23ae7291e0f9290596cd72eeb18b916a10553f84ba9cd26a0424e50db8b5"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2715,8 +2705,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_init_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0951bf0cb2dd89046ed1d8dace3d356512862a65999460135c398d01c9976aad"
 dependencies = [
  "anyhow",
  "cid",
@@ -2735,8 +2723,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_market_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "204c9a9be1a2f9ebe5012636c91c1448065bb67cfd91d73d1b4dff05f14921bd"
 dependencies = [
  "anyhow",
  "cid",
@@ -2763,8 +2749,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_miner_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10aa2a1a222766eff519d2433b657099aaddb68aed2fe63f500f44a51fcb9a60"
 dependencies = [
  "anyhow",
  "bitflags 2.9.2",
@@ -2794,8 +2778,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_multisig_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41614f0d4ea3b57d7671d4b57953c09ea46b7dec2965f12ccfa8eecc2ad8e59"
 dependencies = [
  "anyhow",
  "cid",
@@ -2818,8 +2800,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_paych_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58daffa9bdaf482e72bb4cf9b72e00ae9f61222f4a34f110fbb048cf855e5b24"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2837,8 +2817,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_power_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f64c1fde1dbb4fe1d3aea6db888136ce4789b7b6b02c56a58cd555f148e5a4f"
 dependencies = [
  "anyhow",
  "cid",
@@ -2861,8 +2839,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_reward_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd5f7fec0f282b76253041c795a0c0acfc9337800dc4e55e4d7997e1f4217fe"
 dependencies = [
  "fil_actors_shared",
  "fvm_ipld_encoding",
@@ -2878,8 +2854,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_system_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91c555f8d95cca4a6a369e69eeb94c2d7705b306bc9bfcb9187b20b8d9db3e9b"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2896,8 +2870,6 @@ dependencies = [
 [[package]]
 name = "fil_actor_verifreg_state"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f29bc35deabd5070f58835a21fcebf6ff87d87cd84382c009ef093cd4b2095"
 dependencies = [
  "anyhow",
  "cid",
@@ -2918,8 +2890,6 @@ dependencies = [
 [[package]]
 name = "fil_actors_shared"
 version = "23.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa6a3bf8ba4a694da4097db462cf487252a67d3dc727e8358428d95c90b56d8"
 dependencies = [
  "anyhow",
  "cid",
diff --git a/Cargo.toml b/Cargo.toml
index de7a3235bd1e..e8d3bd80f880 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,21 +68,21 @@ educe = { version = "0.6.0", features = ["Debug"], default-features = false }
 enumflags2 = "0.7"
 ethereum-types = { version = "0.15", features = ["ethbloom"] }
 ez-jsonrpc-types = "0.5"
-fil_actor_account_state = { version = "23" }
-fil_actor_cron_state = { version = "23" }
-fil_actor_datacap_state = { version = "23" }
-fil_actor_eam_state = { version = "23" }
-fil_actor_evm_state = { version = "23" }
-fil_actor_init_state = { version = "23" }
-fil_actor_market_state = { version = "23" }
-fil_actor_miner_state = { version = "23" }
-fil_actor_multisig_state = { version = "23" }
-fil_actor_paych_state = { version = "23" }
-fil_actor_power_state = { version = "23" }
-fil_actor_reward_state = { version = "23" }
-fil_actor_system_state = { version = "23" }
-fil_actor_verifreg_state = { version = "23" }
-fil_actors_shared = { version = "23", features = ["json"] }
+fil_actor_account_state = { path = "../fil-actor-states/actors/account" }
+fil_actor_cron_state = { path = "../fil-actor-states/actors/cron" }
+fil_actor_datacap_state = { path = "../fil-actor-states/actors/datacap" }
+fil_actor_eam_state = { path = "../fil-actor-states/actors/eam" }
+fil_actor_evm_state = { path = "../fil-actor-states/actors/evm" }
+fil_actor_init_state = { path = "../fil-actor-states/actors/init" }
+fil_actor_market_state = { path = "../fil-actor-states/actors/market" }
+fil_actor_miner_state = { path = "../fil-actor-states/actors/miner" }
+fil_actor_multisig_state = { path = "../fil-actor-states/actors/multisig" }
+fil_actor_paych_state = { path = "../fil-actor-states/actors/paych" }
+fil_actor_power_state = { path = "../fil-actor-states/actors/power" }
+fil_actor_reward_state = { path = "../fil-actor-states/actors/reward" }
+fil_actor_system_state = { path = "../fil-actor-states/actors/system" }
+fil_actor_verifreg_state = { path = "../fil-actor-states/actors/verifreg" }
+fil_actors_shared = { path = "../fil-actor-states/fil_actors_shared", features = ["json"] }
 flate2 = "1"
 flume = { workspace = true }
 fs_extra = "1"
diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 0b54e6206494..9258ade97089 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -373,21 +373,19 @@ impl_lotus_json_for_publish_storage_deals_params!(PublishStorageDealsParamsV4Lot
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct SectorDealsLotusJson {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub sector_number: Option<SectorNumber>,
     #[schemars(with = "LotusJson<RegisteredSealProof>")]
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(with = "crate::lotus_json")]
     pub sector_type: Option<RegisteredSealProof>,
     pub sector_expiry: ChainEpoch,
     #[schemars(with = "LotusJson<DealID>")]
-    #[serde(with = "crate::lotus_json")]
+    #[serde(with = "crate::lotus_json", rename = "DealIDs")]
     pub deal_ids: Vec<DealID>,
 }
 
 macro_rules! impl_lotus_json_for_sector_deals {
     // Handling version where both `sector_number` and `sector_type` should be None (v8)
-    ($type_suffix:path: no_sector_number: no_sector_type: $($version:literal),+) => {
+    ($type_suffix:path: no_sector_type: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::SectorDeals {
@@ -401,7 +399,6 @@ macro_rules! impl_lotus_json_for_sector_deals {
 
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
-                            sector_number: None,
                             sector_type: None,
                             sector_expiry: self.sector_expiry.into_lotus_json(),
                             deal_ids: self.deal_ids.into(),
@@ -419,7 +416,7 @@ macro_rules! impl_lotus_json_for_sector_deals {
         )+
     };
     // Handling versions where `sector_number` should be None (v9, v10, v11, v12)
-    ($type_suffix:path: no_sector_number: $($version:literal),+) => {
+    ($type_suffix:path: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::SectorDeals {
@@ -433,7 +430,6 @@ macro_rules! impl_lotus_json_for_sector_deals {
 
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
-                            sector_number: None,
                             sector_type: Some(self.sector_type.into()),
                             sector_expiry: self.sector_expiry.into_lotus_json(),
                             deal_ids: self.deal_ids.into(),
@@ -465,7 +461,6 @@ macro_rules! impl_lotus_json_for_sector_deals {
 
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
-                            sector_number: Some(self.sector_number.into_lotus_json()),
                             sector_type: Some(self.sector_type.into()),
                             sector_expiry: self.sector_expiry.into_lotus_json(),
                             deal_ids: self.deal_ids.into(),
@@ -474,7 +469,6 @@ macro_rules! impl_lotus_json_for_sector_deals {
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
-                            sector_number: json.sector_number.unwrap_or_default(),
                             sector_type: json.sector_type.unwrap_or(RegisteredSealProof::invalid()).into(),
                             sector_expiry: json.sector_expiry.into(),
                             deal_ids: json.deal_ids.into(),
@@ -486,8 +480,8 @@ macro_rules! impl_lotus_json_for_sector_deals {
     };
 }
 
-impl_lotus_json_for_sector_deals!(fvm_shared2::sector: no_sector_number: no_sector_type: 8);
-impl_lotus_json_for_sector_deals!(fvm_shared3::sector: no_sector_number: 9, 10, 11, 12);
+impl_lotus_json_for_sector_deals!(fvm_shared2::sector: no_sector_type: 8);
+impl_lotus_json_for_sector_deals!(fvm_shared3::sector: 9, 10, 11, 12);
 impl_lotus_json_for_sector_deals!(fvm_shared4::sector: 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 72de4d59abd2..4722a08633ec 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2742,7 +2742,6 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
 
     fn create_sector_deals() -> fil_actor_market_state::v16::SectorDeals {
         fil_actor_market_state::v16::SectorDeals {
-            sector_number: 1,
             sector_type: fvm_shared4::sector::RegisteredSealProof::StackedDRG2KiBV1,
             sector_expiry: 100,
             deal_ids: vec![0, 1],

From bd818c0dd1e009da43cff2bf5dd008c8e980c29a Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Mon, 1 Sep 2025 20:24:31 +0000
Subject: [PATCH 46/71] Fix lint errors

---
 src/lotus_json/actor_states/methods/market_actor_params.rs | 1 -
 src/lotus_json/padded_piece_size.rs                        | 2 +-
 src/tool/subcommands/api_cmd/api_compare_tests.rs          | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 9258ade97089..75f8105d3ae5 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -4,7 +4,6 @@
 use super::*;
 use crate::shim::address::Address;
 use crate::shim::clock::ChainEpoch;
-use crate::shim::crypto::{Signature, SignatureType};
 use crate::shim::deal::DealID;
 use crate::shim::econ::TokenAmount;
 use crate::shim::piece::PaddedPieceSize;
diff --git a/src/lotus_json/padded_piece_size.rs b/src/lotus_json/padded_piece_size.rs
index 45431d76bc67..ac6970d3834b 100644
--- a/src/lotus_json/padded_piece_size.rs
+++ b/src/lotus_json/padded_piece_size.rs
@@ -21,6 +21,6 @@ impl HasLotusJson for PaddedPieceSize {
     }
 
     fn from_lotus_json(PaddedPieceSizeLotusJson(inner): Self::LotusJson) -> Self {
-        inner.into()
+        inner
     }
 }
diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 4722a08633ec..92177568800b 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2725,8 +2725,8 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
     }
     fn create_client_deal_proposal() -> fil_actor_market_state::v16::ClientDealProposal {
         let proposal = create_deal_proposal(
-            fvm_shared4::address::Address::new_id(1000).into(),
-            fvm_shared4::address::Address::new_id(1000).into(),
+            fvm_shared4::address::Address::new_id(1000),
+            fvm_shared4::address::Address::new_id(1000),
             fvm_shared4::econ::TokenAmount::from_atto(10u8),
             fvm_shared4::econ::TokenAmount::from_atto(10u8),
             0,

From 972e8f28245dcf4b03649a51276c5914cc0c9af8 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 2 Sep 2025 15:19:18 +0000
Subject: [PATCH 47/71] Fix incorrect rename and type params

---
 .../methods/market_actor_params.rs             |  6 +++---
 .../subcommands/api_cmd/api_compare_tests.rs   | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 75f8105d3ae5..ac281f6ba303 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -148,7 +148,7 @@ impl_lotus_json_for_label!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 pub struct DealProposalLotusJson {
     #[schemars(with = "LotusJson<Cid>")]
     #[serde(with = "crate::lotus_json")]
-    #[serde(rename = "CodeCID")]
+    #[serde(rename = "PieceCID")]
     pub piece_cid: Cid,
     #[schemars(with = "LotusJson<PaddedPieceSize>")]
     #[serde(with = "crate::lotus_json")]
@@ -591,7 +591,7 @@ macro_rules! impl_lotus_json_for_batch_activate_deals_params {
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
                             sectors: self.sectors.into_iter().map(|s| s.into_lotus_json()).collect(),
-                            compute_cid: self.compute_cid.into(),
+                            compute_cid: self.compute_cid,
                         }
                     }
 
@@ -602,7 +602,7 @@ macro_rules! impl_lotus_json_for_batch_activate_deals_params {
                                 .into_iter()
                                 .map(|s| fil_actor_market_state::[<v $version>]::SectorDeals::from_lotus_json(s)) // delegate
                                 .collect(),
-                            compute_cid: json.compute_cid.into(),
+                            compute_cid: json.compute_cid,
                         }
                     }
                 }
diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 92177568800b..7319adbd3bf6 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2767,8 +2767,9 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
         };
 
     let market_actor_batch_activate_deals_params =
-        fil_actor_market_state::v16::PublishStorageDealsParams {
-            deals: vec![create_client_deal_proposal()],
+        fil_actor_market_state::v16::BatchActivateDealsParams {
+            sectors: vec![create_sector_deals()],
+            compute_cid: true,
         };
 
     let market_actor_on_miner_sectors_terminate_params =
@@ -2805,12 +2806,13 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_verify_deals_for_activation_params)?,
             tipset.key().into(),
         ))?),
-        RpcTest::identity(StateDecodeParams::request((
-            Address::MARKET_ACTOR,
-            fil_actor_market_state::v16::Method::BatchActivateDeals as u64,
-            to_vec(&market_actor_batch_activate_deals_params)?,
-            tipset.key().into(),
-        ))?),
+        // TODO: understand why Lotus uses ActivateDeals
+        // RpcTest::identity(StateDecodeParams::request((
+        //     Address::MARKET_ACTOR,
+        //     fil_actor_market_state::v16::Method::BatchActivateDeals as u64,
+        //     to_vec(&market_actor_batch_activate_deals_params)?,
+        //     tipset.key().into(),
+        // ))?),
         RpcTest::identity(StateDecodeParams::request((
             Address::MARKET_ACTOR,
             fil_actor_market_state::v16::Method::PublishStorageDeals as u64,

From e5d5b0a3a4e3d38c067afabfdd8a4e995f9c77a9 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 2 Sep 2025 15:33:06 +0000
Subject: [PATCH 48/71] Comment-out test

---
 src/tool/subcommands/api_cmd/api_compare_tests.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 7319adbd3bf6..2e2014d685c1 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2819,12 +2819,13 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_publish_storage_deals_params)?,
             tipset.key().into(),
         ))?),
-        RpcTest::identity(StateDecodeParams::request((
-            Address::MARKET_ACTOR,
-            fil_actor_market_state::v16::Method::OnMinerSectorsTerminate as u64,
-            to_vec(&market_actor_on_miner_sectors_terminate_params)?,
-            tipset.key().into(),
-        ))?),
+        // TODO: understand why Lotus uses wrong version
+        // RpcTest::identity(StateDecodeParams::request((
+        //     Address::MARKET_ACTOR,
+        //     fil_actor_market_state::v16::Method::OnMinerSectorsTerminate as u64,
+        //     to_vec(&market_actor_on_miner_sectors_terminate_params)?,
+        //     tipset.key().into(),
+        // ))?),
         RpcTest::identity(StateDecodeParams::request((
             Address::MARKET_ACTOR,
             fil_actor_market_state::v16::Method::AddBalanceExported as u64,

From 17bfb7a3989f987c84c09e289766f3a146ae71db Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 2 Sep 2025 16:03:37 +0000
Subject: [PATCH 49/71] Fix DealQueryParams type

---
 .../actor_states/methods/market_actor_params.rs      | 12 +++++-------
 src/tool/subcommands/api_cmd/api_compare_tests.rs    | 12 ++++++------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index ac281f6ba303..b863d2fa3596 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -783,11 +783,11 @@ impl_lotus_json_for_compute_data_commitment_params!(8, 9, 10, 11);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
-pub struct DealQueryParamsLotusJson {
+pub struct DealQueryParamsLotusJson(
     #[schemars(with = "LotusJson<DealID>")]
     #[serde(with = "crate::lotus_json")]
-    pub id: DealID,
-}
+    DealID,
+);
 
 macro_rules! impl_lotus_json_for_deal_query_params {
     ($($version:literal),+) => {
@@ -803,14 +803,12 @@ macro_rules! impl_lotus_json_for_deal_query_params {
                     }
 
                     fn into_lotus_json(self) -> Self::LotusJson {
-                        Self::LotusJson {
-                            id: self.id.into(),
-                        }
+                        DealQueryParamsLotusJson(self.id.into())
                     }
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
-                            id: json.id.into(),
+                            id: json.0.into(),
                         }
                     }
                 }
diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 2e2014d685c1..bfe96fb6fc4d 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2800,6 +2800,12 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_withdraw_balance_params)?,
             tipset.key().into(),
         ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::PublishStorageDeals as u64,
+            to_vec(&market_actor_publish_storage_deals_params)?,
+            tipset.key().into(),
+        ))?),
         RpcTest::identity(StateDecodeParams::request((
             Address::MARKET_ACTOR,
             fil_actor_market_state::v16::Method::VerifyDealsForActivation as u64,
@@ -2813,12 +2819,6 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
         //     to_vec(&market_actor_batch_activate_deals_params)?,
         //     tipset.key().into(),
         // ))?),
-        RpcTest::identity(StateDecodeParams::request((
-            Address::MARKET_ACTOR,
-            fil_actor_market_state::v16::Method::PublishStorageDeals as u64,
-            to_vec(&market_actor_publish_storage_deals_params)?,
-            tipset.key().into(),
-        ))?),
         // TODO: understand why Lotus uses wrong version
         // RpcTest::identity(StateDecodeParams::request((
         //     Address::MARKET_ACTOR,

From 64a3480a390c22ae4b0f11dcd1f986566c68cb0f Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 2 Sep 2025 19:36:30 +0000
Subject: [PATCH 50/71] Add more tests for exported method

---
 .../methods/market_actor_params.rs            | 12 +++++------
 .../subcommands/api_cmd/api_compare_tests.rs  | 21 +++++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index b863d2fa3596..50954780a46e 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -821,11 +821,11 @@ impl_lotus_json_for_deal_query_params!(10, 11, 12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
-pub struct SettleDealPaymentsParamsLotusJson {
+pub struct SettleDealPaymentsParamsLotusJson(
     #[schemars(with = "LotusJson<BitField>")]
     #[serde(with = "crate::lotus_json")]
-    pub deal_ids: BitField,
-}
+    BitField,
+);
 
 macro_rules! impl_lotus_json_for_settle_deal_payments_params {
     ($($version:literal),+) => {
@@ -841,14 +841,12 @@ macro_rules! impl_lotus_json_for_settle_deal_payments_params {
                     }
 
                     fn into_lotus_json(self) -> Self::LotusJson {
-                        Self::LotusJson {
-                            deal_ids: self.deal_ids.into(),
-                        }
+                        SettleDealPaymentsParamsLotusJson(self.deal_ids.into())
                     }
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
-                            deal_ids: json.deal_ids.into(),
+                            deal_ids: json.0.into(),
                         }
                     }
                 }
diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index bfe96fb6fc4d..b552c8a4232e 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2784,6 +2784,15 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
 
     let market_actor_get_balance_exported_params = Address::new_id(1000);
 
+    let market_actor_settle_deal_payments_params =
+        fil_actor_market_state::v16::SettleDealPaymentsParams {
+            deal_ids: {
+                let mut bf = BitField::new();
+                bf.set(42);
+                bf
+            }
+        };
+
     let market_actor_get_deal_data_commitment_params =
         fil_actor_market_state::v16::DealQueryParams { id: 0 };
 
@@ -2910,6 +2919,18 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_get_deal_data_commitment_params)?,
             tipset.key().into(),
         ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::GetDealSectorExported as u64,
+            to_vec(&market_actor_get_deal_data_commitment_params)?,
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::SettleDealPaymentsExported as u64,
+            to_vec(&market_actor_settle_deal_payments_params)?,
+            tipset.key().into(),
+        ))?),
     ])
 }
 

From 6425af1cab24a0baf1e9fef5054e55f1dd00c873 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 2 Sep 2025 20:15:33 +0000
Subject: [PATCH 51/71] Add one more exported method test

---
 .../subcommands/api_cmd/api_compare_tests.rs  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index b552c8a4232e..5e38491f91b8 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2723,6 +2723,7 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             client_collateral,
         }
     }
+
     fn create_client_deal_proposal() -> fil_actor_market_state::v16::ClientDealProposal {
         let proposal = create_deal_proposal(
             fvm_shared4::address::Address::new_id(1000),
@@ -2748,6 +2749,20 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
         }
     }
 
+    fn create_sector_changes() -> fil_actor_miner_state::v16::SectorChanges {
+        let piece_change = fil_actor_miner_state::v16::PieceChange {
+            data: Cid::default(),
+            size: fvm_shared4::piece::PaddedPieceSize(2048),
+            payload: fvm_ipld_encoding::RawBytes::new(vec![0x12, 0x34, 0x56, 0x78]),
+        };
+
+        fil_actor_miner_state::v16::SectorChanges {
+            sector: 2,
+            minimum_commitment_epoch: 0,
+            added: vec![piece_change],
+        }
+    }
+
     let market_actor_add_balance_params = fil_actor_market_state::v16::AddBalanceParams {
         provider_or_client: fvm_shared4::address::Address::new_id(1000),
     };
@@ -2796,6 +2811,12 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
     let market_actor_get_deal_data_commitment_params =
         fil_actor_market_state::v16::DealQueryParams { id: 0 };
 
+    let market_actor_sector_content_changed_params = {
+        fil_actor_miner_state::v16::SectorContentChangedParams {
+            sectors: vec![create_sector_changes()],
+        }
+    };
+
     Ok(vec![
         RpcTest::identity(StateDecodeParams::request((
             Address::MARKET_ACTOR,
@@ -2931,6 +2952,13 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_settle_deal_payments_params)?,
             tipset.key().into(),
         ))?),
+        // TODO: understant why lotus returns Request rejected `500`
+        // RpcTest::identity(StateDecodeParams::request((
+        //     Address::MARKET_ACTOR,
+        //     fil_actor_market_state::v16::Method::SectorContentChangedExported as u64,
+        //     to_vec(&market_actor_sector_content_changed_params)?,
+        //     tipset.key().into(),
+        // ))?),
     ])
 }
 

From b4203408f562a711dcc5b0b9843dcbedc3e870a6 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Tue, 2 Sep 2025 20:41:39 +0000
Subject: [PATCH 52/71] Update comment

---
 src/tool/subcommands/api_cmd/api_compare_tests.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 5e38491f91b8..90ebbce17090 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2952,7 +2952,7 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_settle_deal_payments_params)?,
             tipset.key().into(),
         ))?),
-        // TODO: understant why lotus returns Request rejected `500`
+        // TODO: Create issue, Lotus *[]miner.SectorChanges is not typegen
         // RpcTest::identity(StateDecodeParams::request((
         //     Address::MARKET_ACTOR,
         //     fil_actor_market_state::v16::Method::SectorContentChangedExported as u64,

From 14e2c8fa8d9a215d05c3e4cedd26a520ba54122e Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 3 Sep 2025 15:39:34 +0000
Subject: [PATCH 53/71] Add parameterless methods

---
 src/tool/subcommands/api_cmd/api_compare_tests.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 90ebbce17090..c574641b3c8c 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2856,6 +2856,18 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
         //     to_vec(&market_actor_on_miner_sectors_terminate_params)?,
         //     tipset.key().into(),
         // ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::Constructor as u64,
+            vec![],
+            tipset.key().into(),
+        ))?),
+        RpcTest::identity(StateDecodeParams::request((
+            Address::MARKET_ACTOR,
+            fil_actor_market_state::v16::Method::CronTick as u64,
+            vec![],
+            tipset.key().into(),
+        ))?),
         RpcTest::identity(StateDecodeParams::request((
             Address::MARKET_ACTOR,
             fil_actor_market_state::v16::Method::AddBalanceExported as u64,

From 4ea7a0337d783842368ed30bdfa2ecf2f7beed48 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Wed, 3 Sep 2025 16:12:20 +0000
Subject: [PATCH 54/71] Update lock file

---
 Cargo.lock | 307 ++++++++++++++++++++++++-----------------------------
 1 file changed, 141 insertions(+), 166 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d50d79c17524..12c6f9a45db0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -326,20 +326,15 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.28"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6448dfb3960f0b038e88c781ead1e7eb7929dfc3a71a1336ec9086c00f6d1e75"
+checksum = "977eb15ea9efd848bb8a4a1a2500347ed7f0bf794edf0dc3ddcf439f43d36b23"
 dependencies = [
- "brotli",
  "compression-codecs",
  "compression-core",
- "flate2",
  "futures-core",
- "memchr",
  "pin-project-lite",
  "tokio",
- "zstd",
- "zstd-safe",
 ]
 
 [[package]]
@@ -732,7 +727,7 @@ version = "0.71.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
@@ -754,9 +749,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.2"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
 dependencies = [
  "serde",
 ]
@@ -960,7 +955,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
- "regex-automata 0.4.10",
+ "regex-automata",
  "serde",
 ]
 
@@ -1008,9 +1003,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.11"
+version = "1.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d07aa9a93b00c76f71bc35d598bed923f6d4f3a9ca5c24b7737ae1a292841c0"
+checksum = "dd0b03af37dad7a14518b7691d81acb0f8222604ad3d1b02f6b4bed5188c0cd5"
 dependencies = [
  "serde",
 ]
@@ -1077,7 +1072,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff"
 dependencies = [
  "heck 0.4.1",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "log",
  "proc-macro2",
  "quote",
@@ -1099,10 +1094,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.33"
+version = "1.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ee0f8803222ba5a7e2777dd72ca451868909b1ac410621b676adf07280e9b5f"
+checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -1252,9 +1248,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.45"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc0e74a703892159f5ae7d3aac52c8e6c392f5ae5f359c70b5881d60aaac318"
+checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1262,9 +1258,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.44"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e7f4214277f3c7aa526a59dd3fbe306a370daee1f8b7b8c987069cd8e888a8"
+checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1283,9 +1279,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.45"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"
+checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -1351,25 +1347,23 @@ dependencies = [
 
 [[package]]
 name = "compression-codecs"
-version = "0.4.28"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46cc6539bf1c592cff488b9f253b30bc0ec50d15407c2cf45e27bd8f308d5905"
+checksum = "485abf41ac0c8047c07c87c72c8fb3eb5197f6e9d7ded615dfd1a00ae00a0f64"
 dependencies = [
  "brotli",
  "compression-core",
  "flate2",
- "futures-core",
  "memchr",
- "pin-project-lite",
  "zstd",
  "zstd-safe",
 ]
 
 [[package]]
 name = "compression-core"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2957e823c15bde7ecf1e8b64e537aa03a6be5fda0e2334e99887669e75b12e01"
+checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb"
 
 [[package]]
 name = "concurrent-queue"
@@ -2026,9 +2020,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.4.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
 dependencies = [
  "powerfmt",
  "serde",
@@ -2751,7 +2745,7 @@ name = "fil_actor_miner_state"
 version = "23.0.1"
 dependencies = [
  "anyhow",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "cid",
  "fil_actor_verifreg_state",
  "fil_actors_shared",
@@ -2790,7 +2784,7 @@ dependencies = [
  "fvm_shared 2.11.2",
  "fvm_shared 3.13.2",
  "fvm_shared 4.7.3",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "integer-encoding",
  "num-derive",
  "num-traits",
@@ -2915,6 +2909,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_repr",
+ "strum",
  "thiserror 2.0.16",
  "unsigned-varint 0.8.0",
 ]
@@ -2991,16 +2986,22 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.25"
+version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
 dependencies = [
  "cfg-if",
  "libc",
  "libredox",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650"
+
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -3171,7 +3172,7 @@ dependencies = [
  "human-repr",
  "human_bytes",
  "humantime",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "indicatif",
  "insta",
  "integer-encoding",
@@ -3224,7 +3225,7 @@ dependencies = [
  "rand_distr",
  "rayon",
  "regex",
- "regex-automata 0.4.10",
+ "regex-automata",
  "reqwest",
  "rlimit",
  "rlp",
@@ -3308,9 +3309,9 @@ dependencies = [
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
@@ -3768,9 +3769,9 @@ dependencies = [
 
 [[package]]
 name = "fvm_sdk"
-version = "4.7.2"
+version = "4.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190cbcf7f9ce9183ae1088ad3fbba209e0b7402cdb6338e5625bbc2883f309af"
+checksum = "42d5ef8cdc442a175ec04696adb82953fa28b151a81bd7a67f55f1cfd5af1d8a"
 dependencies = [
  "cid",
  "fvm_ipld_encoding",
@@ -3821,7 +3822,7 @@ checksum = "31281d43c46a37342473ac0eb52d02d725ec9b44706fbce8739dba618eb58324"
 dependencies = [
  "anyhow",
  "arbitrary",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "blake2b_simd",
  "bls-signatures",
  "cid",
@@ -3851,7 +3852,7 @@ checksum = "4d2bef630181cdc25f2522c3fc83a968b42e6b7d3dfa00ed294f6bdb096ad1fa"
 dependencies = [
  "anyhow",
  "arbitrary",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "blake2b_simd",
  "bls-signatures",
  "cid",
@@ -3872,9 +3873,9 @@ dependencies = [
 
 [[package]]
 name = "generator"
-version = "0.8.5"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d18470a76cb7f8ff746cf1f7470914f900252ec36bbc40b569d74b1258446827"
+checksum = "605183a538e3e2a9c1038635cc5c2d194e2ee8fd0d1b66b8349fad7dbacce5a2"
 dependencies = [
  "cc",
  "cfg-if",
@@ -3958,7 +3959,7 @@ dependencies = [
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasi 0.14.3+wasi-0.2.4",
  "wasm-bindgen",
 ]
 
@@ -3979,7 +3980,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 dependencies = [
  "fallible-iterator",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "stable_deref_trait",
 ]
 
@@ -4018,8 +4019,8 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.10",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -4028,7 +4029,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "ignore",
  "walkdir",
 ]
@@ -4070,7 +4071,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4536,9 +4537,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -4619,7 +4620,7 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.10",
+ "regex-automata",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -4676,9 +4677,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.5",
@@ -4744,11 +4745,11 @@ checksum = "71dd52191aae121e8611f1e8dc3e324dd0dd1dee1e6dd91d10ee07a3cfb4d9d8"
 
 [[package]]
 name = "io-uring"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
+checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "cfg-if",
  "libc",
 ]
@@ -4894,9 +4895,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
  "getrandom 0.3.3",
  "libc",
@@ -5681,7 +5682,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "libc",
  "redox_syscall",
 ]
@@ -5859,11 +5860,11 @@ dependencies = [
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -5906,11 +5907,11 @@ checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "memfd"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
+checksum = "ad38eb12aea514a0466ea40a80fd8cc83637065948eb4a426e4aa46261175227"
 dependencies = [
- "rustix 0.38.44",
+ "rustix 1.0.8",
 ]
 
 [[package]]
@@ -6313,12 +6314,11 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6443,7 +6443,7 @@ checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "crc32fast",
  "hashbrown 0.15.5",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "memchr",
 ]
 
@@ -6518,12 +6518,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "p256"
 version = "0.13.2"
@@ -6696,7 +6690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59ac35caa284c08f3721fb33c2741b5f763decaf42d080c8a6a722154347017e"
 dependencies = [
  "deprecate-until",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "integer-sqrt",
  "num-traits",
  "rustc-hash 2.1.1",
@@ -6724,9 +6718,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pest"
@@ -6779,7 +6773,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset 0.4.2",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
 ]
 
 [[package]]
@@ -6790,7 +6784,7 @@ checksum = "54acf3a685220b533e437e264e4d932cfbdc4cc7ec0cd232ed73c08d03b8a7ca"
 dependencies = [
  "fixedbitset 0.5.7",
  "hashbrown 0.15.5",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "serde",
 ]
 
@@ -6949,9 +6943,9 @@ dependencies = [
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
 dependencies = [
  "zerovec",
 ]
@@ -7088,7 +7082,7 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "hex",
  "procfs-core",
  "rustix 0.38.44",
@@ -7100,7 +7094,7 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "hex",
 ]
 
@@ -7225,9 +7219,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
 dependencies = [
  "bytes",
  "cfg_aliases",
@@ -7237,7 +7231,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash 2.1.1",
  "rustls",
- "socket2 0.5.10",
+ "socket2 0.6.0",
  "thiserror 2.0.16",
  "tokio",
  "tracing",
@@ -7246,9 +7240,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.12"
+version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
 dependencies = [
  "bytes",
  "getrandom 0.3.3",
@@ -7267,16 +7261,16 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.13"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
 dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.10",
+ "socket2 0.6.0",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -7509,7 +7503,7 @@ version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
 ]
 
 [[package]]
@@ -7565,17 +7559,8 @@ checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.10",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -7586,20 +7571,14 @@ checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "replace_with"
@@ -7875,7 +7854,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -7888,7 +7867,7 @@ version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
@@ -8115,7 +8094,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
@@ -8299,7 +8278,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "schemars 0.9.0",
  "schemars 1.0.4",
  "serde",
@@ -8327,7 +8306,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "itoa",
  "ryu",
  "serde",
@@ -8909,7 +8888,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
@@ -8965,15 +8944,15 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
 
 [[package]]
 name = "tempfile"
-version = "3.20.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
 dependencies = [
  "fastrand",
  "getrandom 0.3.3",
  "once_cell",
  "rustix 1.0.8",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -9127,12 +9106,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.41"
+version = "0.3.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
 dependencies = [
  "deranged",
- "itoa",
  "num-conv",
  "powerfmt",
  "serde",
@@ -9142,15 +9120,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
 
 [[package]]
 name = "time-macros"
-version = "0.2.22"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
 dependencies = [
  "num-conv",
  "time-core",
@@ -9320,7 +9298,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -9331,12 +9309,12 @@ version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
  "toml_write",
- "winnow 0.7.12",
+ "winnow 0.7.13",
 ]
 
 [[package]]
@@ -9418,7 +9396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
 dependencies = [
  "async-compression",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "bytes",
  "futures-core",
  "futures-util",
@@ -9545,15 +9523,15 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
  "parking_lot",
- "regex",
+ "regex-automata",
  "serde",
  "serde_json",
  "sharded-slab",
@@ -9767,9 +9745,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -9797,9 +9775,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.18.0"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
  "getrandom 0.3.3",
  "js-sys",
@@ -9855,11 +9833,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+version = "0.14.3+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
@@ -9981,8 +9959,8 @@ version = "0.121.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab"
 dependencies = [
- "bitflags 2.9.2",
- "indexmap 2.10.0",
+ "bitflags 2.9.4",
+ "indexmap 2.11.0",
  "semver",
 ]
 
@@ -9992,9 +9970,9 @@ version = "0.226.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc28600dcb2ba68d7e5f1c3ba4195c2bddc918c0243fd702d0b6dbd05689b681"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "hashbrown 0.15.5",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "semver",
  "serde",
 ]
@@ -10028,12 +10006,12 @@ checksum = "b9fe78033c72da8741e724d763daf1375c93a38bfcea99c873ee4415f6098c3f"
 dependencies = [
  "addr2line",
  "anyhow",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "bumpalo",
  "cc",
  "cfg-if",
  "hashbrown 0.15.5",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "libc",
  "log",
  "mach2",
@@ -10108,7 +10086,7 @@ dependencies = [
  "cranelift-bitset",
  "cranelift-entity",
  "gimli",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "log",
  "object",
  "postcard",
@@ -10255,11 +10233,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -10707,9 +10685,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
@@ -10725,13 +10703,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.9.2",
-]
+checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
 
 [[package]]
 name = "writeable"

From ef6d17cce9ea670c01a9b64ff8a11d3a0ba4b473 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 4 Sep 2025 10:42:38 -0400
Subject: [PATCH 55/71] Fix merge

---
 .../methods/market_actor_params.rs            |  1 -
 .../methods/miner_actor_params.rs             | 64 ++++++++++++-------
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 50954780a46e..3d78e01cb314 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -8,7 +8,6 @@ use crate::shim::deal::DealID;
 use crate::shim::econ::TokenAmount;
 use crate::shim::piece::PaddedPieceSize;
 use crate::shim::sector::RegisteredSealProof;
-use crate::shim::sector::SectorNumber;
 use fil_actors_shared::fvm_ipld_bitfield::BitField;
 
 use ::cid::Cid;
diff --git a/src/lotus_json/actor_states/methods/miner_actor_params.rs b/src/lotus_json/actor_states/methods/miner_actor_params.rs
index f841052158d4..2022484ea590 100644
--- a/src/lotus_json/actor_states/methods/miner_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/miner_actor_params.rs
@@ -6,6 +6,7 @@ use crate::shim::{
     address::Address,
     clock::ChainEpoch,
     econ::TokenAmount,
+    piece::PaddedPieceSize,
     sector::{PoStProof, RegisteredPoStProof, RegisteredSealProof, SectorNumber},
 };
 use ::cid::Cid;
@@ -3695,27 +3696,6 @@ macro_rules! impl_miner_internal_sector_setup_for_preseal_params {
     };
 }
 
-/*#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
-#[schemars(rename = "PaddedPieceSize")]
-pub struct PaddedPieceSizeLotusJson(#[schemars(with = "u64")] PaddedPieceSize);
-
-impl HasLotusJson for PaddedPieceSize {
-    type LotusJson = PaddedPieceSizeLotusJson;
-
-    #[cfg(test)]
-    fn snapshots() -> Vec<(serde_json::Value, Self)> {
-        vec![]
-    }
-
-    fn into_lotus_json(self) -> Self::LotusJson {
-        PaddedPieceSizeLotusJson(self)
-    }
-
-    fn from_lotus_json(PaddedPieceSizeLotusJson(inner): Self::LotusJson) -> Self {
-        inner
-    }
-}
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct PieceChangeLotusJson {
@@ -3778,6 +3758,46 @@ pub struct SectorChangesLotusJson {
     pub added: Vec<PieceChangeLotusJson>,
 }
 
+macro_rules! impl_lotus_json_sector_changes {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_miner_state::[<v $version>]::SectorChanges {
+                    type LotusJson = SectorChangesLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            sector: self.sector.into(),
+                            minimum_commitment_epoch: self.minimum_commitment_epoch.into(),
+                            added: self.added.into_iter()
+                                .map(|pc| pc.into_lotus_json())
+                                .collect(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            sector: json.sector.into(),
+                            minimum_commitment_epoch: json.minimum_commitment_epoch.into(),
+                            added: json.added.into_iter()
+                                .map(|pc| fil_actor_miner_state::[<v $version>]::PieceChange::from_lotus_json(pc),)
+                                .collect(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_sector_changes!(13, 14, 15, 16);
+
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct SectorContentChangedParamsLotusJson {
@@ -3818,7 +3838,7 @@ macro_rules! impl_lotus_json_sector_content_changed_params {
     };
 }
 
-impl_lotus_json_sector_content_changed_params!(13, 14, 15, 16);*/
+impl_lotus_json_sector_content_changed_params!(13, 14, 15, 16);
 
 impl_lotus_json_for_miner_constructor_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 impl_lotus_json_for_miner_change_worker_param!(8, 9, 10, 11, 12, 13, 14, 15, 16);

From cc56ef172347371782108d97ef388851f44fbdc8 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 4 Sep 2025 10:51:26 -0400
Subject: [PATCH 56/71] Reorder macro calls

---
 .../actor_states/methods/market_actor_params.rs          | 1 -
 .../actor_states/methods/miner_actor_params.rs           | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 3d78e01cb314..6df5181e6ddc 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -11,7 +11,6 @@ use crate::shim::sector::RegisteredSealProof;
 use fil_actors_shared::fvm_ipld_bitfield::BitField;
 
 use ::cid::Cid;
-// use fvm_ipld_encoding::RawBytes;
 use jsonrpsee::core::Serialize;
 use paste::paste;
 use schemars::JsonSchema;
diff --git a/src/lotus_json/actor_states/methods/miner_actor_params.rs b/src/lotus_json/actor_states/methods/miner_actor_params.rs
index 2022484ea590..81a1f7853336 100644
--- a/src/lotus_json/actor_states/methods/miner_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/miner_actor_params.rs
@@ -3744,8 +3744,6 @@ macro_rules! impl_lotus_json_piece_change {
     };
 }
 
-impl_lotus_json_piece_change!(13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct SectorChangesLotusJson {
@@ -3796,8 +3794,6 @@ macro_rules! impl_lotus_json_sector_changes {
     };
 }
 
-impl_lotus_json_sector_changes!(13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct SectorContentChangedParamsLotusJson {
@@ -3838,8 +3834,6 @@ macro_rules! impl_lotus_json_sector_content_changed_params {
     };
 }
 
-impl_lotus_json_sector_content_changed_params!(13, 14, 15, 16);
-
 impl_lotus_json_for_miner_constructor_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 impl_lotus_json_for_miner_change_worker_param!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 impl_lotus_json_for_miner_change_owner_address_params!(11, 12, 13, 14, 15, 16);
@@ -3891,3 +3885,6 @@ impl_miner_prove_replica_update_params2!(fvm_shared3: 10, 11);
 impl_miner_prove_replica_update_params2!(fvm_shared4: 12);
 impl_lotus_json_for_miner_prove_commit_sector_ni_params!(14, 15, 16);
 impl_miner_internal_sector_setup_for_preseal_params!(14, 15, 16);
+impl_lotus_json_piece_change!(13, 14, 15, 16);
+impl_lotus_json_sector_changes!(13, 14, 15, 16);
+impl_lotus_json_sector_content_changed_params!(13, 14, 15, 16);

From 2bda12b40f6354233d0adf26a673b1b2a7282a03 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 4 Sep 2025 11:13:31 -0400
Subject: [PATCH 57/71] Add back market tests

---
 src/rpc/registry/actors/market.rs                 | 8 ++++----
 src/tool/subcommands/api_cmd/api_compare_tests.rs | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 08e9d37bf611..106645a50183 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -267,10 +267,10 @@ macro_rules! register_market_versions_13_to_16 {
                 (Method::GetDealActivationExported, GetDealActivationParams),
                 (Method::GetDealSectorExported, GetDealSectorParams),
                 (Method::SettleDealPaymentsExported, SettleDealPaymentsParams),
-                // (
-                //     Method::SectorContentChangedExported,
-                //     SectorContentChangedParams
-                // )
+                (
+                    Method::SectorContentChangedExported,
+                    SectorContentChangedParams
+                )
             ]
         );
     }};
diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 3b44e625df4b..9ca0d56e000c 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -1903,7 +1903,7 @@ fn state_decode_params_api_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>
     tests.extend(datacap_actor_state_decode_params_tests(tipset)?);
     tests.extend(multisig_actor_state_decode_params_tests(tipset)?);
     tests.extend(verified_reg_actor_state_decode_params_tests(tipset)?);
-    //     tests.extend(market_actor_state_decode_params_tests(tipset)?);
+    tests.extend(market_actor_state_decode_params_tests(tipset)?);
     tests.extend(paych_actor_state_decode_params_tests(tipset)?);
     tests.extend(eam_actor_state_decode_params_tests(tipset)?);
 
@@ -3328,7 +3328,7 @@ fn verified_reg_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Resu
     ])
 }
 
-/*fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>> {
+fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>> {
     fn create_deal_proposal(
         client: fvm_shared4::address::Address,
         provider: fvm_shared4::address::Address,
@@ -3605,7 +3605,6 @@ fn verified_reg_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Resu
         // ))?),
     ])
 }
-*/
 
 fn read_state_api_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>> {
     let tests = vec![

From bc3f7234d2d386667401856dae3237e049208ff7 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 4 Sep 2025 12:07:02 -0400
Subject: [PATCH 58/71] Remove commented-out use import

---
 src/tool/subcommands/api_cmd/api_compare_tests.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 9ca0d56e000c..eb71b5240845 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -23,7 +23,6 @@ use crate::rpc::types::{ApiTipsetKey, MessageFilter, MessageLookup};
 use crate::rpc::{Permission, prelude::*};
 use crate::shim::actors::MarketActorStateLoad as _;
 use crate::shim::actors::market;
-// use crate::shim::clock::ChainEpoch;
 use crate::shim::executor::Receipt;
 use crate::shim::sector::{SectorSize, StoragePower};
 use crate::shim::{

From 6b64d658d2abc5a83cf0dade6b7406057d4aad46 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 4 Sep 2025 12:41:56 -0400
Subject: [PATCH 59/71] Fix lint errors

---
 src/tool/subcommands/api_cmd/api_compare_tests.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index eb71b5240845..86a571a67714 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -3412,13 +3412,13 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             sectors: vec![create_sector_deals()],
         };
 
-    let market_actor_batch_activate_deals_params =
+    let _market_actor_batch_activate_deals_params =
         fil_actor_market_state::v16::BatchActivateDealsParams {
             sectors: vec![create_sector_deals()],
             compute_cid: true,
         };
 
-    let market_actor_on_miner_sectors_terminate_params =
+    let _market_actor_on_miner_sectors_terminate_params =
         fil_actor_market_state::v16::OnMinerSectorsTerminateParams {
             epoch: 123,
             sectors: {
@@ -3442,7 +3442,7 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
     let market_actor_get_deal_data_commitment_params =
         fil_actor_market_state::v16::DealQueryParams { id: 0 };
 
-    let market_actor_sector_content_changed_params = {
+    let _market_actor_sector_content_changed_params = {
         fil_actor_miner_state::v16::SectorContentChangedParams {
             sectors: vec![create_sector_changes()],
         }

From 7daa8916570681b09007013fa922abac75fcbf73 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Thu, 4 Sep 2025 16:34:51 -0400
Subject: [PATCH 60/71] Add a first snapshot test

---
 .../actor_states/methods/market_actor_params.rs   | 13 +++++++++++--
 src/lotus_json/mod.rs                             | 15 +++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 6df5181e6ddc..44f9aee86b84 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -8,6 +8,7 @@ use crate::shim::deal::DealID;
 use crate::shim::econ::TokenAmount;
 use crate::shim::piece::PaddedPieceSize;
 use crate::shim::sector::RegisteredSealProof;
+use crate::test_snapshots;
 use fil_actors_shared::fvm_ipld_bitfield::BitField;
 
 use ::cid::Cid;
@@ -37,7 +38,7 @@ pub struct AddBalanceParamsLotusJson(
 );
 
 macro_rules! impl_lotus_json_for_add_balance_params {
-    ($($version:literal),+) => {
+    ($type_suffix:path: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::AddBalanceParams {
@@ -46,6 +47,10 @@ macro_rules! impl_lotus_json_for_add_balance_params {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!("f0100"),
+                                Self { provider_or_client: $type_suffix::Address::new_id(100) }
+                            ),
                         ]
                     }
 
@@ -64,7 +69,9 @@ macro_rules! impl_lotus_json_for_add_balance_params {
     };
 }
 
-impl_lotus_json_for_add_balance_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_add_balance_params!(fvm_shared2::address: 8, 9);
+impl_lotus_json_for_add_balance_params!(fvm_shared3::address: 10, 11);
+impl_lotus_json_for_add_balance_params!(fvm_shared4::address: 12, 13, 14, 15, 16);
 
 macro_rules! impl_lotus_json_for_withdraw_balance_params {
     ($($version:literal),+) => {
@@ -854,3 +861,5 @@ macro_rules! impl_lotus_json_for_settle_deal_payments_params {
 }
 
 impl_lotus_json_for_settle_deal_payments_params!(13, 14, 15, 16);
+
+test_snapshots!(fil_actor_market_state: AddBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
diff --git a/src/lotus_json/mod.rs b/src/lotus_json/mod.rs
index 14c3540c2902..f0ff9645c53d 100644
--- a/src/lotus_json/mod.rs
+++ b/src/lotus_json/mod.rs
@@ -244,6 +244,21 @@ mod verifreg_claim;
 
 pub use vec::*;
 
+#[macro_export]
+macro_rules! test_snapshots {
+    ($module:path: $ty:ident: $($version:literal),+ $(,)?) => {
+        $(
+            paste::paste! {
+                #[test]
+                fn [<snapshots_ $module _v $version _ $ty:lower>]() {
+                    use super::*;
+                    assert_all_snapshots::<$module::[<v $version>]::$ty>();
+                }
+            }
+        )+
+    };
+}
+
 #[cfg(any(test, doc))]
 pub fn assert_all_snapshots<T>()
 where

From 6bba7563264f0488864b77a635742f049f700682 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Fri, 5 Sep 2025 11:26:13 -0400
Subject: [PATCH 61/71] Add snapshots tests

---
 .../actor_states/methods/market_actor_params.rs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 44f9aee86b84..5864b0dafece 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -74,7 +74,7 @@ impl_lotus_json_for_add_balance_params!(fvm_shared3::address: 10, 11);
 impl_lotus_json_for_add_balance_params!(fvm_shared4::address: 12, 13, 14, 15, 16);
 
 macro_rules! impl_lotus_json_for_withdraw_balance_params {
-    ($($version:literal),+) => {
+    ($type_suffix:path: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::WithdrawBalanceParams {
@@ -83,6 +83,16 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!({
+                                    "ProviderOrClientAddress": "f0100",
+                                    "Amount": "1000"
+                                }),
+                                Self {
+                                    provider_or_client: $type_suffix::address::Address::new_id(100),
+                                    amount: $type_suffix::econ::TokenAmount::from_atto(1000),
+                                }
+                            ),
                         ]
                     }
 
@@ -105,7 +115,9 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
     };
 }
 
-impl_lotus_json_for_withdraw_balance_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_withdraw_balance_params!(fvm_shared2: 8, 9);
+impl_lotus_json_for_withdraw_balance_params!(fvm_shared3: 10, 11);
+impl_lotus_json_for_withdraw_balance_params!(fvm_shared4: 12, 13, 14, 15, 16);
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
 #[serde(untagged)]
@@ -863,3 +875,4 @@ macro_rules! impl_lotus_json_for_settle_deal_payments_params {
 impl_lotus_json_for_settle_deal_payments_params!(13, 14, 15, 16);
 
 test_snapshots!(fil_actor_market_state: AddBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: WithdrawBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);

From 8c31e59c2eef1ba5ea40eb7a49988b224bada9f3 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Fri, 5 Sep 2025 11:32:33 -0400
Subject: [PATCH 62/71] Add Label snapshots test

---
 src/lotus_json/actor_states/methods/market_actor_params.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 5864b0dafece..ae7c1417fc85 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -136,6 +136,8 @@ macro_rules! impl_lotus_json_for_label {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (serde_json::json!("label-string"), Self::String("label-string".to_owned())),
+                            (serde_json::json!([1,2,3]), Self::Bytes(vec![1,2,3])),
                         ]
                     }
 
@@ -876,3 +878,4 @@ impl_lotus_json_for_settle_deal_payments_params!(13, 14, 15, 16);
 
 test_snapshots!(fil_actor_market_state: AddBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: WithdrawBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: Label: 8, 9, 10, 11, 12, 13, 14, 15, 16);

From 908e1db6339fd89132720688cbbce0d6ca3fa9d4 Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Fri, 5 Sep 2025 12:01:19 -0400
Subject: [PATCH 63/71] Add snapshots test for ActivateDealsParams

---
 .../actor_states/methods/market_actor_params.rs     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index ae7c1417fc85..a416b873e493 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -548,7 +548,7 @@ impl_lotus_json_for_publish_storage_deals_params!(8, 9, 10, 11, 12, 13, 14, 15,
 #[serde(rename_all = "PascalCase")]
 pub struct ActivateDealsParamsLotusJson {
     #[schemars(with = "LotusJson<DealID>")]
-    #[serde(with = "crate::lotus_json")]
+    #[serde(with = "crate::lotus_json", rename = "DealIDs")]
     pub deal_ids: Vec<DealID>,
     pub sector_expiry: ChainEpoch,
 }
@@ -563,6 +563,16 @@ macro_rules! impl_lotus_json_for_activate_deals_params {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!({
+                                    "DealIDs": [1,2,3],
+                                    "SectorExpiry": 1000
+                                }),
+                                Self {
+                                    deal_ids: vec![1,2,3],
+                                    sector_expiry: 1000,
+                                }
+                            ),
                         ]
                     }
 
@@ -879,3 +889,4 @@ impl_lotus_json_for_settle_deal_payments_params!(13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: AddBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: WithdrawBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: Label: 8, 9, 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: ActivateDealsParams: 8, 9, 10, 11);

From 6e9a28cdca489b734ba4b0e0e96828ce4ced8dfb Mon Sep 17 00:00:00 2001
From: elmattic <elmattic@users.noreply.github.com>
Date: Fri, 5 Sep 2025 12:22:50 -0400
Subject: [PATCH 64/71] Add snapshots test for OnMinerSectorsTerminateParams

---
 .../actor_states/methods/market_actor_params.rs     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index a416b873e493..2bd0cf4e3a3e 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -647,7 +647,7 @@ impl_lotus_json_for_batch_activate_deals_params!(12, 13, 14, 15, 16);
 pub struct OnMinerSectorsTerminateParamsLotusJsonV8 {
     pub epoch: ChainEpoch,
     #[schemars(with = "LotusJson<DealID>")]
-    #[serde(with = "crate::lotus_json")]
+    #[serde(with = "crate::lotus_json", rename = "DealIDs")]
     pub deal_ids: Vec<DealID>,
 }
 
@@ -670,6 +670,16 @@ macro_rules! impl_lotus_json_for_on_miner_sectors_terminate_params {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!({
+                                    "Epoch": 1000,
+                                    "DealIDs": [1,2,3]
+                                }),
+                                Self {
+                                    epoch: 1000,
+                                    deal_ids: vec![1,2,3],
+                                }
+                            ),
                         ]
                     }
 
@@ -890,3 +900,4 @@ test_snapshots!(fil_actor_market_state: AddBalanceParams: 8, 9, 10, 11, 12, 13,
 test_snapshots!(fil_actor_market_state: WithdrawBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: Label: 8, 9, 10, 11, 12, 13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: ActivateDealsParams: 8, 9, 10, 11);
+test_snapshots!(fil_actor_market_state: OnMinerSectorsTerminateParams: 8, 9, 10, 11, 12);

From f1ede93310759a977fbda3a3370b76bd52f97b38 Mon Sep 17 00:00:00 2001
From: Aryan Tikarya <akaladarshi@gmail.com>
Date: Mon, 8 Sep 2025 15:43:39 +0530
Subject: [PATCH 65/71] Market actor state decode param cleanup (#6041)

---
 Cargo.lock                                    |   1 +
 .../methods/market_actor_params.rs            | 136 ++++++++--
 src/rpc/registry/actors/market.rs             | 242 +++++-------------
 .../subcommands/api_cmd/api_compare_tests.rs  |  45 ++--
 4 files changed, 195 insertions(+), 229 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5ffbc854e774..94d68e1a7de2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2919,6 +2919,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_repr",
+ "strum",
  "thiserror 2.0.16",
  "unsigned-varint 0.8.0",
 ]
diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 2bd0cf4e3a3e..e14bf6187c58 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -38,7 +38,7 @@ pub struct AddBalanceParamsLotusJson(
 );
 
 macro_rules! impl_lotus_json_for_add_balance_params {
-    ($type_suffix:path: $($version:literal),+) => {
+    ($($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::AddBalanceParams {
@@ -49,7 +49,7 @@ macro_rules! impl_lotus_json_for_add_balance_params {
                         vec![
                             (
                                 serde_json::json!("f0100"),
-                                Self { provider_or_client: $type_suffix::Address::new_id(100) }
+                                Self { provider_or_client: Address::new_id(100).into() }
                             ),
                         ]
                     }
@@ -69,12 +69,10 @@ macro_rules! impl_lotus_json_for_add_balance_params {
     };
 }
 
-impl_lotus_json_for_add_balance_params!(fvm_shared2::address: 8, 9);
-impl_lotus_json_for_add_balance_params!(fvm_shared3::address: 10, 11);
-impl_lotus_json_for_add_balance_params!(fvm_shared4::address: 12, 13, 14, 15, 16);
+impl_lotus_json_for_add_balance_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 
 macro_rules! impl_lotus_json_for_withdraw_balance_params {
-    ($type_suffix:path: $($version:literal),+) => {
+    ($($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::WithdrawBalanceParams {
@@ -82,18 +80,16 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
 
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
-                        vec![
-                            (
-                                serde_json::json!({
-                                    "ProviderOrClientAddress": "f0100",
-                                    "Amount": "1000"
+                        vec![(
+                             json!({
+                                    "ProviderOrClient": "f01234",
+                                    "Amount": "1000000000000000000",
                                 }),
-                                Self {
-                                    provider_or_client: $type_suffix::address::Address::new_id(100),
-                                    amount: $type_suffix::econ::TokenAmount::from_atto(1000),
-                                }
-                            ),
-                        ]
+                            Self{
+                                 provider_or_client: Address::new_id(1234).into(),
+                                 amount: TokenAmount::from_atto(1000000000000000000u64).into(),
+                             },
+                        )]
                     }
 
                     fn into_lotus_json(self) -> Self::LotusJson {
@@ -115,9 +111,7 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
     };
 }
 
-impl_lotus_json_for_withdraw_balance_params!(fvm_shared2: 8, 9);
-impl_lotus_json_for_withdraw_balance_params!(fvm_shared3: 10, 11);
-impl_lotus_json_for_withdraw_balance_params!(fvm_shared4: 12, 13, 14, 15, 16);
+impl_lotus_json_for_withdraw_balance_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
 #[serde(untagged)]
@@ -391,6 +385,8 @@ impl_lotus_json_for_publish_storage_deals_params!(PublishStorageDealsParamsV4Lot
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct SectorDealsLotusJson {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sector_number: Option<u64>,
     #[schemars(with = "LotusJson<RegisteredSealProof>")]
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(with = "crate::lotus_json")]
@@ -403,7 +399,7 @@ pub struct SectorDealsLotusJson {
 
 macro_rules! impl_lotus_json_for_sector_deals {
     // Handling version where both `sector_number` and `sector_type` should be None (v8)
-    ($type_suffix:path: no_sector_type: $($version:literal),+) => {
+    ($type_suffix:path: no_sector_type: no_sector_number: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::SectorDeals {
@@ -417,6 +413,7 @@ macro_rules! impl_lotus_json_for_sector_deals {
 
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
+                            sector_number: None,
                             sector_type: None,
                             sector_expiry: self.sector_expiry.into_lotus_json(),
                             deal_ids: self.deal_ids.into(),
@@ -434,7 +431,7 @@ macro_rules! impl_lotus_json_for_sector_deals {
         )+
     };
     // Handling versions where `sector_number` should be None (v9, v10, v11, v12)
-    ($type_suffix:path: $($version:literal),+) => {
+    ($type_suffix:path: no_sector_number: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::SectorDeals {
@@ -448,6 +445,7 @@ macro_rules! impl_lotus_json_for_sector_deals {
 
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
+                            sector_number: None,
                             sector_type: Some(self.sector_type.into()),
                             sector_expiry: self.sector_expiry.into_lotus_json(),
                             deal_ids: self.deal_ids.into(),
@@ -479,6 +477,7 @@ macro_rules! impl_lotus_json_for_sector_deals {
 
                     fn into_lotus_json(self) -> Self::LotusJson {
                         Self::LotusJson {
+                            sector_number: Some(self.sector_number),
                             sector_type: Some(self.sector_type.into()),
                             sector_expiry: self.sector_expiry.into_lotus_json(),
                             deal_ids: self.deal_ids.into(),
@@ -487,6 +486,7 @@ macro_rules! impl_lotus_json_for_sector_deals {
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
+                            sector_number: json.sector_number.unwrap_or(0),
                             sector_type: json.sector_type.unwrap_or(RegisteredSealProof::invalid()).into(),
                             sector_expiry: json.sector_expiry.into(),
                             deal_ids: json.deal_ids.into(),
@@ -498,8 +498,8 @@ macro_rules! impl_lotus_json_for_sector_deals {
     };
 }
 
-impl_lotus_json_for_sector_deals!(fvm_shared2::sector: no_sector_type: 8);
-impl_lotus_json_for_sector_deals!(fvm_shared3::sector: 9, 10, 11, 12);
+impl_lotus_json_for_sector_deals!(fvm_shared2::sector: no_sector_type: no_sector_number: 8);
+impl_lotus_json_for_sector_deals!(fvm_shared3::sector: no_sector_number: 9, 10, 11, 12);
 impl_lotus_json_for_sector_deals!(fvm_shared4::sector: 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
@@ -847,7 +847,7 @@ macro_rules! impl_lotus_json_for_deal_query_params {
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
-                            id: json.0.into(),
+                            id: json.0,
                         }
                     }
                 }
@@ -885,7 +885,7 @@ macro_rules! impl_lotus_json_for_settle_deal_payments_params {
 
                     fn from_lotus_json(json: Self::LotusJson) -> Self {
                         Self {
-                            deal_ids: json.0.into(),
+                            deal_ids: json.0,
                         }
                     }
                 }
@@ -896,6 +896,90 @@ macro_rules! impl_lotus_json_for_settle_deal_payments_params {
 
 impl_lotus_json_for_settle_deal_payments_params!(13, 14, 15, 16);
 
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct PieceChangeLotusJson {
+    #[schemars(with = "LotusJson<Cid>")]
+    #[serde(with = "crate::lotus_json")]
+    pub data: Cid,
+    #[schemars(with = "LotusJson<PaddedPieceSize>")]
+    #[serde(with = "crate::lotus_json")]
+    pub size: PaddedPieceSize,
+    #[schemars(with = "LotusJson<Vec<u8>>")]
+    #[serde(with = "crate::lotus_json")]
+    pub payload: Vec<u8>,
+}
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct SectorChangesLotusJson {
+    pub sector: u64,
+    pub minimum_commitment_epoch: ChainEpoch,
+    pub added: Vec<PieceChangeLotusJson>,
+}
+
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct SectorContentChangedParamsLotusJson {
+    pub sectors: Vec<SectorChangesLotusJson>,
+}
+
+macro_rules! impl_lotus_json_for_sector_content_changed_params {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::ext::miner::SectorContentChangedParams {
+                    type LotusJson = SectorContentChangedParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            sectors: self.sectors.into_iter().map(|sector_changes| {
+                                SectorChangesLotusJson {
+                                    sector: sector_changes.sector.into(),
+                                    minimum_commitment_epoch: sector_changes.minimum_commitment_epoch,
+                                    added: sector_changes.added.into_iter().map(|piece_change| {
+                                        PieceChangeLotusJson {
+                                            data: piece_change.data.into(),
+                                            size: piece_change.size.into(),
+                                            payload: piece_change.payload.into(),
+                                        }
+                                    }).collect(),
+                                }
+                            }).collect(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            sectors: json.sectors.into_iter().map(|sector_changes_json| {
+                                fil_actor_market_state::[<v $version>]::ext::miner::SectorChanges {
+                                    sector: sector_changes_json.sector.into(),
+                                    minimum_commitment_epoch: sector_changes_json.minimum_commitment_epoch,
+                                    added: sector_changes_json.added.into_iter().map(|piece_change_json| {
+                                        fil_actor_market_state::[<v $version>]::ext::miner::PieceChange {
+                                            data: piece_change_json.data.into(),
+                                            size: piece_change_json.size.into(),
+                                            payload: piece_change_json.payload.into(),
+                                        }
+                                    }).collect(),
+                                }
+                            }).collect(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_lotus_json_for_sector_content_changed_params!(13, 14, 15, 16);
+
 test_snapshots!(fil_actor_market_state: AddBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: WithdrawBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: Label: 8, 9, 10, 11, 12, 13, 14, 15, 16);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 106645a50183..f57b4ba8be3f 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -6,11 +6,10 @@ use crate::shim::address::Address;
 use crate::shim::message::MethodNum;
 use cid::Cid;
 
-macro_rules! register_market_versions_8_to_9 {
+macro_rules! register_market_basic_methods {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            ActivateDealsParams, AddBalanceParams, ComputeDataCommitmentParams, Method,
-            OnMinerSectorsTerminateParams, PublishStorageDealsParams,
+            AddBalanceParams, Method, OnMinerSectorsTerminateParams, PublishStorageDealsParams,
             VerifyDealsForActivationParams, WithdrawBalanceParams,
         };
 
@@ -25,12 +24,10 @@ macro_rules! register_market_versions_8_to_9 {
                     Method::VerifyDealsForActivation,
                     VerifyDealsForActivationParams
                 ),
-                (Method::ActivateDeals, ActivateDealsParams),
                 (
                     Method::OnMinerSectorsTerminate,
                     OnMinerSectorsTerminateParams
-                ),
-                (Method::ComputeDataCommitment, ComputeDataCommitmentParams)
+                )
             ]
         );
 
@@ -43,44 +40,16 @@ macro_rules! register_market_versions_8_to_9 {
     }};
 }
 
-macro_rules! register_market_versions_10_to_11 {
+macro_rules! register_market_exported_methods_v10_onwards {
     ($registry:expr, $code_cid:expr, $state_version:path) => {{
         use $state_version::{
-            ActivateDealsParams, AddBalanceParams, ComputeDataCommitmentParams,
-            GetDealActivationParams, GetDealClientCollateralParams, GetDealClientParams,
-            GetDealDataCommitmentParams, GetDealLabelParams, GetDealProviderCollateralParams,
-            GetDealProviderParams, GetDealTermParams, GetDealTotalPriceParams,
-            GetDealVerifiedParams, Method, OnMinerSectorsTerminateParams,
-            PublishStorageDealsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
+            AddBalanceParams, GetDealActivationParams, GetDealClientCollateralParams,
+            GetDealClientParams, GetDealDataCommitmentParams, GetDealLabelParams,
+            GetDealProviderCollateralParams, GetDealProviderParams, GetDealTermParams,
+            GetDealTotalPriceParams, GetDealVerifiedParams, Method, PublishStorageDealsParams,
+            WithdrawBalanceParams,
         };
 
-        register_actor_methods!(
-            $registry,
-            $code_cid,
-            [
-                (Method::AddBalance, AddBalanceParams),
-                (Method::WithdrawBalance, WithdrawBalanceParams),
-                (Method::PublishStorageDeals, PublishStorageDealsParams),
-                (
-                    Method::VerifyDealsForActivation,
-                    VerifyDealsForActivationParams
-                ),
-                (Method::ActivateDeals, ActivateDealsParams),
-                (
-                    Method::OnMinerSectorsTerminate,
-                    OnMinerSectorsTerminateParams
-                ),
-                (Method::ComputeDataCommitment, ComputeDataCommitmentParams)
-            ]
-        );
-
-        // Register methods without parameters
-        register_actor_methods!(
-            $registry,
-            $code_cid,
-            [(Method::Constructor, empty), (Method::CronTick, empty),]
-        );
-
         // Register exported methods
         register_actor_methods!(
             $registry,
@@ -117,161 +86,88 @@ macro_rules! register_market_versions_10_to_11 {
     }};
 }
 
-macro_rules! register_market_versions_12 {
-    ($registry:expr, $code_cid:expr, $state_version:path) => {{
-        use $state_version::{
-            AddBalanceParams, BatchActivateDealsParams, GetDealActivationParams,
-            GetDealClientCollateralParams, GetDealClientParams, GetDealDataCommitmentParams,
-            GetDealLabelParams, GetDealProviderCollateralParams, GetDealProviderParams,
-            GetDealTermParams, GetDealTotalPriceParams, GetDealVerifiedParams, Method,
-            OnMinerSectorsTerminateParams, PublishStorageDealsParams,
-            VerifyDealsForActivationParams, WithdrawBalanceParams,
-        };
+macro_rules! register_market_exported_methods_v13_onwards {
+    ($registry:expr, $code_cid:expr, $market_state_version:path) => {{
+        use fil_actor_miner_state::v16::SectorContentChangedParams;
+        use $market_state_version::{GetDealSectorParams, Method, SettleDealPaymentsParams};
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
-                (Method::AddBalance, AddBalanceParams),
-                (Method::WithdrawBalance, WithdrawBalanceParams),
-                (Method::PublishStorageDeals, PublishStorageDealsParams),
-                (
-                    Method::VerifyDealsForActivation,
-                    VerifyDealsForActivationParams
-                ),
-                (Method::BatchActivateDeals, BatchActivateDealsParams),
+                (Method::GetDealSectorExported, GetDealSectorParams),
+                (Method::SettleDealPaymentsExported, SettleDealPaymentsParams),
                 (
-                    Method::OnMinerSectorsTerminate,
-                    OnMinerSectorsTerminateParams
+                    Method::SectorContentChangedExported,
+                    SectorContentChangedParams
                 )
             ]
         );
+    }};
+}
 
-        // Register methods without parameters
-        register_actor_methods!(
-            $registry,
-            $code_cid,
-            [(Method::Constructor, empty), (Method::CronTick, empty),]
-        );
+macro_rules! register_market_versions_8_to_9 {
+    ($registry:expr, $code_cid:expr, $state_version:path) => {{
+        register_market_basic_methods!($registry, $code_cid, $state_version);
+
+        use $state_version::{ActivateDealsParams, ComputeDataCommitmentParams, Method};
 
-        // Register exported methods
         register_actor_methods!(
             $registry,
             $code_cid,
             [
-                (Method::AddBalanceExported, AddBalanceParams),
-                (Method::WithdrawBalanceExported, WithdrawBalanceParams),
-                (
-                    Method::PublishStorageDealsExported,
-                    PublishStorageDealsParams
-                ),
-                (Method::GetBalanceExported, Address),
-                (
-                    Method::GetDealDataCommitmentExported,
-                    GetDealDataCommitmentParams
-                ),
-                (Method::GetDealClientExported, GetDealClientParams),
-                (Method::GetDealProviderExported, GetDealProviderParams),
-                (Method::GetDealLabelExported, GetDealLabelParams),
-                (Method::GetDealTermExported, GetDealTermParams),
-                (Method::GetDealTotalPriceExported, GetDealTotalPriceParams),
-                (
-                    Method::GetDealClientCollateralExported,
-                    GetDealClientCollateralParams
-                ),
-                (
-                    Method::GetDealProviderCollateralExported,
-                    GetDealProviderCollateralParams
-                ),
-                (Method::GetDealVerifiedExported, GetDealVerifiedParams),
-                (Method::GetDealActivationExported, GetDealActivationParams),
+                (Method::ActivateDeals, ActivateDealsParams),
+                (Method::ComputeDataCommitment, ComputeDataCommitmentParams)
             ]
         );
     }};
 }
 
-macro_rules! register_market_versions_13_to_16 {
-    ($registry:expr, $code_cid:expr, $market_state_version:path, $miner_state_version:path) => {{
-        use $market_state_version::{
-            AddBalanceParams, BatchActivateDealsParams, GetDealActivationParams,
-            GetDealClientCollateralParams, GetDealClientParams, GetDealDataCommitmentParams,
-            GetDealLabelParams, GetDealProviderCollateralParams, GetDealProviderParams,
-            GetDealSectorParams, GetDealTermParams, GetDealTotalPriceParams, GetDealVerifiedParams,
-            Method, OnMinerSectorsTerminateParams, PublishStorageDealsParams,
-            SettleDealPaymentsParams, VerifyDealsForActivationParams, WithdrawBalanceParams,
-        };
-        // When using a macro variable for a module path in a `use` statement,
-        // Rust can get confused if we write `use $miner_state_version::SectorContentChangedParams;` directly.
-        // Wrapping the imported item in `{ ... }` disambiguates the path for the compiler and ensures
-        // the import works correctly even when `$miner_state_version` expands to a module path.
-        // Also, to avoid rustfmt automatically reformatting this line, we use #[rustfmt::skip].
-        #[rustfmt::skip]
-        use $miner_state_version::{SectorContentChangedParams};
+macro_rules! register_market_versions_10_to_11 {
+    ($registry:expr, $code_cid:expr, $state_version:path) => {{
+        register_market_basic_methods!($registry, $code_cid, $state_version);
+        register_market_exported_methods_v10_onwards!($registry, $code_cid, $state_version);
+
+        use $state_version::{ActivateDealsParams, ComputeDataCommitmentParams, Method};
 
         register_actor_methods!(
             $registry,
             $code_cid,
             [
-                (Method::AddBalance, AddBalanceParams),
-                (Method::WithdrawBalance, WithdrawBalanceParams),
-                (Method::PublishStorageDeals, PublishStorageDealsParams),
-                (
-                    Method::VerifyDealsForActivation,
-                    VerifyDealsForActivationParams
-                ),
-                (Method::BatchActivateDeals, BatchActivateDealsParams),
-                (
-                    Method::OnMinerSectorsTerminate,
-                    OnMinerSectorsTerminateParams
-                )
+                (Method::ActivateDeals, ActivateDealsParams),
+                (Method::ComputeDataCommitment, ComputeDataCommitmentParams)
             ]
         );
+    }};
+}
+
+macro_rules! register_market_versions_12 {
+    ($registry:expr, $code_cid:expr, $state_version:path) => {{
+        register_market_basic_methods!($registry, $code_cid, $state_version);
+        register_market_exported_methods_v10_onwards!($registry, $code_cid, $state_version);
+
+        use $state_version::{BatchActivateDealsParams, Method};
 
-        // Register methods without parameters
         register_actor_methods!(
             $registry,
             $code_cid,
-            [(Method::Constructor, empty), (Method::CronTick, empty),]
+            [(Method::BatchActivateDeals, BatchActivateDealsParams)]
         );
+    }};
+}
+
+macro_rules! register_market_versions_13_to_16 {
+    ($registry:expr, $code_cid:expr, $market_state_version:path) => {{
+        register_market_basic_methods!($registry, $code_cid, $market_state_version);
+        register_market_exported_methods_v10_onwards!($registry, $code_cid, $market_state_version);
+        register_market_exported_methods_v13_onwards!($registry, $code_cid, $market_state_version);
+
+        use $market_state_version::{BatchActivateDealsParams, Method};
 
-        // Register exported methods
         register_actor_methods!(
             $registry,
             $code_cid,
-            [
-                (Method::AddBalanceExported, AddBalanceParams),
-                (Method::WithdrawBalanceExported, WithdrawBalanceParams),
-                (
-                    Method::PublishStorageDealsExported,
-                    PublishStorageDealsParams
-                ),
-                (Method::GetBalanceExported, Address),
-                (
-                    Method::GetDealDataCommitmentExported,
-                    GetDealDataCommitmentParams
-                ),
-                (Method::GetDealClientExported, GetDealClientParams),
-                (Method::GetDealProviderExported, GetDealProviderParams),
-                (Method::GetDealLabelExported, GetDealLabelParams),
-                (Method::GetDealTermExported, GetDealTermParams),
-                (Method::GetDealTotalPriceExported, GetDealTotalPriceParams),
-                (
-                    Method::GetDealClientCollateralExported,
-                    GetDealClientCollateralParams
-                ),
-                (
-                    Method::GetDealProviderCollateralExported,
-                    GetDealProviderCollateralParams
-                ),
-                (Method::GetDealVerifiedExported, GetDealVerifiedParams),
-                (Method::GetDealActivationExported, GetDealActivationParams),
-                (Method::GetDealSectorExported, GetDealSectorParams),
-                (Method::SettleDealPaymentsExported, SettleDealPaymentsParams),
-                (
-                    Method::SectorContentChangedExported,
-                    SectorContentChangedParams
-                )
-            ]
+            [(Method::BatchActivateDeals, BatchActivateDealsParams),]
         );
     }};
 }
@@ -283,30 +179,10 @@ pub(crate) fn register_actor_methods(registry: &mut MethodRegistry, cid: Cid, ve
         10 => register_market_versions_10_to_11!(registry, cid, fil_actor_market_state::v10),
         11 => register_market_versions_10_to_11!(registry, cid, fil_actor_market_state::v11),
         12 => register_market_versions_12!(registry, cid, fil_actor_market_state::v12),
-        13 => register_market_versions_13_to_16!(
-            registry,
-            cid,
-            fil_actor_market_state::v13,
-            fil_actor_miner_state::v13
-        ),
-        14 => register_market_versions_13_to_16!(
-            registry,
-            cid,
-            fil_actor_market_state::v14,
-            fil_actor_miner_state::v14
-        ),
-        15 => register_market_versions_13_to_16!(
-            registry,
-            cid,
-            fil_actor_market_state::v15,
-            fil_actor_miner_state::v15
-        ),
-        16 => register_market_versions_13_to_16!(
-            registry,
-            cid,
-            fil_actor_market_state::v16,
-            fil_actor_miner_state::v16
-        ),
+        13 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v13),
+        14 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v14),
+        15 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v15),
+        16 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v16),
         _ => {}
     }
 }
diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 86a571a67714..0b7035da7a94 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -1893,18 +1893,18 @@ fn state_decode_params_api_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>
         ))?),
     ];
 
-    tests.extend(miner_actor_state_decode_params_tests(tipset)?);
-    tests.extend(account_actor_state_decode_params_tests(tipset)?);
-    tests.extend(init_actor_state_decode_params_tests(tipset)?);
-    tests.extend(evm_actor_state_decode_params_tests(tipset)?);
-    tests.extend(reward_actor_state_decode_params_tests(tipset)?);
-    tests.extend(power_actor_state_decode_params_tests(tipset)?);
-    tests.extend(datacap_actor_state_decode_params_tests(tipset)?);
-    tests.extend(multisig_actor_state_decode_params_tests(tipset)?);
-    tests.extend(verified_reg_actor_state_decode_params_tests(tipset)?);
+    // tests.extend(miner_actor_state_decode_params_tests(tipset)?);
+    // tests.extend(account_actor_state_decode_params_tests(tipset)?);
+    // tests.extend(init_actor_state_decode_params_tests(tipset)?);
+    // tests.extend(evm_actor_state_decode_params_tests(tipset)?);
+    // tests.extend(reward_actor_state_decode_params_tests(tipset)?);
+    // tests.extend(power_actor_state_decode_params_tests(tipset)?);
+    // tests.extend(datacap_actor_state_decode_params_tests(tipset)?);
+    // tests.extend(multisig_actor_state_decode_params_tests(tipset)?);
+    // tests.extend(verified_reg_actor_state_decode_params_tests(tipset)?);
     tests.extend(market_actor_state_decode_params_tests(tipset)?);
-    tests.extend(paych_actor_state_decode_params_tests(tipset)?);
-    tests.extend(eam_actor_state_decode_params_tests(tipset)?);
+    // tests.extend(paych_actor_state_decode_params_tests(tipset)?);
+    // tests.extend(eam_actor_state_decode_params_tests(tipset)?);
 
     Ok(tests)
 }
@@ -3374,6 +3374,7 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
 
     fn create_sector_deals() -> fil_actor_market_state::v16::SectorDeals {
         fil_actor_market_state::v16::SectorDeals {
+            sector_number: 42,
             sector_type: fvm_shared4::sector::RegisteredSealProof::StackedDRG2KiBV1,
             sector_expiry: 100,
             deal_ids: vec![0, 1],
@@ -3407,7 +3408,7 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             deals: vec![create_client_deal_proposal()],
         };
 
-    let market_actor_verify_deals_for_activation_params =
+    let _market_actor_verify_deals_for_activation_params =
         fil_actor_market_state::v16::VerifyDealsForActivationParams {
             sectors: vec![create_sector_deals()],
         };
@@ -3467,20 +3468,24 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_publish_storage_deals_params)?,
             tipset.key().into(),
         ))?),
-        RpcTest::identity(StateDecodeParams::request((
-            Address::MARKET_ACTOR,
-            fil_actor_market_state::v16::Method::VerifyDealsForActivation as u64,
-            to_vec(&market_actor_verify_deals_for_activation_params)?,
-            tipset.key().into(),
-        ))?),
-        // TODO: understand why Lotus uses ActivateDeals
+        // TODO(go-state-types): https://github.com/filecoin-project/go-state-types/issues/409
+        // Enable this test when lotus supports this method
         // RpcTest::identity(StateDecodeParams::request((
         //     Address::MARKET_ACTOR,
         //     fil_actor_market_state::v16::Method::BatchActivateDeals as u64,
         //     to_vec(&market_actor_batch_activate_deals_params)?,
         //     tipset.key().into(),
         // ))?),
-        // TODO: understand why Lotus uses wrong version
+        // TODO(go-state-types): https://github.com/filecoin-project/go-state-types/issues/408
+        // Enable this test once Lotus adds the `sector_number` field.
+        // RpcTest::identity(StateDecodeParams::request((
+        //     Address::MARKET_ACTOR,
+        //     fil_actor_market_state::v16::Method::VerifyDealsForActivation as u64,
+        //     to_vec(&market_actor_verify_deals_for_activation_params)?,
+        //     tipset.key().into(),
+        // ))?),
+        // TODO(go-state-types): https://github.com/filecoin-project/go-state-types/issues/408
+        // Enable this test when lotus supports correct types in go-state-types.
         // RpcTest::identity(StateDecodeParams::request((
         //     Address::MARKET_ACTOR,
         //     fil_actor_market_state::v16::Method::OnMinerSectorsTerminate as u64,

From 32b9030a94c0837c0144bb2e3532793640666baf Mon Sep 17 00:00:00 2001
From: Aryan Tikarya <akaladarshi@gmail.com>
Date: Mon, 8 Sep 2025 23:01:07 +0530
Subject: [PATCH 66/71] add snapshot tests in market actor

---
 Cargo.lock                                    |  32 +-
 .../methods/market_actor_params.rs            | 659 +++++++++++++++++-
 src/lotus_json/mod.rs                         |  12 +
 src/rpc/registry/actors/market.rs             |   6 +-
 .../subcommands/api_cmd/api_compare_tests.rs  |  22 +-
 5 files changed, 683 insertions(+), 48 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 94d68e1a7de2..3436daa2ce6c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2617,7 +2617,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_account_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "frc42_dispatch",
  "frc42_macros",
@@ -2632,7 +2632,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_cron_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "fvm_ipld_encoding",
  "fvm_shared 2.11.2",
@@ -2645,7 +2645,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_datacap_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "fil_actors_shared",
  "frc42_dispatch",
@@ -2664,7 +2664,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_eam_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "fil_actor_evm_state",
  "fvm_ipld_encoding",
@@ -2677,7 +2677,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_ethaccount_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "fvm_ipld_encoding",
  "fvm_shared 3.13.2",
@@ -2689,7 +2689,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_evm_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2708,7 +2708,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_init_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "anyhow",
  "cid",
@@ -2726,7 +2726,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_market_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "anyhow",
  "cid",
@@ -2752,7 +2752,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_miner_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "anyhow",
  "bitflags 2.9.4",
@@ -2781,7 +2781,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_multisig_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "anyhow",
  "cid",
@@ -2803,7 +2803,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_paych_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2820,7 +2820,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_power_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "anyhow",
  "cid",
@@ -2842,7 +2842,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_reward_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "fil_actors_shared",
  "fvm_ipld_encoding",
@@ -2857,7 +2857,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_system_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2873,7 +2873,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actor_verifreg_state"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "anyhow",
  "cid",
@@ -2893,7 +2893,7 @@ dependencies = [
 
 [[package]]
 name = "fil_actors_shared"
-version = "23.0.1"
+version = "24.1.1"
 dependencies = [
  "anyhow",
  "cid",
diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index e14bf6187c58..0cf2b79e931d 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -82,7 +82,7 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![(
                              json!({
-                                    "ProviderOrClient": "f01234",
+                                    "ProviderOrClientAddress": "f01234",
                                     "Amount": "1000000000000000000",
                                 }),
                             Self{
@@ -196,8 +196,41 @@ macro_rules! impl_lotus_json_for_deal_proposal {
 
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
-                        vec![
-                        ]
+                        // Create minimal test data using Default where possible
+
+                        // Note: We need to create version-specific test data due to different fvm_shared versions
+                        // For now, we'll use a minimal example that should work across versions
+                        let test_cid = ::cid::Cid::try_from("baga6ea4seaqao7s73y24kcutaosvacpdjgfe5pw76ooefnyqw4ynr3d2y6x2mpq").unwrap();
+
+                        vec![(
+                            serde_json::json!({
+                                "PieceCID": { "/": test_cid.to_string() },
+                                "PieceSize": 1024,
+                                "VerifiedDeal": false,
+                                "Client": "f01234",
+                                "Provider": "f05678",
+                                "Label": "test",
+                                "StartEpoch": 100,
+                                "EndEpoch": 200,
+                                "StoragePricePerEpoch": "1000",
+                                "ProviderCollateral": "2000",
+                                "ClientCollateral": "3000"
+                            }),
+                            // Create the corresponding object using from_lotus_json to ensure compatibility
+                            Self::from_lotus_json(crate::lotus_json::actor_states::methods::market_actor_params::DealProposalLotusJson {
+                                piece_cid: test_cid,
+                                piece_size: 1024u64.into(),
+                                verified_deal: false,
+                                client: crate::shim::address::Address::new_id(1234).into(),
+                                provider: crate::shim::address::Address::new_id(5678).into(),
+                                label: crate::lotus_json::actor_states::methods::market_actor_params::LabelLotusJson::String("test".to_string()),
+                                start_epoch: 100,
+                                end_epoch: 200,
+                                storage_price_per_epoch: crate::shim::econ::TokenAmount::from_atto(1000u64).into(),
+                                provider_collateral: crate::shim::econ::TokenAmount::from_atto(2000u64).into(),
+                                client_collateral: crate::shim::econ::TokenAmount::from_atto(3000u64).into(),
+                            })
+                        )]
                     }
 
                     fn into_lotus_json(self) -> Self::LotusJson {
@@ -301,8 +334,50 @@ macro_rules! impl_lotus_json_for_client_deal_proposal {
 
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
-                        vec![
-                        ]
+                        // Use the same test data as DealProposal, but add a client signature
+                        let test_cid = ::cid::Cid::try_from("baga6ea4seaqao7s73y24kcutaosvacpdjgfe5pw76ooefnyqw4ynr3d2y6x2mpq").unwrap();
+
+                        vec![(
+                            serde_json::json!({
+                                "Proposal": {
+                                    "PieceCID": { "/": test_cid.to_string() },
+                                    "PieceSize": 1024,
+                                    "VerifiedDeal": false,
+                                    "Client": "f01234",
+                                    "Provider": "f05678",
+                                    "Label": "test",
+                                    "StartEpoch": 100,
+                                    "EndEpoch": 200,
+                                    "StoragePricePerEpoch": "1000",
+                                    "ProviderCollateral": "2000",
+                                    "ClientCollateral": "3000"
+                                },
+                                "ClientSignature": {
+                                    "Type": 1,
+                                    "Data": "dGVzdA=="  // base64 for "test"
+                                }
+                            }),
+                            // Create object using from_lotus_json to ensure compatibility
+                            Self::from_lotus_json($lotus_json_type {
+                                proposal: crate::lotus_json::actor_states::methods::market_actor_params::DealProposalLotusJson {
+                                    piece_cid: test_cid,
+                                    piece_size: 1024u64.into(),
+                                    verified_deal: false,
+                                    client: crate::shim::address::Address::new_id(1234).into(),
+                                    provider: crate::shim::address::Address::new_id(5678).into(),
+                                    label: crate::lotus_json::actor_states::methods::market_actor_params::LabelLotusJson::String("test".to_string()),
+                                    start_epoch: 100,
+                                    end_epoch: 200,
+                                    storage_price_per_epoch: crate::shim::econ::TokenAmount::from_atto(1000u64).into(),
+                                    provider_collateral: crate::shim::econ::TokenAmount::from_atto(2000u64).into(),
+                                    client_collateral: crate::shim::econ::TokenAmount::from_atto(3000u64).into(),
+                                },
+                                client_signature: $type_suffix::Signature {
+                                    sig_type: $type_suffix::SignatureType::Secp256k1,
+                                    bytes: b"test".to_vec(),
+                                },
+                            })
+                        )]
                     }
 
                     fn into_lotus_json(self) -> Self::LotusJson {
@@ -346,16 +421,66 @@ pub struct PublishStorageDealsParamsV4LotusJson {
     pub deals: Vec<ClientDealProposalV4LotusJson>,
 }
 
-macro_rules! impl_lotus_json_for_publish_storage_deals_params {
-    ($lotus_json_type:ty: $($version:literal),+) => {
+macro_rules! impl_publish_storage_deals_params_snapshots_v2 {
+    ($($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::PublishStorageDealsParams {
-                    type LotusJson = $lotus_json_type;
+                    type LotusJson = PublishStorageDealsParamsV2LotusJson;
 
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                json!({
+                                    "Deals": [
+                                        {
+                                            "Proposal": {
+                                                "PieceCID": {
+                                                    "/": "baga6ea4seaqao7s73y24kcutaosvacpdjgfe5pw76ooefnyqw4ynr3d2y6x2mpq"
+                                                },
+                                                "PieceSize": 1024,
+                                                "VerifiedDeal": false,
+                                                "Client": "f17uoq6tp427uzv7fztkbsnn64iwotfrristwpryy",
+                                                "Provider": "f01000",
+                                                "Label": "test-deal",
+                                                "StartEpoch": 100,
+                                                "EndEpoch": 200,
+                                                "StoragePricePerEpoch": "1000",
+                                                "ProviderCollateral": "2000",
+                                                "ClientCollateral": "1500"
+                                            },
+                                            "ClientSignature": {
+                                                "Type": 1,
+                                                "Data": "VGVzdCBzaWduYXR1cmU="
+                                            }
+                                        }
+                                    ]
+                                }),
+                                fil_actor_market_state::[<v $version>]::PublishStorageDealsParams::from_lotus_json(PublishStorageDealsParamsV2LotusJson {
+                                    deals: vec![
+                                        ClientDealProposalV2LotusJson {
+                                            proposal: DealProposalLotusJson {
+                                                piece_cid: "baga6ea4seaqao7s73y24kcutaosvacpdjgfe5pw76ooefnyqw4ynr3d2y6x2mpq".parse().unwrap(),
+                                                piece_size: 1024u64.into(),
+                                                verified_deal: false,
+                                                client: "f17uoq6tp427uzv7fztkbsnn64iwotfrristwpryy".parse().unwrap(),
+                                                provider: "f01000".parse().unwrap(),
+                                                label: LabelLotusJson::String("test-deal".to_string()),
+                                                start_epoch: ChainEpoch::from(100),
+                                                end_epoch: ChainEpoch::from(200),
+                                                storage_price_per_epoch: TokenAmount::from_atto(1000u64),
+                                                provider_collateral: TokenAmount::from_atto(2000u64),
+                                                client_collateral: TokenAmount::from_atto(1500u64),
+                                            },
+                                            client_signature: fvm_shared2::crypto::signature::Signature {
+                                                sig_type: fvm_shared2::crypto::signature::SignatureType::Secp256k1,
+                                                bytes: b"Test signature".to_vec(),
+                                            },
+                                        }
+                                    ]
+                                })
+                            )
                         ]
                     }
 
@@ -378,18 +503,184 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
     };
 }
 
-impl_lotus_json_for_publish_storage_deals_params!(PublishStorageDealsParamsV2LotusJson: 8, 9);
-impl_lotus_json_for_publish_storage_deals_params!(PublishStorageDealsParamsV3LotusJson: 10, 11);
-impl_lotus_json_for_publish_storage_deals_params!(PublishStorageDealsParamsV4LotusJson: 12, 13, 14, 15, 16);
+macro_rules! impl_publish_storage_deals_params_snapshots_v3 {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::PublishStorageDealsParams {
+                    type LotusJson = PublishStorageDealsParamsV3LotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                            (
+                                json!({
+                                    "Deals": [
+                                        {
+                                            "Proposal": {
+                                                "PieceCID": {
+                                                    "/": "baga6ea4seaqao7s73y24kcutaosvacpdjgfe5pw76ooefnyqw4ynr3d2y6x2mpq"
+                                                },
+                                                "PieceSize": 1024,
+                                                "VerifiedDeal": false,
+                                                "Client": "f17uoq6tp427uzv7fztkbsnn64iwotfrristwpryy",
+                                                "Provider": "f01000",
+                                                "Label": "test-deal",
+                                                "StartEpoch": 100,
+                                                "EndEpoch": 200,
+                                                "StoragePricePerEpoch": "1000",
+                                                "ProviderCollateral": "2000",
+                                                "ClientCollateral": "1500"
+                                            },
+                                            "ClientSignature": {
+                                                "Type": 1,
+                                                "Data": "VGVzdCBzaWduYXR1cmU="
+                                            }
+                                        }
+                                    ]
+                                }),
+                                fil_actor_market_state::[<v $version>]::PublishStorageDealsParams::from_lotus_json(PublishStorageDealsParamsV3LotusJson {
+                                    deals: vec![
+                                        ClientDealProposalV3LotusJson {
+                                            proposal: DealProposalLotusJson {
+                                                piece_cid: "baga6ea4seaqao7s73y24kcutaosvacpdjgfe5pw76ooefnyqw4ynr3d2y6x2mpq".parse().unwrap(),
+                                                piece_size: 1024u64.into(),
+                                                verified_deal: false,
+                                                client: "f17uoq6tp427uzv7fztkbsnn64iwotfrristwpryy".parse().unwrap(),
+                                                provider: "f01000".parse().unwrap(),
+                                                label: LabelLotusJson::String("test-deal".to_string()),
+                                                start_epoch: ChainEpoch::from(100),
+                                                end_epoch: ChainEpoch::from(200),
+                                                storage_price_per_epoch: TokenAmount::from_atto(1000u64),
+                                                provider_collateral: TokenAmount::from_atto(2000u64),
+                                                client_collateral: TokenAmount::from_atto(1500u64),
+                                            },
+                                            client_signature: fvm_shared3::crypto::signature::Signature {
+                                                sig_type: fvm_shared3::crypto::signature::SignatureType::Secp256k1,
+                                                bytes: b"Test signature".to_vec(),
+                                            },
+                                        }
+                                    ]
+                                })
+                            )
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            deals: self.deals.into_iter().map(|d| d.into_lotus_json()).collect(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            deals: json.deals.into_iter()
+                            .map(|d| fil_actor_market_state::[<v $version>]::ClientDealProposal::from_lotus_json(d)) // delegate
+                            .collect(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+macro_rules! impl_publish_storage_deals_params_snapshots_v4 {
+    ($($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::PublishStorageDealsParams {
+                    type LotusJson = PublishStorageDealsParamsV4LotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                            (
+                                json!({
+                                    "Deals": [
+                                        {
+                                            "Proposal": {
+                                                "PieceCID": {
+                                                    "/": "baga6ea4seaqao7s73y24kcutaosvacpdjgfe5pw76ooefnyqw4ynr3d2y6x2mpq"
+                                                },
+                                                "PieceSize": 1024,
+                                                "VerifiedDeal": false,
+                                                "Client": "f17uoq6tp427uzv7fztkbsnn64iwotfrristwpryy",
+                                                "Provider": "f01000",
+                                                "Label": "test-deal",
+                                                "StartEpoch": 100,
+                                                "EndEpoch": 200,
+                                                "StoragePricePerEpoch": "1000",
+                                                "ProviderCollateral": "2000",
+                                                "ClientCollateral": "1500"
+                                            },
+                                            "ClientSignature": {
+                                                "Type": 1,
+                                                "Data": "VGVzdCBzaWduYXR1cmU="
+                                            }
+                                        }
+                                    ]
+                                }),
+                                fil_actor_market_state::[<v $version>]::PublishStorageDealsParams::from_lotus_json(PublishStorageDealsParamsV4LotusJson {
+                                    deals: vec![
+                                        ClientDealProposalV4LotusJson {
+                                            proposal: DealProposalLotusJson {
+                                                piece_cid: "baga6ea4seaqao7s73y24kcutaosvacpdjgfe5pw76ooefnyqw4ynr3d2y6x2mpq".parse().unwrap(),
+                                                piece_size: 1024u64.into(),
+                                                verified_deal: false,
+                                                client: "f17uoq6tp427uzv7fztkbsnn64iwotfrristwpryy".parse().unwrap(),
+                                                provider: "f01000".parse().unwrap(),
+                                                label: LabelLotusJson::String("test-deal".to_string()),
+                                                start_epoch: ChainEpoch::from(100),
+                                                end_epoch: ChainEpoch::from(200),
+                                                storage_price_per_epoch: TokenAmount::from_atto(1000u64),
+                                                provider_collateral: TokenAmount::from_atto(2000u64),
+                                                client_collateral: TokenAmount::from_atto(1500u64),
+                                            },
+                                            client_signature: fvm_shared4::crypto::signature::Signature {
+                                                sig_type: fvm_shared4::crypto::signature::SignatureType::Secp256k1,
+                                                bytes: b"Test signature".to_vec(),
+                                            },
+                                        }
+                                    ]
+                                })
+                            )
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            deals: self.deals.into_iter().map(|d| d.into_lotus_json()).collect(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            deals: json.deals.into_iter()
+                            .map(|d| fil_actor_market_state::[<v $version>]::ClientDealProposal::from_lotus_json(d)) // delegate
+                            .collect(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+}
+
+impl_publish_storage_deals_params_snapshots_v2!(8, 9);
+impl_publish_storage_deals_params_snapshots_v3!(10, 11);
+impl_publish_storage_deals_params_snapshots_v4!(12, 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct SectorDealsLotusJson {
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(default)]
     pub sector_number: Option<u64>,
     #[schemars(with = "LotusJson<RegisteredSealProof>")]
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(with = "crate::lotus_json")]
+    #[serde(default)]
     pub sector_type: Option<RegisteredSealProof>,
     pub sector_expiry: ChainEpoch,
     #[schemars(with = "LotusJson<DealID>")]
@@ -408,6 +699,16 @@ macro_rules! impl_lotus_json_for_sector_deals {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!({
+                                    "SectorExpiry": 1000,
+                                    "DealIDs": [1,2,3]
+                                }),
+                                Self {
+                                    sector_expiry: 1000,
+                                    deal_ids: vec![1,2,3],
+                                }
+                            ),
                         ]
                     }
 
@@ -440,6 +741,18 @@ macro_rules! impl_lotus_json_for_sector_deals {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!({
+                                    "SectorType": 1,
+                                    "SectorExpiry": 1000,
+                                    "DealIDs": [1,2,3]
+                                }),
+                                Self {
+                                    sector_type: RegisteredSealProof::from(1).into(),
+                                    sector_expiry: 1000,
+                                    deal_ids: vec![1,2,3],
+                                }
+                            ),
                         ]
                     }
 
@@ -472,6 +785,20 @@ macro_rules! impl_lotus_json_for_sector_deals {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!({
+                                    "SectorNumber": 42,
+                                    "SectorType": 1,
+                                    "SectorExpiry": 1000,
+                                    "DealIDs": [1,2,3]
+                                }),
+                                Self {
+                                    sector_number: 42,
+                                    sector_type: RegisteredSealProof::from(1).into(),
+                                    sector_expiry: 1000,
+                                    deal_ids: vec![1,2,3],
+                                }
+                            ),
                         ]
                     }
 
@@ -508,8 +835,57 @@ pub struct VerifyDealsForActivationParamsLotusJson {
     pub sectors: Vec<SectorDealsLotusJson>,
 }
 
-macro_rules! impl_lotus_json_for_publish_storage_deals_params {
-    ($($version:literal),+) => {
+macro_rules! impl_lotus_json_for_verify_deals_for_activation_params {
+    // Version 8: SectorDeals has only sector_expiry and deal_ids
+    (v8) => {
+        paste! {
+            impl HasLotusJson for fil_actor_market_state::v8::VerifyDealsForActivationParams {
+                type LotusJson = VerifyDealsForActivationParamsLotusJson;
+
+                #[cfg(test)]
+                fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                    vec![
+                        (
+                            serde_json::json!({
+                                "Sectors": [
+                                    {
+                                        "SectorExpiry": 1000,
+                                        "DealIDs": [1,2,3]
+                                    }
+                                ]
+                            }),
+                            Self {
+                                sectors: vec![
+                                    fil_actor_market_state::v8::SectorDeals {
+                                        sector_expiry: 1000,
+                                        deal_ids: vec![1,2,3],
+                                    }
+                                ],
+                            }
+                        ),
+                    ]
+                }
+
+                fn into_lotus_json(self) -> Self::LotusJson {
+                    Self::LotusJson {
+                        sectors: self.sectors.into_iter().map(|s| s.into_lotus_json()).collect(),
+                    }
+                }
+
+                fn from_lotus_json(json: Self::LotusJson) -> Self {
+                    Self {
+                        sectors: json
+                            .sectors
+                            .into_iter()
+                            .map(|s| fil_actor_market_state::v8::SectorDeals::from_lotus_json(s))
+                            .collect(),
+                    }
+                }
+            }
+        }
+    };
+    // Versions 9-12: SectorDeals has sector_type (which gets default value invalid() = 0)
+    (v9_to_v12: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::VerifyDealsForActivationParams {
@@ -518,6 +894,80 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!({
+                                    "Sectors": [
+                                        {
+                                            "SectorExpiry": 1000,
+                                            "DealIDs": [1,2,3],
+                                            "SectorType": 0
+                                        }
+                                    ]
+                                }),
+                                Self {
+                                    sectors: vec![
+                                        fil_actor_market_state::[<v $version>]::SectorDeals {
+                                            sector_expiry: 1000,
+                                            deal_ids: vec![1,2,3],
+                                            sector_type: RegisteredSealProof::invalid().into(),
+                                        }
+                                    ],
+                                }
+                            ),
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            sectors: self.sectors.into_iter().map(|s| s.into_lotus_json()).collect(),
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            sectors: json
+                                .sectors
+                                .into_iter()
+                                .map(|s| fil_actor_market_state::[<v $version>]::SectorDeals::from_lotus_json(s))
+                                .collect(),
+                        }
+                    }
+                }
+            }
+        )+
+    };
+    // Versions 13+: SectorDeals has both sector_type and sector_number (both get default values)
+    (v13_plus: $($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::VerifyDealsForActivationParams {
+                    type LotusJson = VerifyDealsForActivationParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                            (
+                                serde_json::json!({
+                                    "Sectors": [
+                                        {
+                                            "SectorExpiry": 1000,
+                                            "DealIDs": [1,2,3],
+                                            "SectorType": 0,
+                                            "SectorNumber": 0
+                                        }
+                                    ]
+                                }),
+                                Self {
+                                    sectors: vec![
+                                        fil_actor_market_state::[<v $version>]::SectorDeals {
+                                            sector_expiry: 1000,
+                                            deal_ids: vec![1,2,3],
+                                            sector_type: RegisteredSealProof::invalid().into(),
+                                            sector_number: 0u64.into(),
+                                        }
+                                    ],
+                                }
+                            ),
                         ]
                     }
 
@@ -532,7 +982,7 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
                             sectors: json
                                 .sectors
                                 .into_iter()
-                                .map(|s| fil_actor_market_state::[<v $version>]::SectorDeals::from_lotus_json(s)) // delegate
+                                .map(|s| fil_actor_market_state::[<v $version>]::SectorDeals::from_lotus_json(s))
                                 .collect(),
                         }
                     }
@@ -542,7 +992,9 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
     };
 }
 
-impl_lotus_json_for_publish_storage_deals_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_verify_deals_for_activation_params!(v8);
+impl_lotus_json_for_verify_deals_for_activation_params!(v9_to_v12: 9, 10, 11, 12);
+impl_lotus_json_for_verify_deals_for_activation_params!(v13_plus: 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
@@ -605,7 +1057,67 @@ pub struct BatchActivateDealsParamsLotusJson {
 }
 
 macro_rules! impl_lotus_json_for_batch_activate_deals_params {
-    ($($version:literal),+) => {
+    // Version 12: SectorDeals has sector_type but no sector_number
+    (v12: $($version:literal),+) => {
+        $(
+            paste! {
+                impl HasLotusJson for fil_actor_market_state::[<v $version>]::BatchActivateDealsParams {
+                    type LotusJson = BatchActivateDealsParamsLotusJson;
+
+                    #[cfg(test)]
+                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        vec![
+                            (
+                                serde_json::json!({
+                                    "Sectors": [
+                                        {
+                                            "SectorType": 1,
+                                            "SectorExpiry": 1000,
+                                            "DealIDs": [1,2,3]
+                                        }
+                                    ],
+                                    "ComputeCid": true
+                                }),
+                                Self {
+                                    sectors: vec![
+                                        fil_actor_market_state::[<v $version>]::SectorDeals::from_lotus_json(
+                                            SectorDealsLotusJson {
+                                                sector_number: None, // No sector_number in v12
+                                                sector_type: Some(RegisteredSealProof::from(1).into()),
+                                                sector_expiry: 1000,
+                                                deal_ids: vec![1,2,3],
+                                            }
+                                        )
+                                    ],
+                                    compute_cid: true,
+                                }
+                            ),
+                        ]
+                    }
+
+                    fn into_lotus_json(self) -> Self::LotusJson {
+                        Self::LotusJson {
+                            sectors: self.sectors.into_iter().map(|s| s.into_lotus_json()).collect(),
+                            compute_cid: self.compute_cid,
+                        }
+                    }
+
+                    fn from_lotus_json(json: Self::LotusJson) -> Self {
+                        Self {
+                            sectors: json
+                                .sectors
+                                .into_iter()
+                                .map(|s| fil_actor_market_state::[<v $version>]::SectorDeals::from_lotus_json(s))
+                                .collect(),
+                            compute_cid: json.compute_cid,
+                        }
+                    }
+                }
+            }
+        )+
+    };
+    // Versions 13-16: SectorDeals has both sector_type and sector_number
+    (v13_onwards: $($version:literal),+) => {
         $(
             paste! {
                 impl HasLotusJson for fil_actor_market_state::[<v $version>]::BatchActivateDealsParams {
@@ -614,6 +1126,32 @@ macro_rules! impl_lotus_json_for_batch_activate_deals_params {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!({
+                                    "Sectors": [
+                                        {
+                                            "SectorNumber": 42,
+                                            "SectorType": 1,
+                                            "SectorExpiry": 1000,
+                                            "DealIDs": [1,2,3]
+                                        }
+                                    ],
+                                    "ComputeCid": true
+                                }),
+                                Self {
+                                    sectors: vec![
+                                        fil_actor_market_state::[<v $version>]::SectorDeals::from_lotus_json(
+                                            SectorDealsLotusJson {
+                                                sector_number: Some(42), // Has sector_number in v13+
+                                                sector_type: Some(RegisteredSealProof::from(1).into()),
+                                                sector_expiry: 1000,
+                                                deal_ids: vec![1,2,3],
+                                            }
+                                        )
+                                    ],
+                                    compute_cid: true,
+                                }
+                            ),
                         ]
                     }
 
@@ -629,7 +1167,7 @@ macro_rules! impl_lotus_json_for_batch_activate_deals_params {
                             sectors: json
                                 .sectors
                                 .into_iter()
-                                .map(|s| fil_actor_market_state::[<v $version>]::SectorDeals::from_lotus_json(s)) // delegate
+                                .map(|s| fil_actor_market_state::[<v $version>]::SectorDeals::from_lotus_json(s))
                                 .collect(),
                             compute_cid: json.compute_cid,
                         }
@@ -640,7 +1178,8 @@ macro_rules! impl_lotus_json_for_batch_activate_deals_params {
     };
 }
 
-impl_lotus_json_for_batch_activate_deals_params!(12, 13, 14, 15, 16);
+impl_lotus_json_for_batch_activate_deals_params!(v12: 12);
+impl_lotus_json_for_batch_activate_deals_params!(v13_onwards: 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
@@ -708,7 +1247,20 @@ macro_rules! impl_lotus_json_for_on_miner_sectors_terminate_params {
 
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
+                        let mut sectors = BitField::new();
+                        sectors.set(1);
+
                         vec![
+                            (
+                                serde_json::json!({
+                                    "Epoch": 1000,
+                                    "Sectors": [1, 1]
+                                }),
+                                Self {
+                                    epoch: 1000,
+                                    sectors,
+                                }
+                            ),
                         ]
                     }
 
@@ -735,6 +1287,7 @@ impl_lotus_json_for_on_miner_sectors_terminate_params!(OnMinerSectorsTerminatePa
 impl_lotus_json_for_on_miner_sectors_terminate_params!(OnMinerSectorsTerminateParamsLotusJsonV13: 13, 14, 15, 16);
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[serde(rename_all = "PascalCase")]
 pub struct SectorDataSpecLotusJson {
     #[schemars(with = "LotusJson<DealID>")]
     #[serde(with = "crate::lotus_json")]
@@ -754,6 +1307,16 @@ macro_rules! impl_lotus_json_for_sector_data_spec {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!({
+                                    "DealIds": [1,2,3],
+                                    "SectorType": 1
+                                }),
+                                Self {
+                                    deal_ids: vec![1,2,3],
+                                    sector_type: RegisteredSealProof::from(1).into(),
+                                }
+                            ),
                         ]
                     }
 
@@ -794,6 +1357,26 @@ macro_rules! impl_lotus_json_for_compute_data_commitment_params {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!({
+                                    "Inputs": [
+                                        {
+                                            "DealIds": [1,2,3],
+                                            "SectorType": 1
+                                        }
+                                    ]
+                                }),
+                                Self {
+                                    inputs: vec![
+                                        fil_actor_market_state::[<v $version>]::SectorDataSpec::from_lotus_json(
+                                            SectorDataSpecLotusJson {
+                                                deal_ids: vec![1,2,3],
+                                                sector_type: RegisteredSealProof::from(1).into(),
+                                            }
+                                        )
+                                    ],
+                                }
+                            ),
                         ]
                     }
 
@@ -838,6 +1421,10 @@ macro_rules! impl_lotus_json_for_deal_query_params {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!(42),
+                                Self { id: 42 }
+                            ),
                         ]
                     }
 
@@ -876,6 +1463,10 @@ macro_rules! impl_lotus_json_for_settle_deal_payments_params {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!([0]),
+                                Self { deal_ids: BitField::new() }
+                            ),
                         ]
                     }
 
@@ -934,6 +1525,14 @@ macro_rules! impl_lotus_json_for_sector_content_changed_params {
                     #[cfg(test)]
                     fn snapshots() -> Vec<(serde_json::Value, Self)> {
                         vec![
+                            (
+                                serde_json::json!({
+                                    "Sectors": []
+                                }),
+                                Self {
+                                    sectors: vec![],
+                                }
+                            ),
                         ]
                     }
 
@@ -983,5 +1582,27 @@ impl_lotus_json_for_sector_content_changed_params!(13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: AddBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: WithdrawBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: Label: 8, 9, 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: DealProposal: 8, 9, 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: ClientDealProposal: 8, 9, 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: PublishStorageDealsParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: SectorDeals: 8, 9, 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: VerifyDealsForActivationParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
 test_snapshots!(fil_actor_market_state: ActivateDealsParams: 8, 9, 10, 11);
-test_snapshots!(fil_actor_market_state: OnMinerSectorsTerminateParams: 8, 9, 10, 11, 12);
+test_snapshots!(fil_actor_market_state: BatchActivateDealsParams: 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: OnMinerSectorsTerminateParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: SectorDataSpec: 8, 9, 10, 11);
+test_snapshots!(fil_actor_market_state: ComputeDataCommitmentParams: 8, 9, 10, 11);
+test_snapshots!(fil_actor_market_state: DealQueryParams: 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: SettleDealPaymentsParams: 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: GetDealActivationParams: 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: GetDealClientCollateralParams: 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: GetDealClientParams: 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: GetDealDataCommitmentParams: 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: GetDealLabelParams: 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: GetDealProviderCollateralParams: 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: GetDealProviderParams: 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: GetDealTermParams: 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: GetDealTotalPriceParams: 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: GetDealVerifiedParams: 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: GetDealSectorParams: 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: ext::miner: SectorContentChangedParams: 13, 14, 15, 16);
diff --git a/src/lotus_json/mod.rs b/src/lotus_json/mod.rs
index f0ff9645c53d..345bae794644 100644
--- a/src/lotus_json/mod.rs
+++ b/src/lotus_json/mod.rs
@@ -257,6 +257,18 @@ macro_rules! test_snapshots {
             }
         )+
     };
+
+    ($module:path: $nested_path:path: $ty:ident: $($version:literal),+ $(,)?) => {
+        $(
+            paste::paste! {
+                #[test]
+                fn [<snapshots_ $module _v $version _ $ty:lower>]() {
+                    use super::*;
+                    assert_all_snapshots::<$module::[<v $version>]::$nested_path::$ty>();
+                }
+            }
+        )+
+    };
 }
 
 #[cfg(any(test, doc))]
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index f57b4ba8be3f..010c6a720470 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -88,8 +88,10 @@ macro_rules! register_market_exported_methods_v10_onwards {
 
 macro_rules! register_market_exported_methods_v13_onwards {
     ($registry:expr, $code_cid:expr, $market_state_version:path) => {{
-        use fil_actor_miner_state::v16::SectorContentChangedParams;
-        use $market_state_version::{GetDealSectorParams, Method, SettleDealPaymentsParams};
+        use $market_state_version::{
+            GetDealSectorParams, Method, SettleDealPaymentsParams,
+            ext::miner::SectorContentChangedParams,
+        };
 
         register_actor_methods!(
             $registry,
diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 0b7035da7a94..823b02f7f32d 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -1893,18 +1893,18 @@ fn state_decode_params_api_tests(tipset: &Tipset) -> anyhow::Result<Vec<RpcTest>
         ))?),
     ];
 
-    // tests.extend(miner_actor_state_decode_params_tests(tipset)?);
-    // tests.extend(account_actor_state_decode_params_tests(tipset)?);
-    // tests.extend(init_actor_state_decode_params_tests(tipset)?);
-    // tests.extend(evm_actor_state_decode_params_tests(tipset)?);
-    // tests.extend(reward_actor_state_decode_params_tests(tipset)?);
-    // tests.extend(power_actor_state_decode_params_tests(tipset)?);
-    // tests.extend(datacap_actor_state_decode_params_tests(tipset)?);
-    // tests.extend(multisig_actor_state_decode_params_tests(tipset)?);
-    // tests.extend(verified_reg_actor_state_decode_params_tests(tipset)?);
+    tests.extend(miner_actor_state_decode_params_tests(tipset)?);
+    tests.extend(account_actor_state_decode_params_tests(tipset)?);
+    tests.extend(init_actor_state_decode_params_tests(tipset)?);
+    tests.extend(evm_actor_state_decode_params_tests(tipset)?);
+    tests.extend(reward_actor_state_decode_params_tests(tipset)?);
+    tests.extend(power_actor_state_decode_params_tests(tipset)?);
+    tests.extend(datacap_actor_state_decode_params_tests(tipset)?);
+    tests.extend(multisig_actor_state_decode_params_tests(tipset)?);
+    tests.extend(verified_reg_actor_state_decode_params_tests(tipset)?);
     tests.extend(market_actor_state_decode_params_tests(tipset)?);
-    // tests.extend(paych_actor_state_decode_params_tests(tipset)?);
-    // tests.extend(eam_actor_state_decode_params_tests(tipset)?);
+    tests.extend(paych_actor_state_decode_params_tests(tipset)?);
+    tests.extend(eam_actor_state_decode_params_tests(tipset)?);
 
     Ok(tests)
 }

From d2502d0dfe356c02e3650efd066107c5925e10af Mon Sep 17 00:00:00 2001
From: Aryan Tikarya <akaladarshi@gmail.com>
Date: Tue, 9 Sep 2025 22:13:41 +0530
Subject: [PATCH 67/71] add snapshot tests

---
 .../subcommands/api_cmd/api_compare_tests.rs  |  3 ++-
 .../subcommands/api_cmd/test_snapshots.txt    | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
index 823b02f7f32d..31a39d1fcfee 100644
--- a/src/tool/subcommands/api_cmd/api_compare_tests.rs
+++ b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -3600,7 +3600,8 @@ fn market_actor_state_decode_params_tests(tipset: &Tipset) -> anyhow::Result<Vec
             to_vec(&market_actor_settle_deal_payments_params)?,
             tipset.key().into(),
         ))?),
-        // TODO: Create issue, Lotus *[]miner.SectorChanges is not typegen
+        // TODO(lotus): https://github.com/filecoin-project/lotus/issues/13329
+        // Lotus panics while decoding this method.
         // RpcTest::identity(StateDecodeParams::request((
         //     Address::MARKET_ACTOR,
         //     fil_actor_market_state::v16::Method::SectorContentChangedExported as u64,
diff --git a/src/tool/subcommands/api_cmd/test_snapshots.txt b/src/tool/subcommands/api_cmd/test_snapshots.txt
index 39e9e1846fdb..bc4023a68642 100644
--- a/src/tool/subcommands/api_cmd/test_snapshots.txt
+++ b/src/tool/subcommands/api_cmd/test_snapshots.txt
@@ -210,6 +210,27 @@ filecoin_statemarketbalance_1737021768960382.rpcsnap.json.zst
 filecoin_statemarketdeals_1737021771457252.rpcsnap.json.zst
 filecoin_statemarketparticipants_1737021768960732.rpcsnap.json.zst
 filecoin_statemarketstoragedeal_1737021768962584.rpcsnap.json.zst
+filecoin_market_addbalance_statedecodeparams_1757426002278914.rpcsnap.json.zst
+filecoin_market_addbalanceexported_statedecodeparams_1757426002338931.rpcsnap.json.zst
+filecoin_market_constructor_statedecodeparams_1757426002270973.rpcsnap.json.zst
+filecoin_market_crontick_statedecodeparams_1757426002327008.rpcsnap.json.zst
+filecoin_market_getbalanceexported_statedecodeparams_1757426002362902.rpcsnap.json.zst
+filecoin_market_getdealactivationexported_statedecodeparams_1757426002422988.rpcsnap.json.zst
+filecoin_market_getdealclientcollateralexported_statedecodeparams_1757426002407069.rpcsnap.json.zst
+filecoin_market_getdealclientexported_statedecodeparams_1757426002366899.rpcsnap.json.zst
+filecoin_market_getdealdatacommitmentexported_statedecodeparams_1757426002363106.rpcsnap.json.zst
+filecoin_market_getdeallabelexported_statedecodeparams_1757426002382966.rpcsnap.json.zst
+filecoin_market_getdealprovidercollateralexported_statedecodeparams_1757426002415167.rpcsnap.json.zst
+filecoin_market_getdealproviderexported_statedecodeparams_1757426002375082.rpcsnap.json.zst
+filecoin_market_getdealsectorexported_statedecodeparams_1757426002423094.rpcsnap.json.zst
+filecoin_market_getdealtermexported_statedecodeparams_1757426002394955.rpcsnap.json.zst
+filecoin_market_getdealtotalpriceexported_statedecodeparams_1757426002399187.rpcsnap.json.zst
+filecoin_market_getdealverifiedexported_statedecodeparams_1757426002419004.rpcsnap.json.zst
+filecoin_market_publishstoragedeals_statedecodeparams_1757426002306931.rpcsnap.json.zst
+filecoin_market_publishstoragedealsexported_statedecodeparams_1757426002358906.rpcsnap.json.zst
+filecoin_market_settledealpaymentsexported_statedecodeparams_1757426002430957.rpcsnap.json.zst
+filecoin_market_withdrawbalance_statedecodeparams_1757426002298895.rpcsnap.json.zst
+filecoin_market_withdrawbalanceexported_statedecodeparams_1757426002346995.rpcsnap.json.zst
 filecoin_statemineractivesectors_1743095344878935.rpcsnap.json.zst
 filecoin_stateminerallocated_1737022538682774.rpcsnap.json.zst
 filecoin_statemineravailablebalance_1737022538683759.rpcsnap.json.zst

From 4d8bf406cf4ec0702f306ee8ea13460d9c529b98 Mon Sep 17 00:00:00 2001
From: Aryan Tikarya <akaladarshi@gmail.com>
Date: Tue, 9 Sep 2025 22:26:26 +0530
Subject: [PATCH 68/71] remove uneccessary files and linter fix

---
 .../methods/miner_change_worker_params.rs     | 218 ------------------
 .../subcommands/api_cmd/test_snapshots.txt    |  42 ++--
 2 files changed, 21 insertions(+), 239 deletions(-)
 delete mode 100644 src/lotus_json/actor_states/methods/miner_change_worker_params.rs

diff --git a/src/lotus_json/actor_states/methods/miner_change_worker_params.rs b/src/lotus_json/actor_states/methods/miner_change_worker_params.rs
deleted file mode 100644
index dbfff99ded1f..000000000000
--- a/src/lotus_json/actor_states/methods/miner_change_worker_params.rs
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2019-2025 ChainSafe Systems
-// SPDX-License-Identifier: Apache-2.0, MIT
-use super::*;
-use crate::shim::address::Address;
-use crate::shim::clock::ChainEpoch;
-use crate::shim::piece::PaddedPieceSize;
-use crate::shim::sector::SectorNumber;
-use fvm_ipld_encoding::RawBytes;
-use paste::paste;
-
-use ::cid::Cid;
-
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-#[serde(rename_all = "PascalCase")]
-pub struct MinerChangeWorkerParamsLotusJson {
-    #[schemars(with = "LotusJson<Address>")]
-    #[serde(with = "crate::lotus_json")]
-    pub new_worker: Address,
-
-    #[schemars(with = "LotusJson<Vec<Address>>")]
-    #[serde(with = "crate::lotus_json")]
-    #[serde(rename = "NewControlAddrs")]
-    pub new_control_addresses: Vec<Address>,
-}
-
-macro_rules!  impl_lotus_json_for_miner_change_worker_param {
-    ($($version:literal),+) => {
-        $(
-        paste! {
-                impl HasLotusJson for fil_actor_miner_state::[<v $version>]::ChangeWorkerAddressParams {
-                    type LotusJson = MinerChangeWorkerParamsLotusJson;
-
-                    #[cfg(test)]
-                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
-                        vec![
-                            (
-                                json!({
-                                    "NewWorker": "f01234",
-                                    "NewControlAddrs": ["f01236", "f01237"],
-                                }),
-                                Self {
-                                    new_worker: Address::new_id(1234).into(),
-                                    new_control_addresses: vec![Address::new_id(1236).into(), Address::new_id(1237).into()],
-                                },
-                            ),
-                        ]
-                    }
-
-                    fn into_lotus_json(self) -> Self::LotusJson {
-                        MinerChangeWorkerParamsLotusJson {
-                            new_worker: self.new_worker.into(),
-                            new_control_addresses: self.new_control_addresses
-                                .into_iter()
-                                .map(|a| a.into())
-                                .collect(),
-                        }
-                    }
-
-                    fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
-                        Self {
-                            new_worker: lotus_json.new_worker.into(),
-                            new_control_addresses: lotus_json.new_control_addresses
-                                .into_iter()
-                                .map(|a| a.into())
-                                .collect(),
-                        }
-                    }
-                }
-            }
-        )+
-    };
-}
-
-impl_lotus_json_for_miner_change_worker_param!(8, 9, 10, 11, 12, 13, 14, 15, 16);
-
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-#[serde(rename_all = "PascalCase")]
-pub struct PieceChangeLotusJson {
-    #[schemars(with = "LotusJson<Cid>")]
-    #[serde(with = "crate::lotus_json")]
-    pub data: Cid,
-    #[schemars(with = "LotusJson<PaddedPieceSize>")]
-    #[serde(with = "crate::lotus_json")]
-    pub size: PaddedPieceSize,
-    #[schemars(with = "LotusJson<RawBytes>")]
-    #[serde(with = "crate::lotus_json")]
-    pub payload: RawBytes,
-}
-
-macro_rules! impl_lotus_json_piece_change {
-    ($($version:literal),+) => {
-        $(
-            paste! {
-                impl HasLotusJson for fil_actor_miner_state::[<v $version>]::PieceChange {
-                    type LotusJson = PieceChangeLotusJson;
-
-                    #[cfg(test)]
-                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
-                        vec![
-                        ]
-                    }
-
-                    fn into_lotus_json(self) -> Self::LotusJson {
-                        Self::LotusJson {
-                            data: self.data.into(),
-                            size: self.size.into(),
-                            payload: self.payload.into(),
-                        }
-                    }
-
-                    fn from_lotus_json(json: Self::LotusJson) -> Self {
-                        Self {
-                            data: json.data.into(),
-                            size: json.size.into(),
-                            payload: json.payload.into(),
-                        }
-                    }
-                }
-            }
-        )+
-    };
-}
-
-impl_lotus_json_piece_change!(13, 14, 15, 16);
-
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-#[serde(rename_all = "PascalCase")]
-pub struct SectorChangesLotusJson {
-    #[schemars(with = "LotusJson<Vec<Address>>")]
-    #[serde(with = "crate::lotus_json")]
-    pub sector: SectorNumber,
-    #[schemars(with = "LotusJson<ChainEpoch>")]
-    #[serde(with = "crate::lotus_json")]
-    pub minimum_commitment_epoch: ChainEpoch,
-    pub added: Vec<PieceChangeLotusJson>,
-}
-
-macro_rules! impl_lotus_json_sector_changes {
-    ($($version:literal),+) => {
-        $(
-            paste! {
-                impl HasLotusJson for fil_actor_miner_state::[<v $version>]::SectorChanges {
-                    type LotusJson = SectorChangesLotusJson;
-
-                    #[cfg(test)]
-                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
-                        vec![
-                        ]
-                    }
-
-                    fn into_lotus_json(self) -> Self::LotusJson {
-                        Self::LotusJson {
-                            sector: self.sector.into(),
-                            minimum_commitment_epoch: self.minimum_commitment_epoch.into(),
-                            added: self.added.into_iter()
-                                .map(|pc| pc.into_lotus_json())
-                                .collect(),
-                        }
-                    }
-
-                    fn from_lotus_json(json: Self::LotusJson) -> Self {
-                        Self {
-                            sector: json.sector.into(),
-                            minimum_commitment_epoch: json.minimum_commitment_epoch.into(),
-                            added: json.added.into_iter()
-                                .map(|pc| fil_actor_miner_state::[<v $version>]::PieceChange::from_lotus_json(pc),)
-                                .collect(),
-                        }
-                    }
-                }
-            }
-        )+
-    };
-}
-
-impl_lotus_json_sector_changes!(13, 14, 15, 16);
-
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-#[serde(rename_all = "PascalCase")]
-pub struct SectorContentChangedParamsLotusJson {
-    pub sectors: Vec<SectorChangesLotusJson>,
-}
-
-macro_rules! impl_lotus_json_sector_content_changed_params {
-    ($($version:literal),+) => {
-        $(
-            paste! {
-                impl HasLotusJson for fil_actor_miner_state::[<v $version>]::SectorContentChangedParams {
-                    type LotusJson = SectorContentChangedParamsLotusJson;
-
-                    #[cfg(test)]
-                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
-                        vec![
-                        ]
-                    }
-
-                    fn into_lotus_json(self) -> Self::LotusJson {
-                        Self::LotusJson {
-                            sectors: self.sectors.into_iter()
-                                .map(|sc| sc.into_lotus_json())
-                                .collect(),
-                        }
-                    }
-
-                    fn from_lotus_json(json: Self::LotusJson) -> Self {
-                        Self {
-                            sectors: json.sectors.into_iter()
-                                .map(|sc| fil_actor_miner_state::[<v $version>]::SectorChanges::from_lotus_json(sc),)
-                                .collect(),
-                        }
-                    }
-                }
-            }
-        )+
-    };
-}
-
-impl_lotus_json_sector_content_changed_params!(13, 14, 15, 16);
diff --git a/src/tool/subcommands/api_cmd/test_snapshots.txt b/src/tool/subcommands/api_cmd/test_snapshots.txt
index bc4023a68642..a55294d47891 100644
--- a/src/tool/subcommands/api_cmd/test_snapshots.txt
+++ b/src/tool/subcommands/api_cmd/test_snapshots.txt
@@ -90,6 +90,27 @@ filecoin_evm_invokecontractdelegate_statedecodeparams_1755004924714578.rpcsnap.j
 filecoin_evm_resurrect_statedecodeparams_1755004924714636.rpcsnap.json.zst
 filecoin_gasestimategaslimit_1741782110512299.rpcsnap.json.zst
 filecoin_getactoreventsraw_1741782590255476.rpcsnap.json.zst
+filecoin_market_addbalance_statedecodeparams_1757426002278914.rpcsnap.json.zst
+filecoin_market_addbalanceexported_statedecodeparams_1757426002338931.rpcsnap.json.zst
+filecoin_market_constructor_statedecodeparams_1757426002270973.rpcsnap.json.zst
+filecoin_market_crontick_statedecodeparams_1757426002327008.rpcsnap.json.zst
+filecoin_market_getbalanceexported_statedecodeparams_1757426002362902.rpcsnap.json.zst
+filecoin_market_getdealactivationexported_statedecodeparams_1757426002422988.rpcsnap.json.zst
+filecoin_market_getdealclientcollateralexported_statedecodeparams_1757426002407069.rpcsnap.json.zst
+filecoin_market_getdealclientexported_statedecodeparams_1757426002366899.rpcsnap.json.zst
+filecoin_market_getdealdatacommitmentexported_statedecodeparams_1757426002363106.rpcsnap.json.zst
+filecoin_market_getdeallabelexported_statedecodeparams_1757426002382966.rpcsnap.json.zst
+filecoin_market_getdealprovidercollateralexported_statedecodeparams_1757426002415167.rpcsnap.json.zst
+filecoin_market_getdealproviderexported_statedecodeparams_1757426002375082.rpcsnap.json.zst
+filecoin_market_getdealsectorexported_statedecodeparams_1757426002423094.rpcsnap.json.zst
+filecoin_market_getdealtermexported_statedecodeparams_1757426002394955.rpcsnap.json.zst
+filecoin_market_getdealtotalpriceexported_statedecodeparams_1757426002399187.rpcsnap.json.zst
+filecoin_market_getdealverifiedexported_statedecodeparams_1757426002419004.rpcsnap.json.zst
+filecoin_market_publishstoragedeals_statedecodeparams_1757426002306931.rpcsnap.json.zst
+filecoin_market_publishstoragedealsexported_statedecodeparams_1757426002358906.rpcsnap.json.zst
+filecoin_market_settledealpaymentsexported_statedecodeparams_1757426002430957.rpcsnap.json.zst
+filecoin_market_withdrawbalance_statedecodeparams_1757426002298895.rpcsnap.json.zst
+filecoin_market_withdrawbalanceexported_statedecodeparams_1757426002346995.rpcsnap.json.zst
 filecoin_miner_statedecodeparams_1755027105570743.rpcsnap.json.zst
 filecoin_miner_statedecodeparams_1755027105571288.rpcsnap.json.zst
 filecoin_miner_statedecodeparams_1755027105571367.rpcsnap.json.zst
@@ -210,27 +231,6 @@ filecoin_statemarketbalance_1737021768960382.rpcsnap.json.zst
 filecoin_statemarketdeals_1737021771457252.rpcsnap.json.zst
 filecoin_statemarketparticipants_1737021768960732.rpcsnap.json.zst
 filecoin_statemarketstoragedeal_1737021768962584.rpcsnap.json.zst
-filecoin_market_addbalance_statedecodeparams_1757426002278914.rpcsnap.json.zst
-filecoin_market_addbalanceexported_statedecodeparams_1757426002338931.rpcsnap.json.zst
-filecoin_market_constructor_statedecodeparams_1757426002270973.rpcsnap.json.zst
-filecoin_market_crontick_statedecodeparams_1757426002327008.rpcsnap.json.zst
-filecoin_market_getbalanceexported_statedecodeparams_1757426002362902.rpcsnap.json.zst
-filecoin_market_getdealactivationexported_statedecodeparams_1757426002422988.rpcsnap.json.zst
-filecoin_market_getdealclientcollateralexported_statedecodeparams_1757426002407069.rpcsnap.json.zst
-filecoin_market_getdealclientexported_statedecodeparams_1757426002366899.rpcsnap.json.zst
-filecoin_market_getdealdatacommitmentexported_statedecodeparams_1757426002363106.rpcsnap.json.zst
-filecoin_market_getdeallabelexported_statedecodeparams_1757426002382966.rpcsnap.json.zst
-filecoin_market_getdealprovidercollateralexported_statedecodeparams_1757426002415167.rpcsnap.json.zst
-filecoin_market_getdealproviderexported_statedecodeparams_1757426002375082.rpcsnap.json.zst
-filecoin_market_getdealsectorexported_statedecodeparams_1757426002423094.rpcsnap.json.zst
-filecoin_market_getdealtermexported_statedecodeparams_1757426002394955.rpcsnap.json.zst
-filecoin_market_getdealtotalpriceexported_statedecodeparams_1757426002399187.rpcsnap.json.zst
-filecoin_market_getdealverifiedexported_statedecodeparams_1757426002419004.rpcsnap.json.zst
-filecoin_market_publishstoragedeals_statedecodeparams_1757426002306931.rpcsnap.json.zst
-filecoin_market_publishstoragedealsexported_statedecodeparams_1757426002358906.rpcsnap.json.zst
-filecoin_market_settledealpaymentsexported_statedecodeparams_1757426002430957.rpcsnap.json.zst
-filecoin_market_withdrawbalance_statedecodeparams_1757426002298895.rpcsnap.json.zst
-filecoin_market_withdrawbalanceexported_statedecodeparams_1757426002346995.rpcsnap.json.zst
 filecoin_statemineractivesectors_1743095344878935.rpcsnap.json.zst
 filecoin_stateminerallocated_1737022538682774.rpcsnap.json.zst
 filecoin_statemineravailablebalance_1737022538683759.rpcsnap.json.zst

From 02b1560bf0b6ce4c4770ff29a97d5084053abeda Mon Sep 17 00:00:00 2001
From: Aryan Tikarya <akaladarshi@gmail.com>
Date: Tue, 9 Sep 2025 22:36:20 +0530
Subject: [PATCH 69/71] remove uneccessary changes

---
 .../methods/market_actor_params.rs            |   3 +-
 .../methods/miner_actor_params.rs             | 142 ------------------
 2 files changed, 1 insertion(+), 144 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 0cf2b79e931d..787c4de76f08 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -12,10 +12,9 @@ use crate::test_snapshots;
 use fil_actors_shared::fvm_ipld_bitfield::BitField;
 
 use ::cid::Cid;
-use jsonrpsee::core::Serialize;
 use paste::paste;
 use schemars::JsonSchema;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
diff --git a/src/lotus_json/actor_states/methods/miner_actor_params.rs b/src/lotus_json/actor_states/methods/miner_actor_params.rs
index 81a1f7853336..be20adc8aaf2 100644
--- a/src/lotus_json/actor_states/methods/miner_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/miner_actor_params.rs
@@ -6,7 +6,6 @@ use crate::shim::{
     address::Address,
     clock::ChainEpoch,
     econ::TokenAmount,
-    piece::PaddedPieceSize,
     sector::{PoStProof, RegisteredPoStProof, RegisteredSealProof, SectorNumber},
 };
 use ::cid::Cid;
@@ -3696,144 +3695,6 @@ macro_rules! impl_miner_internal_sector_setup_for_preseal_params {
     };
 }
 
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-#[serde(rename_all = "PascalCase")]
-pub struct PieceChangeLotusJson {
-    #[schemars(with = "LotusJson<Cid>")]
-    #[serde(with = "crate::lotus_json")]
-    pub data: Cid,
-    #[schemars(with = "LotusJson<PaddedPieceSize>")]
-    #[serde(with = "crate::lotus_json")]
-    pub size: PaddedPieceSize,
-    #[schemars(with = "LotusJson<RawBytes>")]
-    #[serde(with = "crate::lotus_json")]
-    pub payload: RawBytes,
-}
-
-macro_rules! impl_lotus_json_piece_change {
-    ($($version:literal),+) => {
-        $(
-            paste! {
-                impl HasLotusJson for fil_actor_miner_state::[<v $version>]::PieceChange {
-                    type LotusJson = PieceChangeLotusJson;
-
-                    #[cfg(test)]
-                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
-                        vec![
-                        ]
-                    }
-
-                    fn into_lotus_json(self) -> Self::LotusJson {
-                        Self::LotusJson {
-                            data: self.data.into(),
-                            size: self.size.into(),
-                            payload: self.payload.into(),
-                        }
-                    }
-
-                    fn from_lotus_json(json: Self::LotusJson) -> Self {
-                        Self {
-                            data: json.data.into(),
-                            size: json.size.into(),
-                            payload: json.payload.into(),
-                        }
-                    }
-                }
-            }
-        )+
-    };
-}
-
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-#[serde(rename_all = "PascalCase")]
-pub struct SectorChangesLotusJson {
-    #[schemars(with = "LotusJson<Vec<Address>>")]
-    #[serde(with = "crate::lotus_json")]
-    pub sector: SectorNumber,
-    #[schemars(with = "LotusJson<ChainEpoch>")]
-    #[serde(with = "crate::lotus_json")]
-    pub minimum_commitment_epoch: ChainEpoch,
-    pub added: Vec<PieceChangeLotusJson>,
-}
-
-macro_rules! impl_lotus_json_sector_changes {
-    ($($version:literal),+) => {
-        $(
-            paste! {
-                impl HasLotusJson for fil_actor_miner_state::[<v $version>]::SectorChanges {
-                    type LotusJson = SectorChangesLotusJson;
-
-                    #[cfg(test)]
-                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
-                        vec![
-                        ]
-                    }
-
-                    fn into_lotus_json(self) -> Self::LotusJson {
-                        Self::LotusJson {
-                            sector: self.sector.into(),
-                            minimum_commitment_epoch: self.minimum_commitment_epoch.into(),
-                            added: self.added.into_iter()
-                                .map(|pc| pc.into_lotus_json())
-                                .collect(),
-                        }
-                    }
-
-                    fn from_lotus_json(json: Self::LotusJson) -> Self {
-                        Self {
-                            sector: json.sector.into(),
-                            minimum_commitment_epoch: json.minimum_commitment_epoch.into(),
-                            added: json.added.into_iter()
-                                .map(|pc| fil_actor_miner_state::[<v $version>]::PieceChange::from_lotus_json(pc),)
-                                .collect(),
-                        }
-                    }
-                }
-            }
-        )+
-    };
-}
-
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
-#[serde(rename_all = "PascalCase")]
-pub struct SectorContentChangedParamsLotusJson {
-    pub sectors: Vec<SectorChangesLotusJson>,
-}
-
-macro_rules! impl_lotus_json_sector_content_changed_params {
-    ($($version:literal),+) => {
-        $(
-            paste! {
-                impl HasLotusJson for fil_actor_miner_state::[<v $version>]::SectorContentChangedParams {
-                    type LotusJson = SectorContentChangedParamsLotusJson;
-
-                    #[cfg(test)]
-                    fn snapshots() -> Vec<(serde_json::Value, Self)> {
-                        vec![
-                        ]
-                    }
-
-                    fn into_lotus_json(self) -> Self::LotusJson {
-                        Self::LotusJson {
-                            sectors: self.sectors.into_iter()
-                                .map(|sc| sc.into_lotus_json())
-                                .collect(),
-                        }
-                    }
-
-                    fn from_lotus_json(json: Self::LotusJson) -> Self {
-                        Self {
-                            sectors: json.sectors.into_iter()
-                                .map(|sc| fil_actor_miner_state::[<v $version>]::SectorChanges::from_lotus_json(sc),)
-                                .collect(),
-                        }
-                    }
-                }
-            }
-        )+
-    };
-}
-
 impl_lotus_json_for_miner_constructor_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 impl_lotus_json_for_miner_change_worker_param!(8, 9, 10, 11, 12, 13, 14, 15, 16);
 impl_lotus_json_for_miner_change_owner_address_params!(11, 12, 13, 14, 15, 16);
@@ -3885,6 +3746,3 @@ impl_miner_prove_replica_update_params2!(fvm_shared3: 10, 11);
 impl_miner_prove_replica_update_params2!(fvm_shared4: 12);
 impl_lotus_json_for_miner_prove_commit_sector_ni_params!(14, 15, 16);
 impl_miner_internal_sector_setup_for_preseal_params!(14, 15, 16);
-impl_lotus_json_piece_change!(13, 14, 15, 16);
-impl_lotus_json_sector_changes!(13, 14, 15, 16);
-impl_lotus_json_sector_content_changed_params!(13, 14, 15, 16);

From 48ea34de78ccbd1c818a39affca4077ddfb35ec3 Mon Sep 17 00:00:00 2001
From: Aryan Tikarya <akaladarshi@gmail.com>
Date: Tue, 9 Sep 2025 23:28:39 +0530
Subject: [PATCH 70/71] reolve ai comment

---
 src/lotus_json/actor_states/methods/market_actor_params.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 787c4de76f08..395cc2e55e8d 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -1289,7 +1289,7 @@ impl_lotus_json_for_on_miner_sectors_terminate_params!(OnMinerSectorsTerminatePa
 #[serde(rename_all = "PascalCase")]
 pub struct SectorDataSpecLotusJson {
     #[schemars(with = "LotusJson<DealID>")]
-    #[serde(with = "crate::lotus_json")]
+    #[serde(with = "crate::lotus_json", rename = "DealIDs")]
     pub deal_ids: Vec<DealID>,
     #[schemars(with = "LotusJson<RegisteredSealProof>")]
     #[serde(with = "crate::lotus_json")]
@@ -1308,7 +1308,7 @@ macro_rules! impl_lotus_json_for_sector_data_spec {
                         vec![
                             (
                                 serde_json::json!({
-                                    "DealIds": [1,2,3],
+                                    "DealIDs": [1,2,3],
                                     "SectorType": 1
                                 }),
                                 Self {
@@ -1360,7 +1360,7 @@ macro_rules! impl_lotus_json_for_compute_data_commitment_params {
                                 serde_json::json!({
                                     "Inputs": [
                                         {
-                                            "DealIds": [1,2,3],
+                                            "DealIDs": [1,2,3],
                                             "SectorType": 1
                                         }
                                     ]

From 15083d081f0fb29d23019b2ad1223f6961a9c6a0 Mon Sep 17 00:00:00 2001
From: Aryan Tikarya <akaladarshi@gmail.com>
Date: Wed, 10 Sep 2025 11:26:49 +0530
Subject: [PATCH 71/71] add version 17 support

---
 .../methods/market_actor_params.rs            | 117 ++++++++----------
 src/rpc/registry/actors/market.rs             |  11 +-
 2 files changed, 57 insertions(+), 71 deletions(-)

diff --git a/src/lotus_json/actor_states/methods/market_actor_params.rs b/src/lotus_json/actor_states/methods/market_actor_params.rs
index 395cc2e55e8d..b6311ae9e6db 100644
--- a/src/lotus_json/actor_states/methods/market_actor_params.rs
+++ b/src/lotus_json/actor_states/methods/market_actor_params.rs
@@ -68,8 +68,6 @@ macro_rules! impl_lotus_json_for_add_balance_params {
     };
 }
 
-impl_lotus_json_for_add_balance_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
-
 macro_rules! impl_lotus_json_for_withdraw_balance_params {
     ($($version:literal),+) => {
         $(
@@ -110,8 +108,6 @@ macro_rules! impl_lotus_json_for_withdraw_balance_params {
     };
 }
 
-impl_lotus_json_for_withdraw_balance_params!(8, 9, 10, 11, 12, 13, 14, 15, 16);
-
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
 #[serde(untagged)]
 pub enum LabelLotusJson {
@@ -153,8 +149,6 @@ macro_rules! impl_lotus_json_for_label {
     };
 }
 
-impl_lotus_json_for_label!(8, 9, 10, 11, 12, 13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct DealProposalLotusJson {
@@ -295,8 +289,6 @@ macro_rules! impl_lotus_json_for_deal_proposal {
     };
 }
 
-impl_lotus_json_for_deal_proposal!(8, 9, 10, 11, 12, 13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct ClientDealProposalV2LotusJson {
@@ -398,10 +390,6 @@ macro_rules! impl_lotus_json_for_client_deal_proposal {
     };
 }
 
-impl_lotus_json_for_client_deal_proposal!(fvm_shared2::crypto::signature: ClientDealProposalV2LotusJson: 8, 9);
-impl_lotus_json_for_client_deal_proposal!(fvm_shared3::crypto::signature: ClientDealProposalV3LotusJson: 10, 11);
-impl_lotus_json_for_client_deal_proposal!(fvm_shared4::crypto::signature: ClientDealProposalV4LotusJson: 12, 13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct PublishStorageDealsParamsV2LotusJson {
@@ -666,10 +654,6 @@ macro_rules! impl_publish_storage_deals_params_snapshots_v4 {
     };
 }
 
-impl_publish_storage_deals_params_snapshots_v2!(8, 9);
-impl_publish_storage_deals_params_snapshots_v3!(10, 11);
-impl_publish_storage_deals_params_snapshots_v4!(12, 13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct SectorDealsLotusJson {
@@ -824,10 +808,6 @@ macro_rules! impl_lotus_json_for_sector_deals {
     };
 }
 
-impl_lotus_json_for_sector_deals!(fvm_shared2::sector: no_sector_type: no_sector_number: 8);
-impl_lotus_json_for_sector_deals!(fvm_shared3::sector: no_sector_number: 9, 10, 11, 12);
-impl_lotus_json_for_sector_deals!(fvm_shared4::sector: 13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct VerifyDealsForActivationParamsLotusJson {
@@ -991,10 +971,6 @@ macro_rules! impl_lotus_json_for_verify_deals_for_activation_params {
     };
 }
 
-impl_lotus_json_for_verify_deals_for_activation_params!(v8);
-impl_lotus_json_for_verify_deals_for_activation_params!(v9_to_v12: 9, 10, 11, 12);
-impl_lotus_json_for_verify_deals_for_activation_params!(v13_plus: 13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct ActivateDealsParamsLotusJson {
@@ -1046,8 +1022,6 @@ macro_rules! impl_lotus_json_for_activate_deals_params {
     };
 }
 
-impl_lotus_json_for_activate_deals_params!(8, 9, 10, 11);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct BatchActivateDealsParamsLotusJson {
@@ -1177,9 +1151,6 @@ macro_rules! impl_lotus_json_for_batch_activate_deals_params {
     };
 }
 
-impl_lotus_json_for_batch_activate_deals_params!(v12: 12);
-impl_lotus_json_for_batch_activate_deals_params!(v13_onwards: 13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct OnMinerSectorsTerminateParamsLotusJsonV8 {
@@ -1282,9 +1253,6 @@ macro_rules! impl_lotus_json_for_on_miner_sectors_terminate_params {
     };
 }
 
-impl_lotus_json_for_on_miner_sectors_terminate_params!(OnMinerSectorsTerminateParamsLotusJsonV8: 8, 9, 10, 11, 12);
-impl_lotus_json_for_on_miner_sectors_terminate_params!(OnMinerSectorsTerminateParamsLotusJsonV13: 13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct SectorDataSpecLotusJson {
@@ -1338,8 +1306,6 @@ macro_rules! impl_lotus_json_for_sector_data_spec {
     };
 }
 
-impl_lotus_json_for_sector_data_spec!(8, 9, 10, 11);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct ComputeDataCommitmentParamsLotusJson {
@@ -1400,8 +1366,6 @@ macro_rules! impl_lotus_json_for_compute_data_commitment_params {
     };
 }
 
-impl_lotus_json_for_compute_data_commitment_params!(8, 9, 10, 11);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct DealQueryParamsLotusJson(
@@ -1442,8 +1406,6 @@ macro_rules! impl_lotus_json_for_deal_query_params {
     };
 }
 
-impl_lotus_json_for_deal_query_params!(10, 11, 12, 13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct SettleDealPaymentsParamsLotusJson(
@@ -1484,8 +1446,6 @@ macro_rules! impl_lotus_json_for_settle_deal_payments_params {
     };
 }
 
-impl_lotus_json_for_settle_deal_payments_params!(13, 14, 15, 16);
-
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 #[serde(rename_all = "PascalCase")]
 pub struct PieceChangeLotusJson {
@@ -1576,32 +1536,57 @@ macro_rules! impl_lotus_json_for_sector_content_changed_params {
     };
 }
 
-impl_lotus_json_for_sector_content_changed_params!(13, 14, 15, 16);
-
-test_snapshots!(fil_actor_market_state: AddBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: WithdrawBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: Label: 8, 9, 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: DealProposal: 8, 9, 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: ClientDealProposal: 8, 9, 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: PublishStorageDealsParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: SectorDeals: 8, 9, 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: VerifyDealsForActivationParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
+impl_lotus_json_for_add_balance_params!(8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+impl_lotus_json_for_withdraw_balance_params!(8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+impl_lotus_json_for_label!(8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+impl_lotus_json_for_deal_proposal!(8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+impl_lotus_json_for_client_deal_proposal!(fvm_shared2::crypto::signature: ClientDealProposalV2LotusJson: 8, 9);
+impl_lotus_json_for_client_deal_proposal!(fvm_shared3::crypto::signature: ClientDealProposalV3LotusJson: 10, 11);
+impl_lotus_json_for_client_deal_proposal!(fvm_shared4::crypto::signature: ClientDealProposalV4LotusJson: 12, 13, 14, 15, 16, 17);
+impl_publish_storage_deals_params_snapshots_v2!(8, 9);
+impl_publish_storage_deals_params_snapshots_v3!(10, 11);
+impl_publish_storage_deals_params_snapshots_v4!(12, 13, 14, 15, 16, 17);
+impl_lotus_json_for_sector_deals!(fvm_shared2::sector: no_sector_type: no_sector_number: 8);
+impl_lotus_json_for_sector_deals!(fvm_shared3::sector: no_sector_number: 9, 10, 11, 12);
+impl_lotus_json_for_sector_deals!(fvm_shared4::sector: 13, 14, 15, 16, 17);
+impl_lotus_json_for_verify_deals_for_activation_params!(v8);
+impl_lotus_json_for_verify_deals_for_activation_params!(v9_to_v12: 9, 10, 11, 12);
+impl_lotus_json_for_verify_deals_for_activation_params!(v13_plus: 13, 14, 15, 16, 17);
+impl_lotus_json_for_activate_deals_params!(8, 9, 10, 11);
+impl_lotus_json_for_batch_activate_deals_params!(v12: 12);
+impl_lotus_json_for_batch_activate_deals_params!(v13_onwards: 13, 14, 15, 16, 17);
+impl_lotus_json_for_on_miner_sectors_terminate_params!(OnMinerSectorsTerminateParamsLotusJsonV8: 8, 9, 10, 11, 12);
+impl_lotus_json_for_on_miner_sectors_terminate_params!(OnMinerSectorsTerminateParamsLotusJsonV13: 13, 14, 15, 16, 17);
+impl_lotus_json_for_sector_data_spec!(8, 9, 10, 11);
+impl_lotus_json_for_compute_data_commitment_params!(8, 9, 10, 11);
+impl_lotus_json_for_deal_query_params!(10, 11, 12, 13, 14, 15, 16, 17);
+impl_lotus_json_for_settle_deal_payments_params!(13, 14, 15, 16, 17);
+impl_lotus_json_for_sector_content_changed_params!(13, 14, 15, 16, 17);
+
+test_snapshots!(fil_actor_market_state: AddBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: WithdrawBalanceParams: 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: Label: 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: DealProposal: 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: ClientDealProposal: 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: PublishStorageDealsParams: 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: SectorDeals: 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: VerifyDealsForActivationParams: 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
 test_snapshots!(fil_actor_market_state: ActivateDealsParams: 8, 9, 10, 11);
-test_snapshots!(fil_actor_market_state: BatchActivateDealsParams: 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: OnMinerSectorsTerminateParams: 8, 9, 10, 11, 12, 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: BatchActivateDealsParams: 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: OnMinerSectorsTerminateParams: 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
 test_snapshots!(fil_actor_market_state: SectorDataSpec: 8, 9, 10, 11);
 test_snapshots!(fil_actor_market_state: ComputeDataCommitmentParams: 8, 9, 10, 11);
-test_snapshots!(fil_actor_market_state: DealQueryParams: 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: SettleDealPaymentsParams: 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: GetDealActivationParams: 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: GetDealClientCollateralParams: 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: GetDealClientParams: 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: GetDealDataCommitmentParams: 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: GetDealLabelParams: 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: GetDealProviderCollateralParams: 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: GetDealProviderParams: 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: GetDealTermParams: 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: GetDealTotalPriceParams: 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: GetDealVerifiedParams: 10, 11, 12, 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: GetDealSectorParams: 13, 14, 15, 16);
-test_snapshots!(fil_actor_market_state: ext::miner: SectorContentChangedParams: 13, 14, 15, 16);
+test_snapshots!(fil_actor_market_state: DealQueryParams: 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: SettleDealPaymentsParams: 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: GetDealActivationParams: 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: GetDealClientCollateralParams: 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: GetDealClientParams: 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: GetDealDataCommitmentParams: 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: GetDealLabelParams: 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: GetDealProviderCollateralParams: 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: GetDealProviderParams: 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: GetDealTermParams: 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: GetDealTotalPriceParams: 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: GetDealVerifiedParams: 10, 11, 12, 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: GetDealSectorParams: 13, 14, 15, 16, 17);
+test_snapshots!(fil_actor_market_state: ext::miner: SectorContentChangedParams: 13, 14, 15, 16, 17);
diff --git a/src/rpc/registry/actors/market.rs b/src/rpc/registry/actors/market.rs
index 010c6a720470..3a752849d525 100644
--- a/src/rpc/registry/actors/market.rs
+++ b/src/rpc/registry/actors/market.rs
@@ -158,7 +158,7 @@ macro_rules! register_market_versions_12 {
     }};
 }
 
-macro_rules! register_market_versions_13_to_16 {
+macro_rules! register_market_versions_onwards {
     ($registry:expr, $code_cid:expr, $market_state_version:path) => {{
         register_market_basic_methods!($registry, $code_cid, $market_state_version);
         register_market_exported_methods_v10_onwards!($registry, $code_cid, $market_state_version);
@@ -181,10 +181,11 @@ pub(crate) fn register_actor_methods(registry: &mut MethodRegistry, cid: Cid, ve
         10 => register_market_versions_10_to_11!(registry, cid, fil_actor_market_state::v10),
         11 => register_market_versions_10_to_11!(registry, cid, fil_actor_market_state::v11),
         12 => register_market_versions_12!(registry, cid, fil_actor_market_state::v12),
-        13 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v13),
-        14 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v14),
-        15 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v15),
-        16 => register_market_versions_13_to_16!(registry, cid, fil_actor_market_state::v16),
+        13 => register_market_versions_onwards!(registry, cid, fil_actor_market_state::v13),
+        14 => register_market_versions_onwards!(registry, cid, fil_actor_market_state::v14),
+        15 => register_market_versions_onwards!(registry, cid, fil_actor_market_state::v15),
+        16 => register_market_versions_onwards!(registry, cid, fil_actor_market_state::v16),
+        17 => register_market_versions_onwards!(registry, cid, fil_actor_market_state::v17),
         _ => {}
     }
 }