Revert "fix: fix incorrect MinerGetBaseInfo (#4617)" (#4627)

CHANGELOG.md

@@ -64,9 +64,6 @@
   deserialisation in `Filecoin.EthGetBlockByNumber` and
   `Filecoin.EthGetBlockByHash` RPC methods.
 
-- [#4610](https://github.com/ChainSafe/forest/issues/4610) Fixed incorrect
-  structure in the `Filecoin.MinerGetBaseInfo` RPC method.
-
 ## Forest 0.19.2 "Eagle"
 
 Non-mandatory release that includes a fix for the Prometheus-incompatible

scripts/tests/api_compare/filter-list

@@ -1,5 +1,6 @@
 # This list contains potentially broken methods (or tests) that are ignored.
 # They should be considered bugged, and not used until the root cause is resolved.
+!Filecoin.MinerGetBaseInfo
 # Internal Server Error on Lotus: https://github.com/ChainSafe/forest/actions/runs/8619017774/job/23623141130?pr=4170
 !Filecoin.MpoolGetNonce
 # CustomCheckFailed in Forest: https://github.com/ChainSafe/forest/actions/runs/9593268587/job/26453560366

scripts/tests/api_compare/filter-list-offline

@@ -1,5 +1,6 @@
 # This list contains potentially broken methods (or tests) that are ignored.
 # They should be considered bugged, and not used until the root cause is resolved.
+!Filecoin.MinerGetBaseInfo
 # Internal Server Error on Lotus: https://github.com/ChainSafe/forest/actions/runs/8619314467/job/23624081698
 !Filecoin.MpoolGetNonce
 !Filecoin.EthSyncing
@@ -19,4 +20,4 @@
 !Filecoin.StateCirculatingSupply
 # The estimation is inaccurate only for offline RPC server, to be investigated: https://github.com/ChainSafe/forest/issues/4555
 !Filecoin.EthEstimateGas
-!eth_estimateGas
+!eth_estimateGas

src/fil_cns/validation.rs

@@ -28,7 +28,6 @@ use fil_actors_shared::v10::runtime::DomainSeparationTag;
 use futures::stream::FuturesUnordered;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::{bytes_32, to_vec};
-use itertools::Itertools;
 use nunny::Vec as NonEmpty;
 
 use crate::fil_cns::{metrics, FilecoinConsensusError};
@@ -392,7 +391,6 @@ fn verify_winning_post_proof<DB: Blockstore>(
             &header.miner_address,
             Randomness::new(rand.to_vec()),
         )
-        .map(|sectors| sectors.iter().map(Into::into).collect_vec())
         .map_err(|e| FilecoinConsensusError::WinningPoStValidation(e.to_string()))?;
 
     verify_winning_post(

src/lotus_json/mod.rs

@@ -196,7 +196,6 @@ decl_and_test!(
     block_header for crate::blocks::CachingBlockHeader,
     cid for ::cid::Cid,
     election_proof for crate::blocks::ElectionProof,
-    extended_sector_info for crate::shim::sector::ExtendedSectorInfo,
     gossip_block for crate::blocks::GossipBlock,
     key_info for crate::key_management::KeyInfo,
     message for crate::shim::message::Message,

src/rpc/types/mod.rs

@@ -25,7 +25,7 @@ use crate::shim::{
     executor::Receipt,
     fvm_shared_latest::MethodNum,
     message::Message,
-    sector::{ExtendedSectorInfo, RegisteredSealProof, SectorNumber, StoragePower},
+    sector::{RegisteredSealProof, SectorInfo, SectorNumber, StoragePower},
 };
 use cid::Cid;
 use fil_actor_interface::market::AllocationID;
@@ -503,8 +503,8 @@ pub struct MiningBaseInfo {
     #[schemars(with = "LotusJson<StoragePower>")]
     pub network_power: StoragePower,
     #[serde(with = "crate::lotus_json")]
-    #[schemars(with = "LotusJson<Vec<ExtendedSectorInfo>>")]
-    pub sectors: Vec<ExtendedSectorInfo>,
+    #[schemars(with = "LotusJson<Vec<SectorInfo>>")]
+    pub sectors: Vec<SectorInfo>,
     #[serde(with = "crate::lotus_json")]
     #[schemars(with = "LotusJson<Address>")]
     pub worker_key: Address,

src/shim/sector.rs

@@ -1,7 +1,6 @@
 // Copyright 2019-2024 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use cid::Cid;
 pub use fvm_shared3::sector::StoragePower;
 pub use fvm_shared3::sector::{
     RegisteredPoStProof as RegisteredPoStProofV3, RegisteredSealProof as RegisteredSealProofV3,
@@ -154,35 +153,6 @@ impl From<SectorInfo> for SectorInfoV2 {
     }
 }
 
-/// Information about a sector necessary for PoSt verification
-#[derive(
-    Eq, PartialEq, Debug, Clone, derive_more::From, derive_more::Into, Serialize, Deserialize,
-)]
-pub struct ExtendedSectorInfo {
-    pub proof: RegisteredSealProof,
-    pub sector_number: SectorNumber,
-    pub sector_key: Option<Cid>,
-    pub sealed_cid: Cid,
-}
-
-impl From<&ExtendedSectorInfo> for SectorInfo {
-    fn from(value: &ExtendedSectorInfo) -> SectorInfo {
-        SectorInfo::new(value.proof.into(), value.sector_number, value.sealed_cid)
-    }
-}
-
-#[cfg(test)]
-impl quickcheck::Arbitrary for ExtendedSectorInfo {
-    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
-        Self {
-            proof: RegisteredSealProof::arbitrary(g),
-            sector_number: u64::arbitrary(g),
-            sector_key: Option::<cid::Cid>::arbitrary(g),
-            sealed_cid: cid::Cid::arbitrary(g),
-        }
-    }
-}
-
 #[derive(
     serde::Serialize,
     serde::Deserialize,

src/state_manager/utils.rs

@@ -5,7 +5,7 @@ use crate::shim::{
     actors::{is_account_actor, is_ethaccount_actor, is_placeholder_actor},
     address::{Address, Payload},
     randomness::Randomness,
-    sector::{ExtendedSectorInfo, RegisteredPoStProof, RegisteredSealProof},
+    sector::{RegisteredPoStProof, RegisteredSealProof, SectorInfo},
     state_tree::ActorState,
     version::NetworkVersion,
 };
@@ -33,7 +33,7 @@ where
         nv: NetworkVersion,
         miner_address: &Address,
         rand: Randomness,
-    ) -> Result<Vec<ExtendedSectorInfo>, anyhow::Error> {
+    ) -> Result<Vec<SectorInfo>, anyhow::Error> {
         let store = self.blockstore();
 
         let actor = self
@@ -102,12 +102,7 @@ where
 
         let out = sectors
             .into_iter()
-            .map(|s_info| ExtendedSectorInfo {
-                proof: s_info.seal_proof.into(),
-                sector_number: s_info.sector_number,
-                sector_key: s_info.sector_key_cid,
-                sealed_cid: s_info.sealed_cid,
-            })
+            .map(|s_info| SectorInfo::new(*spt, s_info.sector_number, s_info.sealed_cid))
             .collect();
 
         Ok(out)