Update codename for NV23 (#12104)

Update codename for NV23
This commit is contained in:
Phi-rjan 2024-06-18 07:39:00 +02:00 committed by GitHub
parent 893ce8e98d
commit 82110d1c52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 19 additions and 19 deletions

View File

@ -191,7 +191,7 @@ type ForkUpgradeParams struct {
UpgradeWatermelonHeight abi.ChainEpoch UpgradeWatermelonHeight abi.ChainEpoch
UpgradeDragonHeight abi.ChainEpoch UpgradeDragonHeight abi.ChainEpoch
UpgradePhoenixHeight abi.ChainEpoch UpgradePhoenixHeight abi.ChainEpoch
UpgradeAussieHeight abi.ChainEpoch UpgradeWaffleHeight abi.ChainEpoch
} }
// ChainExportConfig holds configuration for chain ranged exports. // ChainExportConfig holds configuration for chain ranged exports.

View File

@ -17971,7 +17971,7 @@
"UpgradeWatermelonHeight": 10101, "UpgradeWatermelonHeight": 10101,
"UpgradeDragonHeight": 10101, "UpgradeDragonHeight": 10101,
"UpgradePhoenixHeight": 10101, "UpgradePhoenixHeight": 10101,
"UpgradeAussieHeight": 10101 "UpgradeWaffleHeight": 10101
}, },
"Eip155ChainID": 123 "Eip155ChainID": 123
} }
@ -18001,10 +18001,6 @@
"title": "number", "title": "number",
"type": "number" "type": "number"
}, },
"UpgradeAussieHeight": {
"title": "number",
"type": "number"
},
"UpgradeBreezeHeight": { "UpgradeBreezeHeight": {
"title": "number", "title": "number",
"type": "number" "type": "number"
@ -18101,6 +18097,10 @@
"title": "number", "title": "number",
"type": "number" "type": "number"
}, },
"UpgradeWaffleHeight": {
"title": "number",
"type": "number"
},
"UpgradeWatermelonHeight": { "UpgradeWatermelonHeight": {
"title": "number", "title": "number",
"type": "number" "type": "number"

View File

@ -71,7 +71,7 @@ var UpgradeDragonHeight = abi.ChainEpoch(-24)
var UpgradePhoenixHeight = abi.ChainEpoch(-25) var UpgradePhoenixHeight = abi.ChainEpoch(-25)
var UpgradeAussieHeight = abi.ChainEpoch(200) var UpgradeWaffleHeight = abi.ChainEpoch(200)
// This fix upgrade only ran on calibrationnet // This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -100 const UpgradeWatermelonFixHeight = -100
@ -156,7 +156,7 @@ func init() {
UpgradeThunderHeight = getUpgradeHeight("LOTUS_THUNDER_HEIGHT", UpgradeThunderHeight) UpgradeThunderHeight = getUpgradeHeight("LOTUS_THUNDER_HEIGHT", UpgradeThunderHeight)
UpgradeWatermelonHeight = getUpgradeHeight("LOTUS_WATERMELON_HEIGHT", UpgradeWatermelonHeight) UpgradeWatermelonHeight = getUpgradeHeight("LOTUS_WATERMELON_HEIGHT", UpgradeWatermelonHeight)
UpgradeDragonHeight = getUpgradeHeight("LOTUS_DRAGON_HEIGHT", UpgradeDragonHeight) UpgradeDragonHeight = getUpgradeHeight("LOTUS_DRAGON_HEIGHT", UpgradeDragonHeight)
UpgradeAussieHeight = getUpgradeHeight("LOTUS_AUSSIE_HEIGHT", UpgradeAussieHeight) UpgradeWaffleHeight = getUpgradeHeight("LOTUS_WAFFLE_HEIGHT", UpgradeWaffleHeight)
UpgradePhoenixHeight = getUpgradeHeight("LOTUS_PHOENIX_HEIGHT", UpgradePhoenixHeight) UpgradePhoenixHeight = getUpgradeHeight("LOTUS_PHOENIX_HEIGHT", UpgradePhoenixHeight)
DrandSchedule = map[abi.ChainEpoch]DrandEnum{ DrandSchedule = map[abi.ChainEpoch]DrandEnum{

View File

@ -59,7 +59,7 @@ const UpgradeWatermelonHeight = -24
const UpgradeDragonHeight = -25 const UpgradeDragonHeight = -25
const UpgradePhoenixHeight = -26 const UpgradePhoenixHeight = -26
const UpgradeAussieHeight = 400 const UpgradeWaffleHeight = 400
// This fix upgrade only ran on calibrationnet // This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -100 const UpgradeWatermelonFixHeight = -100

View File

@ -99,7 +99,7 @@ const UpgradePhoenixHeight = UpgradeDragonHeight + 120
const UpgradeCalibrationDragonFixHeight = 1493854 const UpgradeCalibrationDragonFixHeight = 1493854
// ????? // ?????
const UpgradeAussieHeight = 999999999999999 const UpgradeWaffleHeight = 999999999999999
var SupportedProofTypes = []abi.RegisteredSealProof{ var SupportedProofTypes = []abi.RegisteredSealProof{
abi.RegisteredSealProof_StackedDrg32GiBV1, abi.RegisteredSealProof_StackedDrg32GiBV1,

View File

@ -56,7 +56,7 @@ var UpgradeThunderHeight = abi.ChainEpoch(-23)
var UpgradeWatermelonHeight = abi.ChainEpoch(-24) var UpgradeWatermelonHeight = abi.ChainEpoch(-24)
var UpgradeDragonHeight = abi.ChainEpoch(-25) var UpgradeDragonHeight = abi.ChainEpoch(-25)
const UpgradeAussieHeight = 50 const UpgradeWaffleHeight = 50
const UpgradePhoenixHeight = UpgradeDragonHeight + 100 const UpgradePhoenixHeight = UpgradeDragonHeight + 100

View File

@ -107,7 +107,7 @@ const UpgradeDragonHeight = 3855360
const UpgradePhoenixHeight = UpgradeDragonHeight + 120 const UpgradePhoenixHeight = UpgradeDragonHeight + 120
// ?????? // ??????
var UpgradeAussieHeight = abi.ChainEpoch(9999999999) var UpgradeWaffleHeight = abi.ChainEpoch(9999999999)
// This fix upgrade only ran on calibrationnet // This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -1 const UpgradeWatermelonFixHeight = -1
@ -133,8 +133,8 @@ func init() {
SetAddressNetwork(address.Mainnet) SetAddressNetwork(address.Mainnet)
} }
if os.Getenv("LOTUS_DISABLE_AUSSIE") == "1" { if os.Getenv("LOTUS_DISABLE_WAFFLE") == "1" {
UpgradeAussieHeight = math.MaxInt64 - 1 UpgradeWaffleHeight = math.MaxInt64 - 1
} }
// NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however, // NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however,

View File

@ -115,7 +115,7 @@ var (
UpgradeDragonHeight abi.ChainEpoch = -26 UpgradeDragonHeight abi.ChainEpoch = -26
UpgradePhoenixHeight abi.ChainEpoch = -27 UpgradePhoenixHeight abi.ChainEpoch = -27
UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -28 UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -28
UpgradeAussieHeight abi.ChainEpoch = -29 UpgradeWaffleHeight abi.ChainEpoch = -29
DrandSchedule = map[abi.ChainEpoch]DrandEnum{ DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet, 0: DrandMainnet,

View File

@ -304,7 +304,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule {
Network: network.Version22, Network: network.Version22,
Migration: upgradeActorsV13VerifregFix(calibnetv13BuggyVerifregCID1, calibnetv13CorrectManifestCID1), Migration: upgradeActorsV13VerifregFix(calibnetv13BuggyVerifregCID1, calibnetv13CorrectManifestCID1),
}, { }, {
Height: build.UpgradeAussieHeight, Height: build.UpgradeWaffleHeight,
Network: network.Version23, Network: network.Version23,
Migration: UpgradeActorsV14, Migration: UpgradeActorsV14,
PreMigrations: []stmgr.PreMigration{{ PreMigrations: []stmgr.PreMigration{{

View File

@ -4483,7 +4483,7 @@ Response:
"UpgradeWatermelonHeight": 10101, "UpgradeWatermelonHeight": 10101,
"UpgradeDragonHeight": 10101, "UpgradeDragonHeight": 10101,
"UpgradePhoenixHeight": 10101, "UpgradePhoenixHeight": 10101,
"UpgradeAussieHeight": 10101 "UpgradeWaffleHeight": 10101
}, },
"Eip155ChainID": 123 "Eip155ChainID": 123
} }

View File

@ -6185,7 +6185,7 @@ Response:
"UpgradeWatermelonHeight": 10101, "UpgradeWatermelonHeight": 10101,
"UpgradeDragonHeight": 10101, "UpgradeDragonHeight": 10101,
"UpgradePhoenixHeight": 10101, "UpgradePhoenixHeight": 10101,
"UpgradeAussieHeight": 10101 "UpgradeWaffleHeight": 10101
}, },
"Eip155ChainID": 123 "Eip155ChainID": 123
} }

View File

@ -1962,7 +1962,7 @@ func (a *StateAPI) StateGetNetworkParams(ctx context.Context) (*api.NetworkParam
UpgradeWatermelonHeight: build.UpgradeWatermelonHeight, UpgradeWatermelonHeight: build.UpgradeWatermelonHeight,
UpgradeDragonHeight: build.UpgradeDragonHeight, UpgradeDragonHeight: build.UpgradeDragonHeight,
UpgradePhoenixHeight: build.UpgradePhoenixHeight, UpgradePhoenixHeight: build.UpgradePhoenixHeight,
UpgradeAussieHeight: build.UpgradeAussieHeight, UpgradeWaffleHeight: build.UpgradeWaffleHeight,
}, },
}, nil }, nil
} }