diff --git a/api/types.go b/api/types.go index baf52aa82..35c086472 100644 --- a/api/types.go +++ b/api/types.go @@ -349,7 +349,7 @@ type ForkUpgradeParams struct { UpgradeLightningHeight abi.ChainEpoch UpgradeThunderHeight abi.ChainEpoch UpgradeWatermelonHeight abi.ChainEpoch - UpgradePineappleHeight abi.ChainEpoch + UpgradeDragonHeight abi.ChainEpoch } type NonceMapType map[address.Address]uint64 diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz index 0779bc451..477dcf051 100644 Binary files a/build/openrpc/full.json.gz and b/build/openrpc/full.json.gz differ diff --git a/build/params_2k.go b/build/params_2k.go index 271596466..2ab97a0d4 100644 --- a/build/params_2k.go +++ b/build/params_2k.go @@ -67,9 +67,9 @@ var UpgradeThunderHeight = abi.ChainEpoch(-23) var UpgradeWatermelonHeight = abi.ChainEpoch(-24) -var UpgradePineappleHeight = abi.ChainEpoch(20) +var UpgradeDragonHeight = abi.ChainEpoch(20) -var UpgradeMangoHeight = UpgradePineappleHeight + 10 +var UpgradeMangoHeight = UpgradeDragonHeight + 10 // This fix upgrade only ran on calibrationnet const UpgradeWatermelonFixHeight = -100 @@ -134,7 +134,7 @@ func init() { UpgradeLightningHeight = getUpgradeHeight("LOTUS_LIGHTNING_HEIGHT", UpgradeLightningHeight) UpgradeThunderHeight = getUpgradeHeight("LOTUS_THUNDER_HEIGHT", UpgradeThunderHeight) UpgradeWatermelonHeight = getUpgradeHeight("LOTUS_WATERMELON_HEIGHT", UpgradeWatermelonHeight) - UpgradePineappleHeight = getUpgradeHeight("LOTUS_PINEAPPLE_HEIGHT", UpgradePineappleHeight) + UpgradeDragonHeight = getUpgradeHeight("LOTUS_DRAGON_HEIGHT", UpgradeDragonHeight) BuildType |= Build2k diff --git a/build/params_butterfly.go b/build/params_butterfly.go index 7580ef625..062d2f215 100644 --- a/build/params_butterfly.go +++ b/build/params_butterfly.go @@ -20,7 +20,7 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ UpgradeMangoHeight: DrandQuicknet, } -const GenesisNetworkVersion = network.Version20 +const GenesisNetworkVersion = network.Version21 var NetworkBundle = "butterflynet" var BundleOverrides map[actorstypes.Version]string @@ -57,8 +57,7 @@ const UpgradeLightningHeight = -22 const UpgradeThunderHeight = -23 const UpgradeWatermelonHeight = -24 -// ?????? -const UpgradePineappleHeight = 999999999999999 +const UpgradeDragonHeight = 5760 const UpgradeMangoHeight = UpgradePineappleHeight + 10 diff --git a/build/params_calibnet.go b/build/params_calibnet.go index 3abec3c36..5b77ac647 100644 --- a/build/params_calibnet.go +++ b/build/params_calibnet.go @@ -89,8 +89,8 @@ const UpgradeWatermelonFixHeight = 1070494 // 2023-11-21T13:00:00Z const UpgradeWatermelonFix2Height = 1108174 -// ?????? -const UpgradePineappleHeight = 999999999999999 +// 2024-02-27T14:00:00Z +const UpgradeDragonHeight = 1390534 const UpgradeMangoHeight = UpgradePineappleHeight + 10 diff --git a/build/params_interop.go b/build/params_interop.go index fb364966a..00a178807 100644 --- a/build/params_interop.go +++ b/build/params_interop.go @@ -55,7 +55,7 @@ var UpgradeLightningHeight = abi.ChainEpoch(-22) var UpgradeThunderHeight = abi.ChainEpoch(-23) var UpgradeWatermelonHeight = abi.ChainEpoch(-24) -const UpgradePineappleHeight = 50 +const UpgradeDragonHeight = 50 const UpgradeMangoHeight = UpgradePineappleHeight + 10 diff --git a/build/params_mainnet.go b/build/params_mainnet.go index f44b63dac..7c32433e6 100644 --- a/build/params_mainnet.go +++ b/build/params_mainnet.go @@ -100,11 +100,11 @@ const UpgradeThunderHeight = UpgradeLightningHeight + 2880*21 const UpgradeWatermelonHeight = 3469380 // ?????? -var UpgradePineappleHeight = abi.ChainEpoch(999999999999999) +var UpgradeDragonHeight = abi.ChainEpoch(999999999999999) // This epoch, 10 epochs after the "rest" of the nv22 upgrade, is when we switch to Drand quicknet // ?????? -var UpgradeMangoHeight = UpgradePineappleHeight + 10 +var UpgradeMangoHeight = UpgradeDragonHeight + 10 // This fix upgrade only ran on calibrationnet const UpgradeWatermelonFixHeight = -1 @@ -127,8 +127,8 @@ func init() { SetAddressNetwork(address.Mainnet) } - if os.Getenv("LOTUS_DISABLE_PINEAPPLE") == "1" { - UpgradePineappleHeight = math.MaxInt64 - 1 + if os.Getenv("LOTUS_DISABLE_DRAGON") == "1" { + UpgradeDragonHeight = math.MaxInt64 - 1 UpgradeMangoHeight = math.MaxInt64 } diff --git a/build/params_testground.go b/build/params_testground.go index 62d9101be..c19fff6ea 100644 --- a/build/params_testground.go +++ b/build/params_testground.go @@ -112,7 +112,7 @@ var ( UpgradeWatermelonHeight abi.ChainEpoch = -23 UpgradeWatermelonFixHeight abi.ChainEpoch = -24 UpgradeWatermelonFix2Height abi.ChainEpoch = -25 - UpgradePineappleHeight abi.ChainEpoch = -26 + UpgradeDragonHeight abi.ChainEpoch = -26 UpgradeMangoHeight abi.ChainEpoch = -27 DrandSchedule = map[abi.ChainEpoch]DrandEnum{ diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go index d0030efff..e59c092f8 100644 --- a/chain/consensus/filcns/upgrades.go +++ b/chain/consensus/filcns/upgrades.go @@ -286,7 +286,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule { Network: network.Version21, Migration: buildUpgradeActorsV12MinerFix(calibnetv12BuggyMinerCID2, calibnetv12CorrectManifestCID1), }, { - Height: build.UpgradePineappleHeight, + Height: build.UpgradeDragonHeight, Network: network.Version22, Migration: UpgradeActorsV13, PreMigrations: []stmgr.PreMigration{{ diff --git a/documentation/en/api-v0-methods.md b/documentation/en/api-v0-methods.md index f9c7d5a1b..0d45908dc 100644 --- a/documentation/en/api-v0-methods.md +++ b/documentation/en/api-v0-methods.md @@ -5514,7 +5514,7 @@ Response: "UpgradeLightningHeight": 10101, "UpgradeThunderHeight": 10101, "UpgradeWatermelonHeight": 10101, - "UpgradePineappleHeight": 10101 + "UpgradeDragonHeight": 10101 }, "Eip155ChainID": 123 } diff --git a/documentation/en/api-v1-unstable-methods.md b/documentation/en/api-v1-unstable-methods.md index e728b111f..e772d904a 100644 --- a/documentation/en/api-v1-unstable-methods.md +++ b/documentation/en/api-v1-unstable-methods.md @@ -7140,7 +7140,7 @@ Response: "UpgradeLightningHeight": 10101, "UpgradeThunderHeight": 10101, "UpgradeWatermelonHeight": 10101, - "UpgradePineappleHeight": 10101 + "UpgradeDragonHeight": 10101 }, "Eip155ChainID": 123 } diff --git a/node/impl/full/state.go b/node/impl/full/state.go index 59946c5ec..06e4a47c3 100644 --- a/node/impl/full/state.go +++ b/node/impl/full/state.go @@ -1923,7 +1923,7 @@ func (a *StateAPI) StateGetNetworkParams(ctx context.Context) (*api.NetworkParam UpgradeLightningHeight: build.UpgradeLightningHeight, UpgradeThunderHeight: build.UpgradeThunderHeight, UpgradeWatermelonHeight: build.UpgradeWatermelonHeight, - UpgradePineappleHeight: build.UpgradePineappleHeight, + UpgradeDragonHeight: build.UpgradeDragonHeight, }, }, nil }