fix(build)!: adjust FilReserved for FIP-0100 for non-mainnet

CHANGELOG.md

@@ -20,8 +20,10 @@
 - 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))
+- fix!: change circulating supply calculation for calibnet, butterflynet and 2k for nv25 upgrade. ([filecoin-project/lotus#12938](https://github.com/filecoin-project/lotus/pull/12938))
+- feat: add DailyFee integration tests ([filecoin-project/lotus#12942](https://github.com/filecoin-project/lotus/pull/12942))
 
 # 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 {

build/buildconstants/params_2k.go

@@ -65,29 +65,31 @@ 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
-
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFix2Height = -101
+var UpgradeTeepHeight = abi.ChainEpoch(200)
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeCalibrationDragonFixHeight = -102
+var UpgradeTeepInitialFilReserved = wholeFIL(1_400_000_000) // FIP-0100: 300M -> 1.4B FIL
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandQuicknet,

build/buildconstants/params_butterfly.go

@@ -53,27 +53,29 @@ 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
-
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFix2Height = -101
+// ??????
+const UpgradeTeepHeight = 100
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeCalibrationDragonFixHeight = -102
+var UpgradeTeepInitialFilReserved = wholeFIL(1_600_000_000) // FIP-0100: 300M -> 1.6B FIL
 
 var ConsensusMinerMinPower = abi.NewStoragePower(2 << 30)
 var PreCommitChallengeDelay = abi.ChainEpoch(150)

build/buildconstants/params_calibnet.go

@@ -102,9 +102,6 @@ const UpgradeWaffleHeight = 1779094
 // 2024-10-23T13:30:00Z
 const UpgradeTuktukHeight = 2078794
 
-// Canceled - See update in: https://github.com/filecoin-project/community/discussions/74#discussioncomment-11549619
-const UpgradeTeepHeight = 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.
@@ -113,6 +110,11 @@ const UpgradeTeepHeight = 9999999999
 // ramp behavior before mainnet upgrade.
 var UpgradeTuktukPowerRampDurationEpochs = uint64(builtin.EpochsInDay * 3)
 
+// Canceled - See update in: https://github.com/filecoin-project/community/discussions/74#discussioncomment-11549619
+const UpgradeTeepHeight = 9999999999
+
+var UpgradeTeepInitialFilReserved = wholeFIL(1_200_000_000) // FIP-0100: 300M -> 1.2B FIL
+
 var ConsensusMinerMinPower = abi.NewStoragePower(32 << 30)
 var PreCommitChallengeDelay = abi.ChainEpoch(150)
 

build/buildconstants/params_interop.go

@@ -52,26 +52,30 @@ 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 = -1
+
+// This fix upgrade only ran on calibrationnet
+const UpgradeWatermelonFix2Height = -2
+
 var UpgradeDragonHeight = abi.ChainEpoch(-25)
+
+// This fix upgrade only ran on calibrationnet
+const UpgradeCalibrationDragonFixHeight = -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
-
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFix2Height = -2
+const UpgradeTeepHeight = 50
 
-// This fix upgrade only ran on calibrationnet
-const UpgradeCalibrationDragonFixHeight = -3
+var UpgradeTeepInitialFilReserved = InitialFilReserved // FIP-0100: no change for interop
 
 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,15 @@ 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
-
-// This fix upgrade only ran on calibrationnet
-const UpgradeWatermelonFix2Height abi.ChainEpoch = -2
+// ??????
+var UpgradeTeepHeight = abi.ChainEpoch(9999999999)
 
-// 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)

build/buildconstants/params_shared_vals.go

@@ -4,7 +4,6 @@
 package buildconstants
 
 import (
-	"math/big"
 	"os"
 
 	"github.com/ipfs/go-cid"
@@ -59,21 +58,12 @@ const AddressMainnetEnvVar = "_mainnet_"
 var ZeroAddress = MustParseAddress("f3yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaby2smx7a")
 
 const FilBase = uint64(2_000_000_000)
-const FilAllocStorageMining = uint64(1_100_000_000)
-
 const FilecoinPrecision = uint64(1_000_000_000_000_000_000)
-const FilReserved = uint64(300_000_000)
 
-var InitialRewardBalance *big.Int
-var InitialFilReserved *big.Int
+var InitialRewardBalance = wholeFIL(1_100_000_000)
+var InitialFilReserved = wholeFIL(300_000_000)
 
 func init() {
-	InitialRewardBalance = big.NewInt(int64(FilAllocStorageMining))
-	InitialRewardBalance = InitialRewardBalance.Mul(InitialRewardBalance, big.NewInt(int64(FilecoinPrecision)))
-
-	InitialFilReserved = big.NewInt(int64(FilReserved))
-	InitialFilReserved = InitialFilReserved.Mul(InitialFilReserved, big.NewInt(int64(FilecoinPrecision)))
-
 	if os.Getenv("LOTUS_ADDRESS_TYPE") == AddressMainnetEnvVar {
 		SetAddressNetwork(address.Mainnet)
 	}

build/buildconstants/params_testground.go

@@ -73,39 +73,39 @@ var (
 	UpgradeBreezeHeight      abi.ChainEpoch = -1
 	BreezeGasTampingDuration abi.ChainEpoch = 0
 
-	UpgradeSmokeHeight                abi.ChainEpoch = -1
-	UpgradeIgnitionHeight             abi.ChainEpoch = -2
-	UpgradeRefuelHeight               abi.ChainEpoch = -3
-	UpgradeTapeHeight                 abi.ChainEpoch = -4
-	UpgradeAssemblyHeight             abi.ChainEpoch = 10
-	UpgradeLiftoffHeight              abi.ChainEpoch = -5
-	UpgradeKumquatHeight              abi.ChainEpoch = -6
-	UpgradeCalicoHeight               abi.ChainEpoch = -8
-	UpgradePersianHeight              abi.ChainEpoch = -9
-	UpgradeOrangeHeight               abi.ChainEpoch = -10
-	UpgradeClausHeight                abi.ChainEpoch = -11
-	UpgradeTrustHeight                abi.ChainEpoch = -12
-	UpgradeNorwegianHeight            abi.ChainEpoch = -13
-	UpgradeTurboHeight                abi.ChainEpoch = -14
-	UpgradeHyperdriveHeight           abi.ChainEpoch = -15
-	UpgradeChocolateHeight            abi.ChainEpoch = -16
-	UpgradeOhSnapHeight               abi.ChainEpoch = -17
-	UpgradeSkyrHeight                 abi.ChainEpoch = -18
-	UpgradeSharkHeight                abi.ChainEpoch = -19
-	UpgradeHyggeHeight                abi.ChainEpoch = -20
-	UpgradeLightningHeight            abi.ChainEpoch = -21
-	UpgradeThunderHeight              abi.ChainEpoch = -22
-	UpgradeWatermelonHeight           abi.ChainEpoch = -23
-	UpgradeWatermelonFixHeight        abi.ChainEpoch = -24
-	UpgradeWatermelonFix2Height       abi.ChainEpoch = -25
-	UpgradeDragonHeight               abi.ChainEpoch = -26
-	UpgradePhoenixHeight              abi.ChainEpoch = -27
-	UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -28
-	UpgradeWaffleHeight               abi.ChainEpoch = -29
-	UpgradeTuktukHeight               abi.ChainEpoch = -30
-	UpgradeTeepHeight                 abi.ChainEpoch = -31
-
-	UpgradeTuktukPowerRampDurationEpochs uint64 = 0
+	UpgradeSmokeHeight                   abi.ChainEpoch = -1
+	UpgradeIgnitionHeight                abi.ChainEpoch = -2
+	UpgradeRefuelHeight                  abi.ChainEpoch = -3
+	UpgradeTapeHeight                    abi.ChainEpoch = -4
+	UpgradeAssemblyHeight                abi.ChainEpoch = 10
+	UpgradeLiftoffHeight                 abi.ChainEpoch = -5
+	UpgradeKumquatHeight                 abi.ChainEpoch = -6
+	UpgradeCalicoHeight                  abi.ChainEpoch = -8
+	UpgradePersianHeight                 abi.ChainEpoch = -9
+	UpgradeOrangeHeight                  abi.ChainEpoch = -10
+	UpgradeClausHeight                   abi.ChainEpoch = -11
+	UpgradeTrustHeight                   abi.ChainEpoch = -12
+	UpgradeNorwegianHeight               abi.ChainEpoch = -13
+	UpgradeTurboHeight                   abi.ChainEpoch = -14
+	UpgradeHyperdriveHeight              abi.ChainEpoch = -15
+	UpgradeChocolateHeight               abi.ChainEpoch = -16
+	UpgradeOhSnapHeight                  abi.ChainEpoch = -17
+	UpgradeSkyrHeight                    abi.ChainEpoch = -18
+	UpgradeSharkHeight                   abi.ChainEpoch = -19
+	UpgradeHyggeHeight                   abi.ChainEpoch = -20
+	UpgradeLightningHeight               abi.ChainEpoch = -21
+	UpgradeThunderHeight                 abi.ChainEpoch = -22
+	UpgradeWatermelonHeight              abi.ChainEpoch = -23
+	UpgradeWatermelonFixHeight           abi.ChainEpoch = -24
+	UpgradeWatermelonFix2Height          abi.ChainEpoch = -25
+	UpgradeDragonHeight                  abi.ChainEpoch = -26
+	UpgradePhoenixHeight                 abi.ChainEpoch = -27
+	UpgradeCalibrationDragonFixHeight    abi.ChainEpoch = -28
+	UpgradeWaffleHeight                  abi.ChainEpoch = -29
+	UpgradeTuktukHeight                  abi.ChainEpoch = -30
+	UpgradeTuktukPowerRampDurationEpochs uint64         = 0
+	UpgradeTeepHeight                    abi.ChainEpoch = -31
+	UpgradeTeepInitialFilReserved        *big.Int       = wholeFIL(300_000_000)
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0:                    DrandMainnet,

build/buildconstants/shared_funcs.go

@@ -1,6 +1,8 @@
 package buildconstants
 
 import (
+	"math/big"
+
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p/core/peer"
 
@@ -40,3 +42,8 @@ func MustParseID(id string) peer.ID {
 	}
 	return p
 }
+
+func wholeFIL(whole uint64) *big.Int {
+	bigWhole := big.NewInt(int64(whole))
+	return bigWhole.Mul(bigWhole, big.NewInt(int64(FilecoinPrecision)))
+}

build/openrpc/full.json

@@ -21786,14 +21786,19 @@
                                     5,
                                     1
                                 ],
-                                "DisputableProofCount": 42
+                                "DisputableProofCount": 42,
+                                "DailyFee": "0"
                             }
                         ]
                     ],
                     "items": [
                         {
                             "additionalProperties": false,
                             "properties": {
+                                "DailyFee": {
+                                    "additionalProperties": false,
+                                    "type": "object"
+                                },
                                 "DisputableProofCount": {
                                     "title": "number",
                                     "type": "number"

build/openrpc/gateway.json

@@ -10185,14 +10185,19 @@
                                     5,
                                     1
                                 ],
-                                "DisputableProofCount": 42
+                                "DisputableProofCount": 42,
+                                "DailyFee": "0"
                             }
                         ]
                     ],
                     "items": [
                         {
                             "additionalProperties": false,
                             "properties": {
+                                "DailyFee": {
+                                    "additionalProperties": false,
+                                    "type": "object"
+                                },
                                 "DisputableProofCount": {
                                     "title": "number",
                                     "type": "number"

build/params_shared_vals.go

@@ -34,11 +34,9 @@ var ZeroAddress = buildconstants.ZeroAddress // Deprecated: Use buildconstants.Z
 
 var Devnet = buildconstants.Devnet // Deprecated: Use buildconstants.Devnet instead
 
-var FilBase = buildconstants.FilBase                             // Deprecated: Use buildconstants.FilBase instead
-var FilAllocStorageMining = buildconstants.FilAllocStorageMining // Deprecated: Use buildconstants.FilAllocStorageMining instead
+var FilBase = buildconstants.FilBase // Deprecated: Use buildconstants.FilBase instead
 
 var FilecoinPrecision = buildconstants.FilecoinPrecision // Deprecated: Use buildconstants.FilecoinPrecision instead
-var FilReserved = buildconstants.FilReserved             // Deprecated: Use buildconstants.FilReserved instead
 
 var InitialRewardBalance = buildconstants.InitialRewardBalance // Deprecated: Use buildconstants.InitialRewardBalance instead
 var InitialFilReserved = buildconstants.InitialFilReserved     // Deprecated: Use buildconstants.InitialFilReserved instead