FIP-0076: Merge integration/direct-onboarding into master

actors/market/src/deal.rs

@@ -1,7 +1,6 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use crate::ext::verifreg::AllocationID;
 use cid::{Cid, Version};
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::BytesSer;
@@ -11,6 +10,7 @@ use fvm_shared::commcid::{FIL_COMMITMENT_UNSEALED, SHA2_256_TRUNC254_PADDED};
 use fvm_shared::crypto::signature::Signature;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::piece::PaddedPieceSize;
+use fvm_shared::sector::SectorNumber;
 use libipld_core::ipld::Ipld;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::{TryFrom, TryInto};
@@ -136,12 +136,12 @@ pub struct ClientDealProposal {
 
 #[derive(Clone, Debug, PartialEq, Eq, Copy, Serialize_tuple, Deserialize_tuple)]
 pub struct DealState {
+    // 0 if not yet included in proven sector (0 is also a valid sector number)
+    pub sector_number: SectorNumber,
     // -1 if not yet included in proven sector
     pub sector_start_epoch: ChainEpoch,
     // -1 if deal state never updated
     pub last_updated_epoch: ChainEpoch,
     // -1 if deal never slashed
     pub slash_epoch: ChainEpoch,
-    // ID of the verified registry allocation/claim for this deal's data (0 if none).
-    pub verified_claim: AllocationID,
 }

actors/market/src/ext.rs

@@ -24,10 +24,18 @@ pub mod account {
 
 pub mod miner {
     use super::*;
+    use cid::Cid;
+    use fvm_ipld_encoding::RawBytes;
+    use fvm_shared::clock::ChainEpoch;
+    use fvm_shared::piece::PaddedPieceSize;
+    use fvm_shared::sector::SectorNumber;
+    use fvm_shared::MethodNum;
 
     pub const CONTROL_ADDRESSES_METHOD: u64 = 2;
     pub const IS_CONTROLLING_ADDRESS_EXPORTED: u64 =
         frc42_dispatch::method_hash!("IsControllingAddress");
+    pub const SECTOR_CONTENT_CHANGED: MethodNum =
+        frc42_dispatch::method_hash!("SectorContentChanged");
 
     #[derive(Serialize_tuple, Deserialize_tuple)]
     pub struct GetControlAddressesReturnParams {
@@ -47,6 +55,44 @@ pub mod miner {
     pub struct IsControllingAddressParam {
         pub address: Address,
     }
+
+    #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
+    #[serde(transparent)]
+    pub struct SectorContentChangedParams {
+        pub sectors: Vec<SectorChanges>,
+    }
+
+    #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
+    pub struct SectorChanges {
+        pub sector: SectorNumber,
+        pub minimum_commitment_epoch: ChainEpoch,
+        pub added: Vec<PieceChange>,
+    }
+
+    #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
+    pub struct PieceChange {
+        pub data: Cid,
+        pub size: PaddedPieceSize,
+        pub payload: RawBytes,
+    }
+
+    #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
+    #[serde(transparent)]
+    pub struct SectorContentChangedReturn {
+        pub sectors: Vec<SectorReturn>,
+    }
+
+    #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
+    #[serde(transparent)]
+    pub struct SectorReturn {
+        pub added: Vec<PieceReturn>,
+    }
+
+    #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
+    #[serde(transparent)]
+    pub struct PieceReturn {
+        pub accepted: bool,
+    }
 }
 
 pub mod verifreg {