v1.26.3 #5

Merged
jonathanface merged 201 commits from v1.26.3 into master 2024-05-02 18:22:09 +00:00
12 changed files with 18 additions and 19 deletions
Showing only changes of commit 342628955c - Show all commits

View File

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

Binary file not shown.

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

View File

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

View File

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

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
}