Merge remote-tracking branch 'origin/main' into hm/state-compute

Author: hanabi1224

CHANGELOG.md

@@ -46,6 +46,7 @@
 ### Fixed
 
 - [#5458](https://github.com/ChainSafe/forest/pull/5458) Fix stack overflow occurring when running Forest in debug mode.
+- [#5475](https://github.com/ChainSafe/forest/pull/5475) Added missing fields for state sector RPC methods that were added in the recent network upgrade.
 
 ## Forest v0.25.0 "Bombadil"
 

build/manifest.json

@@ -2594,7 +2594,7 @@
     "network": {
       "type": "mainnet"
     },
-    "version": "v16.0.0-rc3",
+    "version": "v16.0.0",
     "bundle_cid": "bafy2bzaceaj3s3rrfbibikplap264uw74qor5yl35mqwokv4lwst4plpwry36",
     "manifest": {
       "actors": [

docs/yarn.lock

@@ -5666,46 +5666,66 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bare-events@npm:^2.0.0, bare-events@npm:^2.2.0":
+"bare-events@npm:^2.2.0":
   version: 2.5.3
   resolution: "bare-events@npm:2.5.3"
   checksum: 10c0/fc78e068cd1c7e75ab027121b69f104e315af122f10263734a1f3a7c5a8e2e5934d9a46638f5c9eafadf84d64c01fd87cd3169da4f7f8046df29a17fb1c532f5
   languageName: node
   linkType: hard
 
-"bare-fs@npm:^2.1.1":
-  version: 2.3.5
-  resolution: "bare-fs@npm:2.3.5"
+"bare-events@npm:^2.5.4":
+  version: 2.5.4
+  resolution: "bare-events@npm:2.5.4"
+  checksum: 10c0/877a9cea73d545e2588cdbd6fd01653e27dac48ad6b44985cdbae73e1f57f292d4ba52e25d1fba53674c1053c463d159f3d5c7bc36a2e6e192e389b499ddd627
+  languageName: node
+  linkType: hard
+
+"bare-fs@npm:^4.0.1":
+  version: 4.0.2
+  resolution: "bare-fs@npm:4.0.2"
   dependencies:
-    bare-events: "npm:^2.0.0"
-    bare-path: "npm:^2.0.0"
-    bare-stream: "npm:^2.0.0"
-  checksum: 10c0/ff18cc9be7c557c38e0342681ba3672ae4b01e5696b567d4035e5995255dc6bc7d4df88ed210fa4d3eb940eb29512e924ebb42814c87fc59a2bee8cf83b7c2f9
+    bare-events: "npm:^2.5.4"
+    bare-path: "npm:^3.0.0"
+    bare-stream: "npm:^2.6.4"
+  peerDependencies:
+    bare-buffer: "*"
+  peerDependenciesMeta:
+    bare-buffer:
+      optional: true
+  checksum: 10c0/f6040657cbe7a066a603eaf26a1a9c696b7fce6ddbfb2da23cec22ccf3d23d9195aad82117549f1422ed7ae17c3f91326be900bc72c6aa7651a053137ce2e677
   languageName: node
   linkType: hard
 
-"bare-os@npm:^2.1.0":
-  version: 2.4.4
-  resolution: "bare-os@npm:2.4.4"
-  checksum: 10c0/e7d1a7b2100c05da8d25b60d0d48cf850c6f57064577a3f2f51cf18d417fbcfd6967ed2d8314320914ed69e0f2ebcf54eb1b36092dd172d8e8f969cf8cccf041
+"bare-os@npm:^3.0.1":
+  version: 3.6.1
+  resolution: "bare-os@npm:3.6.1"
+  checksum: 10c0/13064789b3d0d3051d6a89424e6d861c08be101798d69faa78821cffb428b36d1fd4e17c824d5a4939bcd96dbff42c11921494139c8e53c3e520bc0e3f83aeee
   languageName: node
   linkType: hard
 
-"bare-path@npm:^2.0.0, bare-path@npm:^2.1.0":
-  version: 2.1.3
-  resolution: "bare-path@npm:2.1.3"
+"bare-path@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "bare-path@npm:3.0.0"
   dependencies:
-    bare-os: "npm:^2.1.0"
-  checksum: 10c0/35587e177fc8fa5b13fb90bac8779b5ce49c99016d221ddaefe2232d02bd4295d79b941e14ae19fda75ec42a6fe5fb66c07d83ae7ec11462178e66b7be65ca74
+    bare-os: "npm:^3.0.1"
+  checksum: 10c0/56a3ca82a9f808f4976cb1188640ac206546ce0ddff582afafc7bd2a6a5b31c3bd16422653aec656eeada2830cfbaa433c6cbf6d6b4d9eba033d5e06d60d9a68
   languageName: node
   linkType: hard
 
-"bare-stream@npm:^2.0.0":
-  version: 2.6.1
-  resolution: "bare-stream@npm:2.6.1"
+"bare-stream@npm:^2.6.4":
+  version: 2.6.5
+  resolution: "bare-stream@npm:2.6.5"
   dependencies:
     streamx: "npm:^2.21.0"
-  checksum: 10c0/f6fe238b4b067fc9ec99e6f9a218239413d1641dfd5bc4defa5fbd0e360ac09e7f454929f5fedd0ee1e7b84d780d32084afe3b60d369ed5f53512dd5fa8b9f8b
+  peerDependencies:
+    bare-buffer: "*"
+    bare-events: "*"
+  peerDependenciesMeta:
+    bare-buffer:
+      optional: true
+    bare-events:
+      optional: true
+  checksum: 10c0/1242286f8f3147e9fd353cdaa9cf53226a807ac0dde8177c13f1463aa4cd1f88e07407c883a1b322b901e9af2d1cd30aacd873529031132c384622972e0419df
   languageName: node
   linkType: hard
 
@@ -17928,19 +17948,19 @@ __metadata:
   linkType: hard
 
 "tar-fs@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "tar-fs@npm:3.0.6"
+  version: 3.0.8
+  resolution: "tar-fs@npm:3.0.8"
   dependencies:
-    bare-fs: "npm:^2.1.1"
-    bare-path: "npm:^2.1.0"
+    bare-fs: "npm:^4.0.1"
+    bare-path: "npm:^3.0.0"
     pump: "npm:^3.0.0"
     tar-stream: "npm:^3.1.5"
   dependenciesMeta:
     bare-fs:
       optional: true
     bare-path:
       optional: true
-  checksum: 10c0/207b7c0f193495668bd9dbad09a0108ce4ffcfec5bce2133f90988cdda5c81fad83c99f963d01e47b565196594f7a17dbd063ae55b97b36268fcc843975278ee
+  checksum: 10c0/b70bb2ad0490ab13b48edd10bd648bb54c52b681981cdcdc3aa4517e98ad94c94659ddca1925872ee658d781b9fcdd2b1c808050647f06b1bca157dd2fcae038
   languageName: node
   linkType: hard
 

src/networks/actors_bundle.rs

@@ -100,7 +100,7 @@ pub static ACTOR_BUNDLES: Lazy<Box<[ActorBundleInfo]>> = Lazy::new(|| {
         "bafy2bzacecdhvfmtirtojwhw2tyciu4jkbpsbk5g53oe24br27oy62sn4dc4e" @ "v13.0.0" for "mainnet",
         "bafy2bzacecbueuzsropvqawsri27owo7isa5gp2qtluhrfsto2qg7wpgxnkba" @ "v14.0.0" for "mainnet",
         "bafy2bzaceakwje2hyinucrhgtsfo44p54iw4g6otbv5ghov65vajhxgntr53u" @ "v15.0.0" for "mainnet",
-        "bafy2bzaceaj3s3rrfbibikplap264uw74qor5yl35mqwokv4lwst4plpwry36" @ "v16.0.0-rc3" for "mainnet",
+        "bafy2bzaceaj3s3rrfbibikplap264uw74qor5yl35mqwokv4lwst4plpwry36" @ "v16.0.0" for "mainnet",
     ])
 });
 

src/networks/mainnet/mod.rs

@@ -4,7 +4,10 @@
 use crate::{
     eth::EthChainId,
     make_height,
-    shim::{clock::ChainEpoch, version::NetworkVersion},
+    shim::{
+        clock::{ChainEpoch, EPOCHS_IN_DAY},
+        version::NetworkVersion,
+    },
 };
 use ahash::HashMap;
 use cid::Cid;
@@ -75,9 +78,11 @@ pub static HEIGHT_INFOS: Lazy<HashMap<Height, HeightInfo>> = Lazy::new(|| {
         make_height!(Waffle, 4_154_640, get_bundle_cid("v14.0.0")),
         // Wed 20 Nov 23:00:00 UTC 2024
         make_height!(TukTuk, 4_461_240, get_bundle_cid("v15.0.0")),
-        // TODO(forest): https://github.com/ChainSafe/forest/issues/5041
-        make_height!(Teep, i64::MAX, get_bundle_cid("v16.0.0-rc3")),
-        make_height!(Tock, i64::MAX),
+        // Thu 10 Apr 23:00:00 UTC 2025
+        make_height!(Teep, 4_867_320, get_bundle_cid("v16.0.0")),
+        // This epoch, 90 days after Teep is the completion of FIP-0100 where actors will start applying
+        // the new daily fee to pre-Teep sectors being extended.
+        make_height!(Tock, 4_867_320 + EPOCHS_IN_DAY * 90),
     ])
 });
 

src/networks/mod.rs

@@ -275,7 +275,7 @@ impl ChainConfig {
             f3_bootstrap_epoch: -1,
             f3_initial_power_table: None,
             f3_contract_address: Some(
-                EthAddress::from_str("0x476AC9256b9921C9C6a0fC237B7fE05fe9874F50")
+                EthAddress::from_str("0xA19080A1Bcb82Bb61bcb9691EC94653Eb5315716")
                     .expect("invalid f3 contract eth address"),
             ),
             f3_contract_poll_interval: DEFAULT_F3_CONTRACT_POLL_INTERVAL,

src/rpc/methods/state.rs

@@ -2327,7 +2327,7 @@ impl RpcMethod<3> for StateSectorExpiration {
                         on_time = 0;
                         return Ok(());
                     }
-                    let expirations: Amt<fil_actor_miner_state::v13::ExpirationSet, _> =
+                    let expirations: Amt<fil_actor_miner_state::v16::ExpirationSet, _> =
                         Amt::load(&partition.expirations_epochs(), store)?;
                     expirations.for_each(|epoch, expiration| {
                         if expiration.early_sectors.get(sector_number) {

src/rpc/types/mod.rs

@@ -258,28 +258,40 @@ pub struct SectorOnChainInfo {
     /// Pledge collected to commit this sector
     pub initial_pledge: TokenAmount,
 
-    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[schemars(with = "LotusJson<Option<TokenAmount>>")]
     #[serde(with = "crate::lotus_json")]
     /// Expected one day projection of reward for sector computed at activation
     /// time
-    pub expected_day_reward: TokenAmount,
+    pub expected_day_reward: Option<TokenAmount>,
 
     /// Epoch at which this sector's power was most recently updated
     pub power_base_epoch: ChainEpoch,
 
-    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[schemars(with = "LotusJson<Option<TokenAmount>>")]
     #[serde(with = "crate::lotus_json")]
     /// Expected twenty day projection of reward for sector computed at
     /// activation time
-    pub expected_storage_pledge: TokenAmount,
+    pub expected_storage_pledge: Option<TokenAmount>,
 
-    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[schemars(with = "LotusJson<Option<TokenAmount>>")]
     #[serde(with = "crate::lotus_json")]
-    pub replaced_day_reward: TokenAmount,
+    pub replaced_day_reward: Option<TokenAmount>,
 
     #[schemars(with = "LotusJson<Option<Cid>>")]
     #[serde(with = "crate::lotus_json", rename = "SectorKeyCID")]
     pub sector_key_cid: Option<Cid>,
+
+    /// The total fee payable per day for this sector. The value of this field is set at the time of
+    /// sector activation, extension and whenever a sector's `QAP` is changed. This fee is payable for
+    /// the lifetime of the sector and is aggregated in the deadline's `daily_fee` field.
+    ///
+    /// This field is not included in the serialized form of the struct prior to the activation of
+    /// FIP-0100, and is added as the 16th element of the array after that point only for new sectors
+    /// or sectors that are updated after that point. For old sectors, the value of this field will
+    /// always be zero.
+    #[schemars(with = "LotusJson<TokenAmount>")]
+    #[serde(with = "crate::lotus_json")]
+    pub daily_fee: TokenAmount,
 }
 
 lotus_json_with_self!(SectorOnChainInfo);

src/rpc/types/sector_impl.rs

@@ -18,11 +18,12 @@ impl From<fil_actor_miner_state::v8::SectorOnChainInfo> for SectorOnChainInfo {
             deal_weight: info.deal_weight,
             verified_deal_weight: info.verified_deal_weight,
             initial_pledge: info.initial_pledge.into(),
-            expected_day_reward: info.expected_day_reward.into(),
-            expected_storage_pledge: info.expected_storage_pledge.into(),
-            replaced_day_reward: TokenAmount::default(),
+            expected_day_reward: Some(info.expected_day_reward.into()),
+            expected_storage_pledge: Some(info.expected_storage_pledge.into()),
+            replaced_day_reward: None,
             sector_key_cid: info.sector_key_cid,
             power_base_epoch: info.activation,
+            daily_fee: TokenAmount::default(),
         }
     }
 }
@@ -44,11 +45,12 @@ impl From<fil_actor_miner_state::v9::SectorOnChainInfo> for SectorOnChainInfo {
             deal_weight: info.deal_weight,
             verified_deal_weight: info.verified_deal_weight,
             initial_pledge: info.initial_pledge.into(),
-            expected_day_reward: info.expected_day_reward.into(),
-            expected_storage_pledge: info.expected_storage_pledge.into(),
-            replaced_day_reward: info.replaced_day_reward.into(),
+            expected_day_reward: Some(info.expected_day_reward.into()),
+            expected_storage_pledge: Some(info.expected_storage_pledge.into()),
+            replaced_day_reward: Some(info.replaced_day_reward.into()),
             sector_key_cid: info.sector_key_cid,
             power_base_epoch: info.activation,
+            daily_fee: TokenAmount::default(),
         }
     }
 }
@@ -70,11 +72,12 @@ impl From<fil_actor_miner_state::v10::SectorOnChainInfo> for SectorOnChainInfo {
             deal_weight: info.deal_weight,
             verified_deal_weight: info.verified_deal_weight,
             initial_pledge: info.initial_pledge.into(),
-            expected_day_reward: info.expected_day_reward.into(),
-            expected_storage_pledge: info.expected_storage_pledge.into(),
-            replaced_day_reward: info.replaced_day_reward.into(),
+            expected_day_reward: Some(info.expected_day_reward.into()),
+            expected_storage_pledge: Some(info.expected_storage_pledge.into()),
+            replaced_day_reward: Some(info.replaced_day_reward.into()),
             sector_key_cid: info.sector_key_cid,
             power_base_epoch: info.activation,
+            daily_fee: TokenAmount::default(),
         }
     }
 }
@@ -96,11 +99,12 @@ impl From<fil_actor_miner_state::v11::SectorOnChainInfo> for SectorOnChainInfo {
             deal_weight: info.deal_weight,
             verified_deal_weight: info.verified_deal_weight,
             initial_pledge: info.initial_pledge.into(),
-            expected_day_reward: info.expected_day_reward.into(),
-            expected_storage_pledge: info.expected_storage_pledge.into(),
-            replaced_day_reward: info.replaced_day_reward.into(),
+            expected_day_reward: Some(info.expected_day_reward.into()),
+            expected_storage_pledge: Some(info.expected_storage_pledge.into()),
+            replaced_day_reward: Some(info.replaced_day_reward.into()),
             sector_key_cid: info.sector_key_cid,
             power_base_epoch: info.activation,
+            daily_fee: TokenAmount::default(),
         }
     }
 }
@@ -118,11 +122,12 @@ impl From<fil_actor_miner_state::v12::SectorOnChainInfo> for SectorOnChainInfo {
             deal_weight: info.deal_weight,
             verified_deal_weight: info.verified_deal_weight,
             initial_pledge: info.initial_pledge.into(),
-            expected_day_reward: info.expected_day_reward.into(),
-            expected_storage_pledge: info.expected_storage_pledge.into(),
-            replaced_day_reward: info.replaced_day_reward.into(),
+            expected_day_reward: Some(info.expected_day_reward.into()),
+            expected_storage_pledge: Some(info.expected_storage_pledge.into()),
+            replaced_day_reward: Some(info.replaced_day_reward.into()),
             sector_key_cid: info.sector_key_cid,
             power_base_epoch: info.power_base_epoch,
+            daily_fee: TokenAmount::default(),
         }
     }
 }
@@ -140,11 +145,12 @@ impl From<fil_actor_miner_state::v13::SectorOnChainInfo> for SectorOnChainInfo {
             deal_weight: info.deal_weight,
             verified_deal_weight: info.verified_deal_weight,
             initial_pledge: info.initial_pledge.into(),
-            expected_day_reward: info.expected_day_reward.into(),
-            expected_storage_pledge: info.expected_storage_pledge.into(),
-            replaced_day_reward: info.replaced_day_reward.into(),
+            expected_day_reward: Some(info.expected_day_reward.into()),
+            expected_storage_pledge: Some(info.expected_storage_pledge.into()),
+            replaced_day_reward: Some(info.replaced_day_reward.into()),
             sector_key_cid: info.sector_key_cid,
             power_base_epoch: info.power_base_epoch,
+            daily_fee: TokenAmount::default(),
         }
     }
 }
@@ -162,11 +168,12 @@ impl From<fil_actor_miner_state::v14::SectorOnChainInfo> for SectorOnChainInfo {
             deal_weight: info.deal_weight,
             verified_deal_weight: info.verified_deal_weight,
             initial_pledge: info.initial_pledge.into(),
-            expected_day_reward: info.expected_day_reward.into(),
-            expected_storage_pledge: info.expected_storage_pledge.into(),
-            replaced_day_reward: info.replaced_day_reward.into(),
+            expected_day_reward: Some(info.expected_day_reward.into()),
+            expected_storage_pledge: Some(info.expected_storage_pledge.into()),
+            replaced_day_reward: Some(info.replaced_day_reward.into()),
             sector_key_cid: info.sector_key_cid,
             power_base_epoch: info.power_base_epoch,
+            daily_fee: TokenAmount::default(),
         }
     }
 }
@@ -184,11 +191,12 @@ impl From<fil_actor_miner_state::v15::SectorOnChainInfo> for SectorOnChainInfo {
             deal_weight: info.deal_weight,
             verified_deal_weight: info.verified_deal_weight,
             initial_pledge: info.initial_pledge.into(),
-            expected_day_reward: info.expected_day_reward.into(),
-            expected_storage_pledge: info.expected_storage_pledge.into(),
-            replaced_day_reward: info.replaced_day_reward.into(),
+            expected_day_reward: Some(info.expected_day_reward.into()),
+            expected_storage_pledge: Some(info.expected_storage_pledge.into()),
+            replaced_day_reward: Some(info.replaced_day_reward.into()),
             sector_key_cid: info.sector_key_cid,
             power_base_epoch: info.power_base_epoch,
+            daily_fee: TokenAmount::default(),
         }
     }
 }
@@ -206,20 +214,12 @@ impl From<fil_actor_miner_state::v16::SectorOnChainInfo> for SectorOnChainInfo {
             deal_weight: info.deal_weight,
             verified_deal_weight: info.verified_deal_weight,
             initial_pledge: info.initial_pledge.into(),
-            expected_day_reward: info
-                .expected_day_reward
-                .unwrap_or(TokenAmount::default().into())
-                .into(),
-            expected_storage_pledge: info
-                .expected_storage_pledge
-                .unwrap_or(TokenAmount::default().into())
-                .into(),
-            replaced_day_reward: info
-                .replaced_day_reward
-                .unwrap_or(TokenAmount::default().into())
-                .into(),
+            expected_day_reward: info.expected_day_reward.map(Into::into),
+            expected_storage_pledge: info.expected_storage_pledge.map(Into::into),
+            replaced_day_reward: info.replaced_day_reward.map(Into::into),
             sector_key_cid: info.sector_key_cid,
             power_base_epoch: info.power_base_epoch,
+            daily_fee: info.daily_fee.into(),
         }
     }
 }