cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #11599 from filecoin-project/phi-butterfly-prep

Browse Source 
chore: Set upgrade heights and change codename
This commit is contained in:
Phi-rjan 2024-02-13 17:13:33 +01:00 committed by GitHub
commit fe75ee0a12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/types.go
View File

@ -349,7 +349,8 @@ type ForkUpgradeParams struct {
UpgradeLightningHeight abi.ChainEpoch
UpgradeThunderHeight abi.ChainEpoch
UpgradeWatermelonHeight abi.ChainEpoch
UpgradePineappleHeight abi.ChainEpoch
UpgradeDragonHeight abi.ChainEpoch
UpgradePhoenixHeight abi.ChainEpoch
}
type NonceMapType map[address.Address]uint64

BIN
build/openrpc/full.json.gz
View File

Binary file not shown.

10
build/params_2k.go
View File

@ -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 UpgradePhoenixHeight = UpgradeDragonHeight + 120
// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -100
@ -78,8 +78,8 @@ const UpgradeWatermelonFixHeight = -100
const UpgradeWatermelonFix2Height = -101
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet,
UpgradeMangoHeight: DrandQuicknet,
0: DrandMainnet,
UpgradePhoenixHeight: DrandQuicknet,
}
var SupportedProofTypes = []abi.RegisteredSealProof{
@ -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

11
build/params_butterfly.go
View File

@ -16,11 +16,11 @@ import (
)
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet,
UpgradeMangoHeight: DrandQuicknet,
0: DrandMainnet,
UpgradePhoenixHeight: DrandQuicknet,
}
const GenesisNetworkVersion = network.Version20
const GenesisNetworkVersion = network.Version21
var NetworkBundle = "butterflynet"
var BundleOverrides map[actorstypes.Version]string
@ -57,10 +57,9 @@ const UpgradeLightningHeight = -22
const UpgradeThunderHeight = -23
const UpgradeWatermelonHeight = -24
// ??????
const UpgradePineappleHeight = 999999999999999
const UpgradeDragonHeight = 5760
const UpgradeMangoHeight = UpgradePineappleHeight + 10
const UpgradePhoenixHeight = UpgradeDragonHeight + 120
// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -100

11
build/params_calibnet.go
View File

@ -19,8 +19,8 @@ import (
)
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet,
UpgradeMangoHeight: DrandQuicknet,
0: DrandMainnet,
UpgradePhoenixHeight: DrandQuicknet,
}
const GenesisNetworkVersion = network.Version0
@ -89,10 +89,11 @@ 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
// This epoch, 120 epochs after the "rest" of the nv22 upgrade, is when we switch to Drand quicknet
const UpgradePhoenixHeight = UpgradeDragonHeight + 120
var SupportedProofTypes = []abi.RegisteredSealProof{
abi.RegisteredSealProof_StackedDrg32GiBV1,

8
build/params_interop.go
View File

@ -55,9 +55,9 @@ 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
const UpgradePhoenixHeight = UpgradeDragonHeight + 100
// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -1
@ -66,8 +66,8 @@ const UpgradeWatermelonFixHeight = -1
const UpgradeWatermelonFix2Height = -2
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet,
UpgradeMangoHeight: DrandQuicknet,
0: DrandMainnet,
UpgradePhoenixHeight: DrandQuicknet,
}
var SupportedProofTypes = []abi.RegisteredSealProof{

18
build/params_mainnet.go
View File

@ -16,9 +16,9 @@ import (
)
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandIncentinet,
UpgradeSmokeHeight: DrandMainnet,
UpgradeMangoHeight: DrandQuicknet,
0: DrandIncentinet,
UpgradeSmokeHeight: DrandMainnet,
UpgradePhoenixHeight: DrandQuicknet,
}
var NetworkBundle = "mainnet"
@ -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
// This epoch, 120 epochs after the "rest" of the nv22 upgrade, is when we switch to Drand quicknet
// ??????
var UpgradeMangoHeight = UpgradePineappleHeight + 10
var UpgradePhoenixHeight = UpgradeDragonHeight + 120
// This fix upgrade only ran on calibrationnet
const UpgradeWatermelonFixHeight = -1
@ -127,9 +127,9 @@ func init() {
SetAddressNetwork(address.Mainnet)
}
if os.Getenv("LOTUS_DISABLE_PINEAPPLE") == "1" {
UpgradePineappleHeight = math.MaxInt64 - 1
UpgradeMangoHeight = math.MaxInt64
if os.Getenv("LOTUS_DISABLE_DRAGON") == "1" {
UpgradeDragonHeight = math.MaxInt64 - 1
UpgradePhoenixHeight = math.MaxInt64
}
// NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however,

8
build/params_testground.go
View File

@ -112,12 +112,12 @@ var (
UpgradeWatermelonHeight abi.ChainEpoch = -23
UpgradeWatermelonFixHeight abi.ChainEpoch = -24
UpgradeWatermelonFix2Height abi.ChainEpoch = -25
UpgradePineappleHeight abi.ChainEpoch = -26
UpgradeMangoHeight abi.ChainEpoch = -27
UpgradeDragonHeight abi.ChainEpoch = -26
UpgradePhoenixHeight abi.ChainEpoch = -27
DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet,
UpgradeMangoHeight: DrandQuicknet,
0: DrandMainnet,
UpgradePhoenixHeight: DrandQuicknet,
}
GenesisNetworkVersion = network.Version0

2
chain/consensus/filcns/upgrades.go
View File

@ -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{{

3
documentation/en/api-v0-methods.md
View File

@ -5514,7 +5514,8 @@ Response:
"UpgradeLightningHeight": 10101,
"UpgradeThunderHeight": 10101,
"UpgradeWatermelonHeight": 10101,
"UpgradePineappleHeight": 10101
"UpgradeDragonHeight": 10101,
"UpgradePhoenixHeight": 10101
},
"Eip155ChainID": 123
}

3
documentation/en/api-v1-unstable-methods.md
View File

@ -7140,7 +7140,8 @@ Response:
"UpgradeLightningHeight": 10101,
"UpgradeThunderHeight": 10101,
"UpgradeWatermelonHeight": 10101,
"UpgradePineappleHeight": 10101
"UpgradeDragonHeight": 10101,
"UpgradePhoenixHeight": 10101
},
"Eip155ChainID": 123
}

2
node/impl/full/state.go
View File

@ -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
}