Rest of V5 Updates

blockchain/state_manager/Cargo.toml

@@ -35,7 +35,7 @@ bitfield = { package = "forest_bitfield", version = "0.1" }
 serde = { version = "1.0", features = ["derive"] }
 num-traits = "0.2.11"
 tokio = { version = "1.0", features = ["sync"] }
-filecoin-proofs-api = { version = "8", features = ["blst"], default_features = false }
+filecoin-proofs-api = { version = "9", features = ["blst"], default_features = false }
 futures = "0.3.5"
 runtime = { package = "forest_runtime", version = "0.2" }
 lazy_static = "1.4"

node/rpc/src/chain_api.rs

@@ -277,7 +277,7 @@ where
             DomainSeparationTag::from_i64(pers).ok_or("invalid DomainSeparationTag")?,
             epoch,
             &base64::decode(entropy)?,
-            epoch <= networks::UPGRADE_PLACEHOLDER_HEIGHT,
+            epoch <= networks::UPGRADE_HYPERDRIVE_HEIGHT,
         )
         .await?)
 }
@@ -301,7 +301,7 @@ where
             DomainSeparationTag::from_i64(pers).ok_or("invalid DomainSeparationTag")?,
             epoch,
             &base64::decode(entropy)?,
-            epoch <= networks::UPGRADE_PLACEHOLDER_HEIGHT,
+            epoch <= networks::UPGRADE_HYPERDRIVE_HEIGHT,
         )
         .await?)
 }

node/rpc/src/state_api.rs

@@ -710,6 +710,12 @@ pub(crate) async fn state_miner_sector_allocated<
             .get::<bitfield::BitField>(&m.allocated_sectors)?
             .ok_or("allocated sectors bitfield not found")?
             .get(sector_num as usize),
+        miner::State::V5(m) => data
+            .chain_store
+            .db
+            .get::<bitfield::BitField>(&m.allocated_sectors)?
+            .ok_or("allocated sectors bitfield not found")?
+            .get(sector_num as usize),
     };
 
     Ok(allocated_sectors)

types/Cargo.toml

@@ -16,7 +16,7 @@ chrono = "0.4.9"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.56"
 commcid = { path = "../utils/commcid", version = "0.1.1", optional = true }
-filecoin-proofs-api = { version = "8", features = ["blst"], default_features = false, optional = true }
+filecoin-proofs-api = { version = "9", features = ["blst"], default_features = false, optional = true }
 vm = { package = "forest_vm", version = "0.3" }
 cid = { package = "forest_cid", features = ["cbor"], version = "0.3" }
 num-bigint = { path = "../utils/bigint", package = "forest_bigint", version = "0.1.1" }

types/networks/src/devnet/mod.rs

@@ -38,6 +38,8 @@ pub const UPGRADE_ACTORS_V3_HEIGHT: ChainEpoch = 550321;
 pub const UPGRADE_NORWEGIAN_HEIGHT: ChainEpoch = 665280;
 /// V12 network upgrade TODO
 pub const UPGRADE_ACTORS_V4_HEIGHT: ChainEpoch = 999999;
+/// V13 network upgrade TODO
+pub const UPGRADE_HYPERDRIVE_HEIGHT: ChainEpoch = 1000000;
 
 pub const UPGRADE_PLACEHOLDER_HEIGHT: ChainEpoch = 9999999;
 

types/networks/src/interopnet/mod.rs

@@ -36,6 +36,8 @@ pub const UPGRADE_ACTORS_V3_HEIGHT: ChainEpoch = 999999998;
 pub const UPGRADE_NORWEGIAN_HEIGHT: ChainEpoch = 999999999;
 /// V12 network upgrade TODO
 pub const UPGRADE_ACTORS_V4_HEIGHT: ChainEpoch = 999999999;
+/// V13 network upgrade TODO
+pub const UPGRADE_HYPERDRIVE_HEIGHT: ChainEpoch = 999999999;
 
 pub const UPGRADE_PLACEHOLDER_HEIGHT: ChainEpoch = 9999999;
 

types/networks/src/lib.rs

@@ -54,7 +54,7 @@ struct DrandPoint<'a> {
     pub config: &'a DrandConfig<'a>,
 }
 
-const VERSION_SCHEDULE: [Upgrade; 12] = [
+const VERSION_SCHEDULE: [Upgrade; 13] = [
     Upgrade {
         height: UPGRADE_BREEZE_HEIGHT,
         network: NetworkVersion::V1,
@@ -103,6 +103,10 @@ const VERSION_SCHEDULE: [Upgrade; 12] = [
         height: UPGRADE_ACTORS_V4_HEIGHT,
         network: NetworkVersion::V12,
     },
+    Upgrade {
+        height: UPGRADE_HYPERDRIVE_HEIGHT,
+        network: NetworkVersion::V13,
+    },
 ];
 
 /// Gets network version from epoch using default Mainnet schedule.

types/networks/src/mainnet/mod.rs

@@ -39,6 +39,8 @@ pub const UPGRADE_ACTORS_V3_HEIGHT: ChainEpoch = 550321;
 pub const UPGRADE_NORWEGIAN_HEIGHT: ChainEpoch = 665280;
 /// V12 network upgrade
 pub const UPGRADE_ACTORS_V4_HEIGHT: ChainEpoch = 712320;
+/// V13 network upgrade
+pub const UPGRADE_HYPERDRIVE_HEIGHT: ChainEpoch = 892800;
 
 pub const UPGRADE_PLACEHOLDER_HEIGHT: ChainEpoch = 9999999;
 

types/src/state.rs

@@ -16,8 +16,10 @@ pub enum StateTreeVersion {
     V1,
     /// Corresponds to actors = v3
     V2,
-    /// Corresponds to actors >= v4
+    /// Corresponds to actors = v4
     V3,
+    /// Corresponds to actors >= v5
+    V4,
 }
 
 /// State root information. Contains information about the version of the state tree,

types/src/verifier/mod.rs

@@ -61,13 +61,12 @@ pub trait ProofVerifier {
         }
         let spt: proofs::RegisteredSealProof = aggregate.seal_proof.try_into()?;
         let prover_id = prover_id_from_u64(aggregate.miner);
-
         struct AggregationInputs {
             // replica
             commr: [u8; 32],
             // data
             commd: [u8; 32],
-            sector_id: u64,
+            sector_id: SectorId,
             ticket: [u8; 32],
             seed: [u8; 32],
         }
@@ -80,7 +79,7 @@ pub trait ProofVerifier {
                 Ok(AggregationInputs {
                     commr,
                     commd,
-                    sector_id: info.sector_number,
+                    sector_id: SectorId::from(info.sector_number),
                     ticket: info.randomness.0,
                     seed: info.interactive_randomness.0,
                 })
@@ -95,7 +94,7 @@ pub trait ProofVerifier {
                     input.commr,
                     input.commd,
                     prover_id,
-                    input.sector_id.try_into()?,
+                    input.sector_id,
                     input.ticket,
                     input.seed,
                 )