Revert fip 0052

Author: ZenGround0

chain/actors/policy/policy.go

@@ -527,12 +527,6 @@ func GetMaxSectorExpirationExtension() abi.ChainEpoch {
 	return miner11.MaxSectorExpirationExtension
 }
 
-func GetDefaultSectorExpirationExtension() abi.ChainEpoch {
-	// Keep default at the previous max of 1.5 years rather than the current 3.5 years.
-	// This way extension and pledge defaults do not subvert existing expectations.
-	return miner10.MaxSectorExpirationExtension
-}
-
 func GetMinSectorExpiration() abi.ChainEpoch {
 	return miner11.MinSectorExpiration
 }

chain/actors/policy/policy.go.template

@@ -223,12 +223,6 @@ func GetMaxSectorExpirationExtension() abi.ChainEpoch {
 	return miner{{.latestVersion}}.MaxSectorExpirationExtension
 }
 
-func GetDefaultSectorExpirationExtension() abi.ChainEpoch {
-    // Keep default at the previous max of 1.5 years rather than the current 3.5 years.
-    // This way extension and pledge defaults do not subvert existing expectations.
-	return miner10.MaxSectorExpirationExtension
-}
-
 func GetMinSectorExpiration() abi.ChainEpoch {
 	return miner{{.latestVersion}}.MinSectorExpiration
 }

chain/gen/genesis/miners.go

@@ -124,7 +124,7 @@ func SetupStorageMiners(ctx context.Context, cs *store.ChainStore, sys vm.Syscal
 		sectorWeight []abi.StoragePower
 	}, len(miners))
 
-	maxPeriods := policy.GetDefaultSectorExpirationExtension() / minertypes.WPoStProvingPeriod
+	maxPeriods := policy.GetMaxSectorExpirationExtension() / minertypes.WPoStProvingPeriod
 	rawPow, qaPow := big.NewInt(0), big.NewInt(0)
 	for i, m := range miners {
 		// Create miner through power actor

cmd/lotus-miner/sectors.go

@@ -1693,7 +1693,7 @@ var sectorsCapacityCollateralCmd = &cli.Command{
 				return err
 			}
 
-			pci.Expiration = policy.GetDefaultSectorExpirationExtension() + h.Height()
+			pci.Expiration = policy.GetMaxSectorExpirationExtension() + h.Height()
 		}
 
 		pc, err := nApi.StateMinerInitialPledgeCollateral(ctx, maddr, pci, types.EmptyTSK)

documentation/en/default-lotus-miner-config.toml

@@ -535,7 +535,7 @@
   #
   # type: Duration
   # env var: LOTUS_SEALING_COMMITTEDCAPACITYSECTORLIFETIME
-  #CommittedCapacitySectorLifetime = "12960h0m0s"
+  #CommittedCapacitySectorLifetime = "30672h0m0s"
 
   # Period of time that a newly created sector will wait for more deals to be packed in to before it starts to seal.
   # Sectors which are fully filled will start sealing immediately

node/config/def.go

@@ -137,7 +137,7 @@ func DefaultStorageMiner() *StorageMiner {
 			// XXX snap deals wait deals slack if first
 			PreCommitBatchSlack: Duration(3 * time.Hour), // time buffer for forceful batch submission before sectors/deals in batch would start expiring, higher value will lower the chances for message fail due to expiration
 
-			CommittedCapacitySectorLifetime: Duration(builtin.EpochDurationSeconds * uint64(policy.GetDefaultSectorExpirationExtension()) * uint64(time.Second)),
+			CommittedCapacitySectorLifetime: Duration(builtin.EpochDurationSeconds * uint64(policy.GetMaxSectorExpirationExtension()) * uint64(time.Second)),
 
 			AggregateCommits: true,
 			MinCommitBatch:   miner5.MinAggregatedSectors, // per FIP13, we must have at least four proofs to aggregate, where 4 is the cross over point where aggregation wins out on single provecommit gas costs

storage/pipeline/precommit_policy.go

@@ -114,7 +114,7 @@ func (p *BasicPreCommitPolicy) getCCSectorLifetime() (abi.ChainEpoch, error) {
 	var ccLifetimeEpochs = abi.ChainEpoch(uint64(c.CommittedCapacitySectorLifetime.Seconds()) / builtin.EpochDurationSeconds)
 	// if zero value in config, assume default sector extension
 	if ccLifetimeEpochs == 0 {
-		ccLifetimeEpochs = policy.GetDefaultSectorExpirationExtension()
+		ccLifetimeEpochs = policy.GetMaxSectorExpirationExtension()
 	}
 
 	if minExpiration := abi.ChainEpoch(miner.MinSectorExpiration); ccLifetimeEpochs < minExpiration {

storage/pipeline/precommit_policy_test.go

@@ -68,7 +68,7 @@ func TestBasicPolicyEmptySector(t *testing.T) {
 	require.NoError(t, err)
 
 	// as set when there are no deal pieces
-	expected := h + policy.GetDefaultSectorExpirationExtension() - pBuffer
+	expected := h + policy.GetMaxSectorExpirationExtension() - pBuffer
 	assert.Equal(t, int(expected), int(exp))
 }