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: upgrade: Update codename for NV23 #12104

Merged
merged 1 commit into from
Jun 18, 2024
Merged

chore: upgrade: Update codename for NV23 #12104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -191,7 +191,7 @@ type ForkUpgradeParams struct {
UpgradeWatermelonHeight abi.ChainEpoch
UpgradeDragonHeight abi.ChainEpoch
UpgradePhoenixHeight abi.ChainEpoch
UpgradeAussieHeight abi.ChainEpoch
UpgradeWaffleHeight abi.ChainEpoch
}

// ChainExportConfig holds configuration for chain ranged exports.
Expand Down
10 changes: 5 additions & 5 deletions build/openrpc/full.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17971,7 +17971,7 @@
"UpgradeWatermelonHeight": 10101,
"UpgradeDragonHeight": 10101,
"UpgradePhoenixHeight": 10101,
"UpgradeAussieHeight": 10101
"UpgradeWaffleHeight": 10101
},
"Eip155ChainID": 123
}
Expand Down Expand Up @@ -18001,10 +18001,6 @@
"title": "number",
"type": "number"
},
"UpgradeAussieHeight": {
"title": "number",
"type": "number"
},
"UpgradeBreezeHeight": {
"title": "number",
"type": "number"
Expand Down Expand Up @@ -18101,6 +18097,10 @@
"title": "number",
"type": "number"
},
"UpgradeWaffleHeight": {
"title": "number",
"type": "number"
},
"UpgradeWatermelonHeight": {
"title": "number",
"type": "number"
Expand Down
4 changes: 2 additions & 2 deletions build/params_2k.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ var UpgradeDragonHeight = abi.ChainEpoch(-24)

var UpgradePhoenixHeight = abi.ChainEpoch(-25)

var UpgradeAussieHeight = abi.ChainEpoch(200)
var UpgradeWaffleHeight = abi.ChainEpoch(200)

// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -100
Expand Down Expand Up @@ -156,7 +156,7 @@ func init() {
UpgradeThunderHeight = getUpgradeHeight("LOTUS_THUNDER_HEIGHT", UpgradeThunderHeight)
UpgradeWatermelonHeight = getUpgradeHeight("LOTUS_WATERMELON_HEIGHT", UpgradeWatermelonHeight)
UpgradeDragonHeight = getUpgradeHeight("LOTUS_DRAGON_HEIGHT", UpgradeDragonHeight)
UpgradeAussieHeight = getUpgradeHeight("LOTUS_AUSSIE_HEIGHT", UpgradeAussieHeight)
UpgradeWaffleHeight = getUpgradeHeight("LOTUS_WAFFLE_HEIGHT", UpgradeWaffleHeight)

UpgradePhoenixHeight = getUpgradeHeight("LOTUS_PHOENIX_HEIGHT", UpgradePhoenixHeight)
DrandSchedule = map[abi.ChainEpoch]DrandEnum{
Expand Down
2 changes: 1 addition & 1 deletion build/params_butterfly.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const UpgradeWatermelonHeight = -24
const UpgradeDragonHeight = -25
const UpgradePhoenixHeight = -26

const UpgradeAussieHeight = 400
const UpgradeWaffleHeight = 400

// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -100
Expand Down
2 changes: 1 addition & 1 deletion build/params_calibnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const UpgradePhoenixHeight = UpgradeDragonHeight + 120
const UpgradeCalibrationDragonFixHeight = 1493854

// ?????
const UpgradeAussieHeight = 999999999999999
const UpgradeWaffleHeight = 999999999999999

var SupportedProofTypes = []abi.RegisteredSealProof{
abi.RegisteredSealProof_StackedDrg32GiBV1,
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 @@ -56,7 +56,7 @@ var UpgradeThunderHeight = abi.ChainEpoch(-23)
var UpgradeWatermelonHeight = abi.ChainEpoch(-24)
var UpgradeDragonHeight = abi.ChainEpoch(-25)

const UpgradeAussieHeight = 50
const UpgradeWaffleHeight = 50

const UpgradePhoenixHeight = UpgradeDragonHeight + 100

Expand Down
6 changes: 3 additions & 3 deletions build/params_mainnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const UpgradeDragonHeight = 3855360
const UpgradePhoenixHeight = UpgradeDragonHeight + 120

// ??????
var UpgradeAussieHeight = abi.ChainEpoch(9999999999)
var UpgradeWaffleHeight = abi.ChainEpoch(9999999999)

// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -1
Expand All @@ -133,8 +133,8 @@ func init() {
SetAddressNetwork(address.Mainnet)
}

if os.Getenv("LOTUS_DISABLE_AUSSIE") == "1" {
UpgradeAussieHeight = math.MaxInt64 - 1
if os.Getenv("LOTUS_DISABLE_WAFFLE") == "1" {
UpgradeWaffleHeight = math.MaxInt64 - 1
}

// NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however,
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 @@ -115,7 +115,7 @@ var (
UpgradeDragonHeight abi.ChainEpoch = -26
UpgradePhoenixHeight abi.ChainEpoch = -27
UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -28
UpgradeAussieHeight abi.ChainEpoch = -29
UpgradeWaffleHeight abi.ChainEpoch = -29

DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet,
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 @@ -304,7 +304,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule {
Network: network.Version22,
Migration: upgradeActorsV13VerifregFix(calibnetv13BuggyVerifregCID1, calibnetv13CorrectManifestCID1),
}, {
Height: build.UpgradeAussieHeight,
Height: build.UpgradeWaffleHeight,
Network: network.Version23,
Migration: UpgradeActorsV14,
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 @@ -4483,7 +4483,7 @@ Response:
"UpgradeWatermelonHeight": 10101,
"UpgradeDragonHeight": 10101,
"UpgradePhoenixHeight": 10101,
"UpgradeAussieHeight": 10101
"UpgradeWaffleHeight": 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 @@ -6185,7 +6185,7 @@ Response:
"UpgradeWatermelonHeight": 10101,
"UpgradeDragonHeight": 10101,
"UpgradePhoenixHeight": 10101,
"UpgradeAussieHeight": 10101
"UpgradeWaffleHeight": 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 @@ -1962,7 +1962,7 @@ func (a *StateAPI) StateGetNetworkParams(ctx context.Context) (*api.NetworkParam
UpgradeWatermelonHeight: build.UpgradeWatermelonHeight,
UpgradeDragonHeight: build.UpgradeDragonHeight,
UpgradePhoenixHeight: build.UpgradePhoenixHeight,
UpgradeAussieHeight: build.UpgradeAussieHeight,
UpgradeWaffleHeight: build.UpgradeWaffleHeight,
},
}, nil
}