diff --git a/api/types.go b/api/types.go index 864b735665e..3dc8352f6d6 100644 --- a/api/types.go +++ b/api/types.go @@ -195,7 +195,7 @@ type ForkUpgradeParams struct { UpgradeTuktukHeight abi.ChainEpoch UpgradeTeepHeight abi.ChainEpoch UpgradeTockHeight abi.ChainEpoch - UpgradeXxHeight abi.ChainEpoch + UpgradeGoldenWeekHeight abi.ChainEpoch } // ChainExportConfig holds configuration for chain ranged exports. diff --git a/build/buildconstants/params_2k.go b/build/buildconstants/params_2k.go index f262596616a..af1f1d87e47 100644 --- a/build/buildconstants/params_2k.go +++ b/build/buildconstants/params_2k.go @@ -96,7 +96,7 @@ var UpgradeTockHeight = abi.ChainEpoch(-30) const UpgradeTockFixHeight = -103 -var UpgradeXxHeight = abi.ChainEpoch(200) +var UpgradeGoldenWeekHeight = abi.ChainEpoch(200) var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandQuicknet, @@ -177,7 +177,7 @@ func init() { UpgradeTeepHeight = getUpgradeHeight("LOTUS_TEEP_HEIGHT", UpgradeTeepHeight) UpgradeTockHeight = getUpgradeHeight("LOTUS_TOCK_HEIGHT", UpgradeTockHeight) // UpgradeTockFixHeight = getUpgradeHeight("LOTUS_TOCK_FIX_HEIGHT", UpgradeTockFixHeight) - UpgradeXxHeight = getUpgradeHeight("LOTUS_XX_HEIGHT", UpgradeXxHeight) + UpgradeGoldenWeekHeight = getUpgradeHeight("LOTUS_GOLDENWEEK_HEIGHT", UpgradeGoldenWeekHeight) DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandQuicknet, diff --git a/build/buildconstants/params_butterfly.go b/build/buildconstants/params_butterfly.go index 52b8524554b..92dd64fc12c 100644 --- a/build/buildconstants/params_butterfly.go +++ b/build/buildconstants/params_butterfly.go @@ -84,7 +84,7 @@ const UpgradeTockHeight = -30 const UpgradeTockFixHeight = -103 // ?????? -const UpgradeXxHeight = 999999999999999 +const UpgradeGoldenWeekHeight = 999999999999999 var ConsensusMinerMinPower = abi.NewStoragePower(2 << 30) var PreCommitChallengeDelay = abi.ChainEpoch(150) diff --git a/build/buildconstants/params_calibnet.go b/build/buildconstants/params_calibnet.go index 1b81753f161..e182fa0e677 100644 --- a/build/buildconstants/params_calibnet.go +++ b/build/buildconstants/params_calibnet.go @@ -126,7 +126,7 @@ var UpgradeTockHeight abi.ChainEpoch = UpgradeTeepHeight + builtin.EpochsInDay*7 const UpgradeTockFixHeight abi.ChainEpoch = 2558014 // ?????? -const UpgradeXxHeight = 999999999999999 +const UpgradeGoldenWeekHeight = 999999999999999 var ConsensusMinerMinPower = abi.NewStoragePower(32 << 30) var PreCommitChallengeDelay = abi.ChainEpoch(150) diff --git a/build/buildconstants/params_interop.go b/build/buildconstants/params_interop.go index 2f3179a96dd..58ced6e1bab 100644 --- a/build/buildconstants/params_interop.go +++ b/build/buildconstants/params_interop.go @@ -82,7 +82,7 @@ var UpgradeTockHeight = abi.ChainEpoch(-30) // This fix upgrade only ran on calibrationnet const UpgradeTockFixHeight abi.ChainEpoch = -4 -const UpgradeXxHeight = 50 +const UpgradeGoldenWeekHeight = 50 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandQuicknet, diff --git a/build/buildconstants/params_mainnet.go b/build/buildconstants/params_mainnet.go index f72109cf4ab..bd2937aab4c 100644 --- a/build/buildconstants/params_mainnet.go +++ b/build/buildconstants/params_mainnet.go @@ -139,7 +139,7 @@ var UpgradeTockHeight = UpgradeTeepHeight + builtin.EpochsInDay*90 var UpgradeTockFixHeight = abi.ChainEpoch(-1) // ?????? -var UpgradeXxHeight = abi.ChainEpoch(9999999999) +var UpgradeGoldenWeekHeight = abi.ChainEpoch(9999999999) var UpgradeTeepInitialFilReserved = InitialFilReserved // FIP-0100: no change for mainnet @@ -158,8 +158,8 @@ func init() { } SetAddressNetwork(addrNetwork) - if os.Getenv("LOTUS_DISABLE_XX") == "1" { - UpgradeXxHeight = math.MaxInt64 - 1 + if os.Getenv("LOTUS_DISABLE_GOLDENWEEK") == "1" { + UpgradeGoldenWeekHeight = math.MaxInt64 - 1 } // NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however, diff --git a/build/buildconstants/params_testground.go b/build/buildconstants/params_testground.go index c355e0a866e..67686ee27cf 100644 --- a/build/buildconstants/params_testground.go +++ b/build/buildconstants/params_testground.go @@ -110,7 +110,7 @@ var ( UpgradeTeepInitialFilReserved *big.Int = wholeFIL(300_000_000) UpgradeTockHeight abi.ChainEpoch = -32 UpgradeTockFixHeight abi.ChainEpoch = -33 - UpgradeXxHeight abi.ChainEpoch = -34 + UpgradeGoldenWeekHeight abi.ChainEpoch = -34 DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, diff --git a/build/openrpc/full.json b/build/openrpc/full.json index bbd1719406f..4994641fb95 100644 --- a/build/openrpc/full.json +++ b/build/openrpc/full.json @@ -20700,7 +20700,7 @@ "UpgradeTuktukHeight": 10101, "UpgradeTeepHeight": 10101, "UpgradeTockHeight": 10101, - "UpgradeXxHeight": 10101 + "UpgradeGoldenWeekHeight": 10101 }, "Eip155ChainID": 123, "GenesisTimestamp": 42 @@ -20751,6 +20751,10 @@ "title": "number", "type": "number" }, + "UpgradeGoldenWeekHeight": { + "title": "number", + "type": "number" + }, "UpgradeHyggeHeight": { "title": "number", "type": "number" @@ -20846,10 +20850,6 @@ "UpgradeWatermelonHeight": { "title": "number", "type": "number" - }, - "UpgradeXxHeight": { - "title": "number", - "type": "number" } }, "type": "object" diff --git a/build/openrpc/gateway.json b/build/openrpc/gateway.json index 0c7789d049d..520720ca200 100644 --- a/build/openrpc/gateway.json +++ b/build/openrpc/gateway.json @@ -9510,7 +9510,7 @@ "UpgradeTuktukHeight": 10101, "UpgradeTeepHeight": 10101, "UpgradeTockHeight": 10101, - "UpgradeXxHeight": 10101 + "UpgradeGoldenWeekHeight": 10101 }, "Eip155ChainID": 123, "GenesisTimestamp": 42 @@ -9561,6 +9561,10 @@ "title": "number", "type": "number" }, + "UpgradeGoldenWeekHeight": { + "title": "number", + "type": "number" + }, "UpgradeHyggeHeight": { "title": "number", "type": "number" @@ -9656,10 +9660,6 @@ "UpgradeWatermelonHeight": { "title": "number", "type": "number" - }, - "UpgradeXxHeight": { - "title": "number", - "type": "number" } }, "type": "object" diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go index afd34cccdbc..cc27c876bc9 100644 --- a/chain/consensus/filcns/upgrades.go +++ b/chain/consensus/filcns/upgrades.go @@ -351,7 +351,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule { Network: network.Version26, Migration: UpgradeActorsV16Fix, }, { - Height: buildconstants.UpgradeXxHeight, + Height: buildconstants.UpgradeGoldenWeekHeight, Network: network.Version27, Migration: UpgradeActorsV17, PreMigrations: []stmgr.PreMigration{{ diff --git a/documentation/en/api-methods-v0-deprecated.md b/documentation/en/api-methods-v0-deprecated.md index 5db8374ac8c..e4258e12901 100644 --- a/documentation/en/api-methods-v0-deprecated.md +++ b/documentation/en/api-methods-v0-deprecated.md @@ -4917,7 +4917,7 @@ Response: "UpgradeTuktukHeight": 10101, "UpgradeTeepHeight": 10101, "UpgradeTockHeight": 10101, - "UpgradeXxHeight": 10101 + "UpgradeGoldenWeekHeight": 10101 }, "Eip155ChainID": 123, "GenesisTimestamp": 42 diff --git a/documentation/en/api-methods-v1-stable.md b/documentation/en/api-methods-v1-stable.md index cb123291d33..3945e910b0b 100644 --- a/documentation/en/api-methods-v1-stable.md +++ b/documentation/en/api-methods-v1-stable.md @@ -7473,7 +7473,7 @@ Response: "UpgradeTuktukHeight": 10101, "UpgradeTeepHeight": 10101, "UpgradeTockHeight": 10101, - "UpgradeXxHeight": 10101 + "UpgradeGoldenWeekHeight": 10101 }, "Eip155ChainID": 123, "GenesisTimestamp": 42 diff --git a/node/impl/full/state.go b/node/impl/full/state.go index 2159b023934..ab59d9c7fac 100644 --- a/node/impl/full/state.go +++ b/node/impl/full/state.go @@ -2163,7 +2163,7 @@ func (a *StateAPI) StateGetNetworkParams(ctx context.Context) (*api.NetworkParam UpgradeTuktukHeight: buildconstants.UpgradeTuktukHeight, UpgradeTeepHeight: buildconstants.UpgradeTeepHeight, UpgradeTockHeight: buildconstants.UpgradeTockHeight, - UpgradeXxHeight: buildconstants.UpgradeXxHeight, + UpgradeGoldenWeekHeight: buildconstants.UpgradeGoldenWeekHeight, }, }, nil }