feat: nv25 and nv26 - fip-0100 (and some FIP-0098)

CHANGELOG.md

@@ -20,10 +20,16 @@
 - chore: upgrade to a minimum Golang version of `1.23.6` ([filecoin-project/lotus#12910](https://github.com/filecoin-project/lotus/pull/12910)
 - feat: add a  `LOTUS_DISABLE_F3_ACTIVATION` enviroment variable allowing disabling F3 activation for a specific contract address or epoch ([filecoin-project/lotus#12920](https://github.com/filecoin-project/lotus/pull/12920)). The `LOTUS_DISABLE_F3` env-var has been renamed to `LOTUS_DISABLE_F3_SUBSYSTEM` to distinguish it from the other F3-related environment variables: `LOTUS_DISABLE_F3_PASSIVE_TESTING` and `LOTUS_DISABLE_F3_ACTIVATION`.
 - feat: add `GenesisTimestamp` field to `StateGetNetworkParams` response ([filecoin-project/lotus#12925](https://github.com/filecoin-project/lotus/pull/12925))
-- chore: upgrade drand client
+- chore: upgrade drand client. ([filecoin-project/lotus#12830](https://github.com/filecoin-project/lotus/pull/12830))
 - chore: upgrade go-state-types with big.Int{} change that means an empty big.Int is now treated as zero for all operations ([filecoin-project/lotus#12936](https://github.com/filecoin-project/lotus/pull/12936))
 - feat: expose `ChainGetMessagesInTipset` in the Lotus Gateway API ([filecoin-project/lotus#12947](https://github.com/filecoin-project/lotus/pull/12947))
 - feat: add `Agent` to the `Filecoin.Version` response ([#12904](https://github.com/filecoin-project/lotus/issues/12904)) that will be used to identify the node type.
+- feat!: [FIP-0100](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0100.md) and [FIP-0098](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0098.md) implementation ([filecoin-project/lotus#12942](https://github.com/filecoin-project/lotus/pull/12942))
+  - Adds a scheduled nv26 "Tock" upgrade exactly 90 days after nv25 to signal the end of the sector extensions grace period for FIP-0100
+  - Deadlines on the public API now have a `DailyFee` field
+  - `DealIDs` has now been removed from the public API's `SectorOnChainInfo` (was deprecated in FIP-0079)
+  - Removed `--only-cc` from `spcli sectors extend` command
+  - Change circulating supply calculation for calibnet, butterflynet and 2k for nv25 upgrade; see ([filecoin-project/lotus#12938](https://github.com/filecoin-project/lotus/pull/12938)) for more information
 
 # UNRELEASED v.1.32.0
 

api/api_full.go

@@ -1398,6 +1398,7 @@ const (
 type Deadline struct {
 	PostSubmissions      bitfield.BitField
 	DisputableProofCount uint64
+	DailyFee             abi.TokenAmount
 }
 
 type Partition struct {

api/types.go

@@ -194,6 +194,7 @@ type ForkUpgradeParams struct {
 	UpgradeWaffleHeight      abi.ChainEpoch
 	UpgradeTuktukHeight      abi.ChainEpoch
 	UpgradeTeepHeight        abi.ChainEpoch
+	UpgradeTockHeight        abi.ChainEpoch
 }
 
 // ChainExportConfig holds configuration for chain ranged exports.

build/buildconstants/params_2k.go

@@ -65,29 +65,33 @@ var UpgradeThunderHeight = abi.ChainEpoch(-23)
 
 var UpgradeWatermelonHeight = abi.ChainEpoch(-24)
 
+// This fix upgrade only ran on calibrationnet
+const UpgradeWatermelonFixHeight = -100
+
+// This fix upgrade only ran on calibrationnet
+const UpgradeWatermelonFix2Height = -101
+
 var UpgradeDragonHeight = abi.ChainEpoch(-24)
 
+// This fix upgrade only ran on calibrationnet
+const UpgradeCalibrationDragonFixHeight = -102
+
 var UpgradePhoenixHeight = abi.ChainEpoch(-25)
 
 var UpgradeWaffleHeight = abi.ChainEpoch(-26)
 
 var UpgradeTuktukHeight = abi.ChainEpoch(-27)
 
-var UpgradeTeepHeight = abi.ChainEpoch(200)
-
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
 // Tuktuk migration. along with a RampStartEpoch matching the upgrade height.
 var UpgradeTuktukPowerRampDurationEpochs uint64 = 200
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFixHeight = -100
+var UpgradeTeepHeight = abi.ChainEpoch(200)
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFix2Height = -101
+var UpgradeTeepInitialFilReserved = wholeFIL(1_400_000_000) // FIP-0100: 300M -> 1.4B FIL
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeCalibrationDragonFixHeight = -102
+var UpgradeTockHeight = abi.ChainEpoch(300)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandQuicknet,
@@ -166,6 +170,7 @@ func init() {
 	UpgradePhoenixHeight = getUpgradeHeight("LOTUS_PHOENIX_HEIGHT", UpgradePhoenixHeight)
 	UpgradeTuktukHeight = getUpgradeHeight("LOTUS_TUKTUK_HEIGHT", UpgradeTuktukHeight)
 	UpgradeTeepHeight = getUpgradeHeight("LOTUS_TEEP_HEIGHT", UpgradeTeepHeight)
+	UpgradeTockHeight = getUpgradeHeight("LOTUS_TOCK_HEIGHT", UpgradeTockHeight)
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0: DrandQuicknet,

build/buildconstants/params_butterfly.go

@@ -53,27 +53,32 @@ const UpgradeHyggeHeight = -21
 const UpgradeLightningHeight = -22
 const UpgradeThunderHeight = -23
 const UpgradeWatermelonHeight = -24
+
+// This fix upgrade only ran on calibrationnet
+const UpgradeWatermelonFixHeight = -100
+
+// This fix upgrade only ran on calibrationnet
+const UpgradeWatermelonFix2Height = -101
 const UpgradeDragonHeight = -25
+
+// This fix upgrade only ran on calibrationnet
+const UpgradeCalibrationDragonFixHeight = -102
 const UpgradePhoenixHeight = -26
 const UpgradeWaffleHeight = -27
 const UpgradeTuktukHeight = -28
 
-// ??????
-const UpgradeTeepHeight = 100
-
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
 // Tuktuk migration. along with a RampStartEpoch matching the upgrade height.
 var UpgradeTuktukPowerRampDurationEpochs = uint64(builtin.EpochsInYear)
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFixHeight = -100
+// ??????
+const UpgradeTeepHeight = 100
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFix2Height = -101
+var UpgradeTeepInitialFilReserved = wholeFIL(1_600_000_000) // FIP-0100: 300M -> 1.6B FIL
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeCalibrationDragonFixHeight = -102
+// ??????
+const UpgradeTockHeight = 200
 
 var ConsensusMinerMinPower = abi.NewStoragePower(2 << 30)
 var PreCommitChallengeDelay = abi.ChainEpoch(150)

build/buildconstants/params_calibnet.go

@@ -30,80 +30,77 @@ var ActorDebugging = false
 const BootstrappersFile = "calibnet.pi"
 const GenesisFile = "calibnet.car.zst"
 
-const UpgradeBreezeHeight = -1
+const UpgradeBreezeHeight abi.ChainEpoch = -1
 const BreezeGasTampingDuration = 120
 
-const UpgradeSmokeHeight = -2
+const UpgradeSmokeHeight abi.ChainEpoch = -2
 
-const UpgradeIgnitionHeight = -3
-const UpgradeRefuelHeight = -4
+const UpgradeIgnitionHeight abi.ChainEpoch = -3
+const UpgradeRefuelHeight abi.ChainEpoch = -4
 
 var UpgradeAssemblyHeight = abi.ChainEpoch(30)
 
-const UpgradeTapeHeight = 60
+const UpgradeTapeHeight abi.ChainEpoch = 60
 
-const UpgradeLiftoffHeight = -5
+const UpgradeLiftoffHeight abi.ChainEpoch = -5
 
-const UpgradeKumquatHeight = 90
+const UpgradeKumquatHeight abi.ChainEpoch = 90
 
-const UpgradeCalicoHeight = 120
-const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 1)
+const UpgradeCalicoHeight abi.ChainEpoch = 120
+const UpgradePersianHeight abi.ChainEpoch = UpgradeCalicoHeight + (builtin2.EpochsInHour * 1)
 
-const UpgradeClausHeight = 270
+const UpgradeClausHeight abi.ChainEpoch = 270
 
-const UpgradeOrangeHeight = 300
+const UpgradeOrangeHeight abi.ChainEpoch = 300
 
-const UpgradeTrustHeight = 330
+const UpgradeTrustHeight abi.ChainEpoch = 330
 
-const UpgradeNorwegianHeight = 360
+const UpgradeNorwegianHeight abi.ChainEpoch = 360
 
-const UpgradeTurboHeight = 390
+const UpgradeTurboHeight abi.ChainEpoch = 390
 
-const UpgradeHyperdriveHeight = 420
+const UpgradeHyperdriveHeight abi.ChainEpoch = 420
 
-const UpgradeChocolateHeight = 450
+const UpgradeChocolateHeight abi.ChainEpoch = 450
 
-const UpgradeOhSnapHeight = 480
+const UpgradeOhSnapHeight abi.ChainEpoch = 480
 
-const UpgradeSkyrHeight = 510
+const UpgradeSkyrHeight abi.ChainEpoch = 510
 
-const UpgradeSharkHeight = 16800 // 6 days after genesis
+const UpgradeSharkHeight abi.ChainEpoch = 16800 // 6 days after genesis
 
 // 2023-02-21T16:30:00Z
-const UpgradeHyggeHeight = 322354
+const UpgradeHyggeHeight abi.ChainEpoch = 322354
 
 // 2023-04-20T14:00:00Z
-const UpgradeLightningHeight = 489094
+const UpgradeLightningHeight abi.ChainEpoch = 489094
 
 // 2023-04-21T16:00:00Z
-const UpgradeThunderHeight = UpgradeLightningHeight + 3120
+const UpgradeThunderHeight abi.ChainEpoch = UpgradeLightningHeight + 3120
 
 // 2023-10-19T13:00:00Z
-const UpgradeWatermelonHeight = 1013134
+const UpgradeWatermelonHeight abi.ChainEpoch = 1013134
 
 // 2023-11-07T13:00:00Z
-const UpgradeWatermelonFixHeight = 1070494
+const UpgradeWatermelonFixHeight abi.ChainEpoch = 1070494
 
 // 2023-11-21T13:00:00Z
-const UpgradeWatermelonFix2Height = 1108174
+const UpgradeWatermelonFix2Height abi.ChainEpoch = 1108174
 
 // 2024-03-11T14:00:00Z
-const UpgradeDragonHeight = 1427974
+const UpgradeDragonHeight abi.ChainEpoch = 1427974
 
 // This epoch, 120 epochs after the "rest" of the nv22 upgrade, is when we switch to Drand quicknet
-const UpgradePhoenixHeight = UpgradeDragonHeight + 120
+const UpgradePhoenixHeight abi.ChainEpoch = UpgradeDragonHeight + 120
 
 // 2024-04-03T11:00:00Z
-const UpgradeCalibrationDragonFixHeight = 1493854
+const UpgradeCalibrationDragonFixHeight abi.ChainEpoch = 1493854
 
 // 2024-07-11T12:00:00Z
-const UpgradeWaffleHeight = 1779094
+const UpgradeWaffleHeight abi.ChainEpoch = 1779094
 
 // 2024-10-23T13:30:00Z
-const UpgradeTuktukHeight = 2078794
-
-// 2025-03-25T23:00:00Z
-const UpgradeTeepHeight = 2520574
+const UpgradeTuktukHeight abi.ChainEpoch = 2078794
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
@@ -113,6 +110,15 @@ const UpgradeTeepHeight = 2520574
 // ramp behavior before mainnet upgrade.
 var UpgradeTuktukPowerRampDurationEpochs = uint64(builtin.EpochsInDay * 3)
 
+// 2025-03-25T23:00:00Z
+const UpgradeTeepHeight abi.ChainEpoch = 2520574
+
+var UpgradeTeepInitialFilReserved = wholeFIL(1_200_000_000) // FIP-0100: 300M -> 1.2B FIL
+
+// This epoch, 7 days after Teep is the completion of FIP-0100 where actors will start applying
+// the new daily fee to pre-Teep sectors being extended. This is 90 days on mainnet.
+var UpgradeTockHeight abi.ChainEpoch = UpgradeTeepHeight + builtin.EpochsInDay*7
+
 var ConsensusMinerMinPower = abi.NewStoragePower(32 << 30)
 var PreCommitChallengeDelay = abi.ChainEpoch(150)
 

build/buildconstants/params_interop.go

@@ -52,26 +52,32 @@ var UpgradeHyggeHeight = abi.ChainEpoch(-21)
 var UpgradeLightningHeight = abi.ChainEpoch(-22)
 var UpgradeThunderHeight = abi.ChainEpoch(-23)
 var UpgradeWatermelonHeight = abi.ChainEpoch(-24)
+
+// This fix upgrade only ran on calibrationnet
+const UpgradeWatermelonFixHeight abi.ChainEpoch = -1
+
+// This fix upgrade only ran on calibrationnet
+const UpgradeWatermelonFix2Height abi.ChainEpoch = -2
+
 var UpgradeDragonHeight = abi.ChainEpoch(-25)
+
+// This fix upgrade only ran on calibrationnet
+const UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -3
+
 var UpgradePhoenixHeight = abi.ChainEpoch(-26)
 var UpgradeWaffleHeight = abi.ChainEpoch(-27)
 var UpgradeTuktukHeight = abi.ChainEpoch(-28)
 
-const UpgradeTeepHeight = 50
-
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
 // Tuktuk migration. along with a RampStartEpoch matching the upgrade height.
 var UpgradeTuktukPowerRampDurationEpochs = uint64(builtin.EpochsInYear)
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFixHeight = -1
+const UpgradeTeepHeight abi.ChainEpoch = 50
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFix2Height = -2
+var UpgradeTeepInitialFilReserved = InitialFilReserved // FIP-0100: no change for interop
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeCalibrationDragonFixHeight = -3
+const UpgradeTockHeight abi.ChainEpoch = 100
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandQuicknet,

build/buildconstants/params_mainnet.go

@@ -43,7 +43,7 @@ const UpgradeSmokeHeight abi.ChainEpoch = 51000
 const UpgradeIgnitionHeight abi.ChainEpoch = 94000
 const UpgradeRefuelHeight abi.ChainEpoch = 130800
 
-const UpgradeAssemblyHeight abi.ChainEpoch = 138720
+var UpgradeAssemblyHeight abi.ChainEpoch = 138720
 
 const UpgradeTapeHeight abi.ChainEpoch = 140760
 
@@ -99,9 +99,18 @@ const UpgradeThunderHeight abi.ChainEpoch = UpgradeLightningHeight + 2880*21
 // 2023-12-12T13:30:00Z
 const UpgradeWatermelonHeight abi.ChainEpoch = 3469380
 
+// This fix upgrade only ran on calibrationnet
+const UpgradeWatermelonFixHeight abi.ChainEpoch = -1
+
+// This fix upgrade only ran on calibrationnet
+const UpgradeWatermelonFix2Height abi.ChainEpoch = -2
+
 // 2024-04-24T14:00:00Z
 const UpgradeDragonHeight abi.ChainEpoch = 3855360
 
+// This fix upgrade only ran on calibrationnet
+const UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -3
+
 // This epoch, 120 epochs after the "rest" of the nv22 upgrade, is when we switch to Drand quicknet
 // 2024-04-11T15:00:00Z
 const UpgradePhoenixHeight abi.ChainEpoch = UpgradeDragonHeight + 120
@@ -113,22 +122,19 @@ const UpgradeWaffleHeight abi.ChainEpoch = 4154640
 // var because of TestMigrationNV24 in itests/migration_test.go to test the FIP-0081 pledge ramp
 var UpgradeTuktukHeight abi.ChainEpoch = 4461240
 
-// ??????
-var UpgradeTeepHeight = abi.ChainEpoch(9999999999)
-
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
 // Tuktuk migration. along with a RampStartEpoch matching the upgrade height.
 var UpgradeTuktukPowerRampDurationEpochs = uint64(builtin.EpochsInYear)
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFixHeight abi.ChainEpoch = -1
+// ??????
+var UpgradeTeepHeight = abi.ChainEpoch(9999999999)
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFix2Height abi.ChainEpoch = -2
+// This epoch, 90 days after Teep is the completion of FIP-0100 where actors will start applying
+// the new daily fee to pre-Teep sectors being extended.
+var UpgradeTockHeight = UpgradeTeepHeight + builtin.EpochsInDay*90
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -3
+var UpgradeTeepInitialFilReserved = InitialFilReserved // FIP-0100: no change for mainnet
 
 var ConsensusMinerMinPower = abi.NewStoragePower(10 << 40)
 var PreCommitChallengeDelay = abi.ChainEpoch(150)