Revert "Update SupportedProofTypes (#11988)" (#11990)

This reverts commit 7e005be.
filecoin-project · May 14, 2024 · 74172ba · 74172ba
1 parent 84b08fc
commit 74172ba
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 28 deletions.
diff --git a/build/params_2k.go b/build/params_2k.go
@@ -88,10 +88,8 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 }
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
-	abi.RegisteredSealProof_StackedDrg2KiBV1_1,
-	abi.RegisteredSealProof_StackedDrg2KiBV1_1_Feat_SyntheticPoRep,
-	abi.RegisteredSealProof_StackedDrg8MiBV1_1,
-	abi.RegisteredSealProof_StackedDrg8MiBV1_1_Feat_SyntheticPoRep,
+	abi.RegisteredSealProof_StackedDrg2KiBV1,
+	abi.RegisteredSealProof_StackedDrg8MiBV1,
 }
 var ConsensusMinerMinPower = abi.NewStoragePower(2048)
 var MinVerifiedDealSize = abi.NewStoragePower(256)

diff --git a/build/params_butterfly.go b/build/params_butterfly.go
@@ -71,12 +71,9 @@ const UpgradeWatermelonFix2Height = -101
 const UpgradeCalibrationDragonFixHeight = -102
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
-	abi.RegisteredSealProof_StackedDrg512MiBV1_1,
-	abi.RegisteredSealProof_StackedDrg512MiBV1_1_Feat_SyntheticPoRep,
-	abi.RegisteredSealProof_StackedDrg32GiBV1_1,
-	abi.RegisteredSealProof_StackedDrg32GiBV1_1_Feat_SyntheticPoRep,
-	abi.RegisteredSealProof_StackedDrg64GiBV1_1,
-	abi.RegisteredSealProof_StackedDrg64GiBV1_1_Feat_SyntheticPoRep,
+	abi.RegisteredSealProof_StackedDrg512MiBV1,
+	abi.RegisteredSealProof_StackedDrg32GiBV1,
+	abi.RegisteredSealProof_StackedDrg64GiBV1,
 }
 var ConsensusMinerMinPower = abi.NewStoragePower(2 << 30)
 var MinVerifiedDealSize = abi.NewStoragePower(1 << 20)

diff --git a/build/params_calibnet.go b/build/params_calibnet.go
@@ -102,10 +102,8 @@ const UpgradeCalibrationDragonFixHeight = 1493854
 const UpgradeAussieHeight = 999999999999999
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
-	abi.RegisteredSealProof_StackedDrg32GiBV1_1,
-	abi.RegisteredSealProof_StackedDrg32GiBV1_1_Feat_SyntheticPoRep,
-	abi.RegisteredSealProof_StackedDrg64GiBV1_1,
-	abi.RegisteredSealProof_StackedDrg64GiBV1_1_Feat_SyntheticPoRep,
+	abi.RegisteredSealProof_StackedDrg32GiBV1,
+	abi.RegisteredSealProof_StackedDrg64GiBV1,
 }
 var ConsensusMinerMinPower = abi.NewStoragePower(32 << 30)
 var MinVerifiedDealSize = abi.NewStoragePower(1 << 20)

diff --git a/build/params_interop.go b/build/params_interop.go
@@ -75,12 +75,9 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 }
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
-	abi.RegisteredSealProof_StackedDrg2KiBV1_1,
-	abi.RegisteredSealProof_StackedDrg2KiBV1_1_Feat_SyntheticPoRep,
-	abi.RegisteredSealProof_StackedDrg8MiBV1_1,
-	abi.RegisteredSealProof_StackedDrg8MiBV1_1_Feat_SyntheticPoRep,
-	abi.RegisteredSealProof_StackedDrg512MiBV1_1,
-	abi.RegisteredSealProof_StackedDrg512MiBV1_1_Feat_SyntheticPoRep,
+	abi.RegisteredSealProof_StackedDrg2KiBV1,
+	abi.RegisteredSealProof_StackedDrg8MiBV1,
+	abi.RegisteredSealProof_StackedDrg512MiBV1,
 }
 var ConsensusMinerMinPower = abi.NewStoragePower(2048)
 var MinVerifiedDealSize = abi.NewStoragePower(256)

diff --git a/build/params_mainnet.go b/build/params_mainnet.go
@@ -119,10 +119,8 @@ const UpgradeWatermelonFix2Height = -2
 const UpgradeCalibrationDragonFixHeight = -3
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
-	abi.RegisteredSealProof_StackedDrg32GiBV1_1,
-	abi.RegisteredSealProof_StackedDrg32GiBV1_1_Feat_SyntheticPoRep,
-	abi.RegisteredSealProof_StackedDrg64GiBV1_1,
-	abi.RegisteredSealProof_StackedDrg64GiBV1_1_Feat_SyntheticPoRep,
+	abi.RegisteredSealProof_StackedDrg32GiBV1,
+	abi.RegisteredSealProof_StackedDrg64GiBV1,
 }
 var ConsensusMinerMinPower = abi.NewStoragePower(10 << 40)
 var PreCommitChallengeDelay = abi.ChainEpoch(150)

diff --git a/build/params_testground.go b/build/params_testground.go
@@ -35,10 +35,8 @@ var (
 	PropagationDelaySecs  = uint64(6)
 	EquivocationDelaySecs = uint64(2)
 	SupportedProofTypes   = []abi.RegisteredSealProof{
-		abi.RegisteredSealProof_StackedDrg32GiBV1_1,
-		abi.RegisteredSealProof_StackedDrg32GiBV1_1_Feat_SyntheticPoRep,
-		abi.RegisteredSealProof_StackedDrg64GiBV1_1,
-		abi.RegisteredSealProof_StackedDrg64GiBV1_1_Feat_SyntheticPoRep,
+		abi.RegisteredSealProof_StackedDrg32GiBV1,
+		abi.RegisteredSealProof_StackedDrg64GiBV1,
 	}
 	ConsensusMinerMinPower  = abi.NewStoragePower(10 << 40)
 	PreCommitChallengeDelay = abi.ChainEpoch(150)