merged synth work

Author: snadrus

cgo/const.go

@@ -16,16 +16,21 @@ const (
 )
 
 const (
-	RegisteredSealProofStackedDrg2KiBV1    = C.REGISTERED_SEAL_PROOF_STACKED_DRG2_KI_B_V1
-	RegisteredSealProofStackedDrg8MiBV1    = C.REGISTERED_SEAL_PROOF_STACKED_DRG8_MI_B_V1
-	RegisteredSealProofStackedDrg512MiBV1  = C.REGISTERED_SEAL_PROOF_STACKED_DRG512_MI_B_V1
-	RegisteredSealProofStackedDrg32GiBV1   = C.REGISTERED_SEAL_PROOF_STACKED_DRG32_GI_B_V1
-	RegisteredSealProofStackedDrg64GiBV1   = C.REGISTERED_SEAL_PROOF_STACKED_DRG64_GI_B_V1
-	RegisteredSealProofStackedDrg2KiBV11   = C.REGISTERED_SEAL_PROOF_STACKED_DRG2_KI_B_V1_1
-	RegisteredSealProofStackedDrg8MiBV11   = C.REGISTERED_SEAL_PROOF_STACKED_DRG8_MI_B_V1_1
-	RegisteredSealProofStackedDrg512MiBV11 = C.REGISTERED_SEAL_PROOF_STACKED_DRG512_MI_B_V1_1
-	RegisteredSealProofStackedDrg32GiBV11  = C.REGISTERED_SEAL_PROOF_STACKED_DRG32_GI_B_V1_1
-	RegisteredSealProofStackedDrg64GiBV11  = C.REGISTERED_SEAL_PROOF_STACKED_DRG64_GI_B_V1_1
+	RegisteredSealProofStackedDrg2KiBV1                        = C.REGISTERED_SEAL_PROOF_STACKED_DRG2_KI_B_V1
+	RegisteredSealProofStackedDrg8MiBV1                        = C.REGISTERED_SEAL_PROOF_STACKED_DRG8_MI_B_V1
+	RegisteredSealProofStackedDrg512MiBV1                      = C.REGISTERED_SEAL_PROOF_STACKED_DRG512_MI_B_V1
+	RegisteredSealProofStackedDrg32GiBV1                       = C.REGISTERED_SEAL_PROOF_STACKED_DRG32_GI_B_V1
+	RegisteredSealProofStackedDrg64GiBV1                       = C.REGISTERED_SEAL_PROOF_STACKED_DRG64_GI_B_V1
+	RegisteredSealProofStackedDrg2KiBV11                       = C.REGISTERED_SEAL_PROOF_STACKED_DRG2_KI_B_V1_1
+	RegisteredSealProofStackedDrg8MiBV11                       = C.REGISTERED_SEAL_PROOF_STACKED_DRG8_MI_B_V1_1
+	RegisteredSealProofStackedDrg512MiBV11                     = C.REGISTERED_SEAL_PROOF_STACKED_DRG512_MI_B_V1_1
+	RegisteredSealProofStackedDrg32GiBV11                      = C.REGISTERED_SEAL_PROOF_STACKED_DRG32_GI_B_V1_1
+	RegisteredSealProofStackedDrg64GiBV11                      = C.REGISTERED_SEAL_PROOF_STACKED_DRG64_GI_B_V1_1
+	RegisteredSealProofStackedDrg2KiBV11_Feat_SyntheticPoRep   = C.REGISTERED_SEAL_PROOF_STACKED_DRG2_KI_B_V1_1__FEAT__SYNTHETIC_PO_REP
+	RegisteredSealProofStackedDrg8MiBV11_Feat_SyntheticPoRep   = C.REGISTERED_SEAL_PROOF_STACKED_DRG8_MI_B_V1_1__FEAT__SYNTHETIC_PO_REP
+	RegisteredSealProofStackedDrg512MiBV11_Feat_SyntheticPoRep = C.REGISTERED_SEAL_PROOF_STACKED_DRG512_MI_B_V1_1__FEAT__SYNTHETIC_PO_REP
+	RegisteredSealProofStackedDrg32GiBV11_Feat_SyntheticPoRep  = C.REGISTERED_SEAL_PROOF_STACKED_DRG32_GI_B_V1_1__FEAT__SYNTHETIC_PO_REP
+	RegisteredSealProofStackedDrg64GiBV11_Feat_SyntheticPoRep  = C.REGISTERED_SEAL_PROOF_STACKED_DRG64_GI_B_V1_1__FEAT__SYNTHETIC_PO_REP
 )
 
 const (

cgo/proofs.go

@@ -226,6 +226,31 @@ func ClearCache(sectorSize uint64, cacheDirPath SliceRefUint8) error {
 
 func ClearSyntheticProofs(sectorSize uint64, cacheDirPath SliceRefUint8) error {
 	resp := C.clear_synthetic_proofs(C.uint64_t(sectorSize), cacheDirPath)
+}
+func ClearLayerData(sectorSize uint64, cacheDirPath SliceRefUint8) error {
+	resp := C.clear_layer_data(C.uint64_t(sectorSize), cacheDirPath)
+	defer resp.destroy()
+	return CheckErr(resp)
+}
+
+func GenerateSynthProofs(
+	registered_proof RegisteredSealProof,
+	comm_r, comm_d ByteArray32,
+	cache_dir_path, replica_path SliceRefUint8,
+	sector_id uint64,
+	prover_id, ticket ByteArray32,
+	pieces SliceRefPublicPieceInfo,
+) error {
+	resp := C.generate_synth_proofs(registered_proof,
+		&comm_r,
+		&comm_d,
+		cache_dir_path,
+		replica_path,
+		C.uint64_t(sector_id),
+		&prover_id,
+		&ticket,
+		pieces,
+	)
 	defer resp.destroy()
 	return CheckErr(resp)
 }

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/filecoin-project/go-address v1.1.0
 	github.com/filecoin-project/go-fil-commcid v0.1.0
-	github.com/filecoin-project/go-state-types v0.11.1
+	github.com/filecoin-project/go-state-types v0.11.1-plus-synthetic
 	github.com/ipfs/go-block-format v0.0.3
 	github.com/ipfs/go-cid v0.3.2
 	github.com/ipfs/go-ipfs-blockstore v1.2.0

proofs.go

@@ -647,6 +647,48 @@ func ClearSyntheticProofs(sectorSize uint64, cacheDirPath string) error {
 	return cgo.ClearSyntheticProofs(sectorSize, cgo.AsSliceRefUint8([]byte(cacheDirPath)))
 }
 
+func ClearLayerData(sectorSize abi.SectorSize, cacheDirPath string) error {
+	return cgo.ClearLayerData(uint64(sectorSize), cgo.AsSliceRefUint8([]byte(cacheDirPath)))
+}
+
+func GenerateSynthProofs(
+	proofType abi.RegisteredSealProof,
+	sealedCID, unsealedCID cid.Cid,
+	cacheDirPath, replicaPath string,
+	sector_id abi.SectorNumber,
+	minerID abi.ActorID,
+	ticket []byte,
+	pieces []abi.PieceInfo,
+) error {
+	sp, err := toFilRegisteredSealProof(proofType)
+	if err != nil {
+		return err
+	}
+	filPublicPieceInfos, err := toFilPublicPieceInfos(pieces)
+	if err != nil {
+		return err
+	}
+	commR, err := to32ByteCommR(sealedCID)
+	if err != nil {
+		return err
+	}
+
+	commD, err := to32ByteCommD(unsealedCID)
+	if err != nil {
+		return err
+	}
+	proverID, err := toProverID(minerID)
+	if err != nil {
+		return err
+	}
+	return cgo.GenerateSynthProofs(sp,
+		commR, commD,
+		cgo.AsSliceRefUint8([]byte(cacheDirPath)), cgo.AsSliceRefUint8([]byte(replicaPath)),
+		uint64(sector_id),
+		proverID, cgo.AsByteArray32(ticket),
+		cgo.AsSliceRefPublicPieceInfo(filPublicPieceInfos))
+}
+
 func FauxRep(proofType abi.RegisteredSealProof, cacheDirPath string, sealedSectorPath string) (cid.Cid, error) {
 	sp, err := toFilRegisteredSealProof(proofType)
 	if err != nil {
@@ -961,6 +1003,18 @@ func toFilRegisteredSealProof(p abi.RegisteredSealProof) (cgo.RegisteredSealProo
 		return cgo.RegisteredSealProofStackedDrg32GiBV11, nil
 	case abi.RegisteredSealProof_StackedDrg64GiBV1_1:
 		return cgo.RegisteredSealProofStackedDrg64GiBV11, nil
+
+	case abi.RegisteredSealProof_StackedDrg2KiBV1_1_Feat_SyntheticPoRep:
+		return cgo.RegisteredSealProofStackedDrg2KiBV11_Feat_SyntheticPoRep, nil
+	case abi.RegisteredSealProof_StackedDrg8MiBV1_1_Feat_SyntheticPoRep:
+		return cgo.RegisteredSealProofStackedDrg8MiBV11_Feat_SyntheticPoRep, nil
+	case abi.RegisteredSealProof_StackedDrg512MiBV1_1_Feat_SyntheticPoRep:
+		return cgo.RegisteredSealProofStackedDrg512MiBV11_Feat_SyntheticPoRep, nil
+	case abi.RegisteredSealProof_StackedDrg32GiBV1_1_Feat_SyntheticPoRep:
+		return cgo.RegisteredSealProofStackedDrg32GiBV11_Feat_SyntheticPoRep, nil
+	case abi.RegisteredSealProof_StackedDrg64GiBV1_1_Feat_SyntheticPoRep:
+		return cgo.RegisteredSealProofStackedDrg64GiBV11_Feat_SyntheticPoRep, nil
+
 	default:
 		return 0, errors.Errorf("no mapping to C.FFIRegisteredSealProof value available for: %v", p)
 	}