Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Set upgrade heights and change codename #11599

Merged
merged 6 commits into from
Feb 13, 2024
Merged

chore: Set upgrade heights and change codename #11599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3426289
chore: Upgrade heights and codename
rjan90 Jan 25, 2024
9112e85
Update epoch after nv22 DRAND switch
rjan90 Feb 12, 2024
cea5ae6
Update Mango codename to Phoneix
rjan90 Feb 13, 2024
e9245c1
Add UpgradePhoenixHeight to API params
arajasek Feb 13, 2024
4f23b06
set UpgradePhoenixHeight to be one hour after Dragon
arajasek Feb 13, 2024
65b1977
Make gen
rjan90 Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified build/openrpc/full.json.gz
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions build/params_2k.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per discussion, we'll probably wind up going with something like + 100 instead. But that doesn't have to change in this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to +100 in 9112e85.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also want the Drand switch to be +100 epochs away from the nv22 upgrade in the butterfly/calibration/mainnet ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also want the Drand switch to be +100 epochs away from the nv22 upgrade in the butterfly/calibration/mainnet ?

We really only care about mainnet.

@arajasek can we make this 120 so it falls on an hour mark?


// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -100
Expand Down Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions build/params_butterfly.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -57,8 +57,7 @@ const UpgradeLightningHeight = -22
const UpgradeThunderHeight = -23
const UpgradeWatermelonHeight = -24

// ??????
const UpgradePineappleHeight = 999999999999999
const UpgradeDragonHeight = 5760

const UpgradeMangoHeight = UpgradePineappleHeight + 10

Expand Down
4 changes: 2 additions & 2 deletions build/params_calibnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ const UpgradeWatermelonFixHeight = 1070494
// 2023-11-21T13:00:00Z
const UpgradeWatermelonFix2Height = 1108174

// ??????
const UpgradePineappleHeight = 999999999999999
// 2024-02-27T14:00:00Z
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified.

const UpgradeDragonHeight = 1390534

const UpgradeMangoHeight = UpgradePineappleHeight + 10

Expand Down
2 changes: 1 addition & 1 deletion build/params_interop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions build/params_mainnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion build/params_testground.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion chain/consensus/filcns/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{{
Expand Down
2 changes: 1 addition & 1 deletion documentation/en/api-v0-methods.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5514,7 +5514,7 @@ Response:
"UpgradeLightningHeight": 10101,
"UpgradeThunderHeight": 10101,
"UpgradeWatermelonHeight": 10101,
"UpgradePineappleHeight": 10101
"UpgradeDragonHeight": 10101
},
"Eip155ChainID": 123
}
Expand Down
2 changes: 1 addition & 1 deletion documentation/en/api-v1-unstable-methods.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7140,7 +7140,7 @@ Response:
"UpgradeLightningHeight": 10101,
"UpgradeThunderHeight": 10101,
"UpgradeWatermelonHeight": 10101,
"UpgradePineappleHeight": 10101
"UpgradeDragonHeight": 10101
},
"Eip155ChainID": 123
}
Expand Down
2 changes: 1 addition & 1 deletion node/impl/full/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}