Skip to content

Commit 55eab8a

Browse files
TippyFlitsUKrvagg
andauthored
feat: add Network Version 27 skeleton (#13125)
* feat: network version 27 skeleton * fix(nv27): skip TockFix actors version sanity check As per comment inline, this is getting in the way of landing a skeleton for nv27 with an identical actors bundle so version resolution for v16 CIDs was showing 17. --------- Co-authored-by: Rod Vagg <[email protected]>
1 parent 3b8d20c commit 55eab8a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+3443
-199
lines changed

api/mocks/mock_full.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ type ForkUpgradeParams struct {
195195
UpgradeTuktukHeight abi.ChainEpoch
196196
UpgradeTeepHeight abi.ChainEpoch
197197
UpgradeTockHeight abi.ChainEpoch
198+
UpgradeXxHeight abi.ChainEpoch
198199
}
199200

200201
// ChainExportConfig holds configuration for chain ranged exports.

api/v0api/v0mocks/mock_full.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/actors/v17.tar.zst

1.47 MB
Binary file not shown.

build/buildconstants/params.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ const UserAgent = "lotus"
4545
/* inline-gen template
4646
const TestNetworkVersion = network.Version{{.latestNetworkVersion}}
4747
/* inline-gen start */
48-
const TestNetworkVersion = network.Version25
48+
const TestNetworkVersion = network.Version27
4949

5050
/* inline-gen end */

build/buildconstants/params_2k.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const GenesisFile = ""
2222
var NetworkBundle = "devnet"
2323
var ActorDebugging = true
2424

25-
var GenesisNetworkVersion = network.Version24
25+
var GenesisNetworkVersion = network.Version26
2626

2727
var UpgradeBreezeHeight = abi.ChainEpoch(-1)
2828

@@ -72,29 +72,31 @@ const UpgradeWatermelonFixHeight = -100
7272
// This fix upgrade only ran on calibrationnet
7373
const UpgradeWatermelonFix2Height = -101
7474

75-
var UpgradeDragonHeight = abi.ChainEpoch(-24)
75+
var UpgradeDragonHeight = abi.ChainEpoch(-25)
7676

7777
// This fix upgrade only ran on calibrationnet
7878
const UpgradeCalibrationDragonFixHeight = -102
7979

80-
var UpgradePhoenixHeight = abi.ChainEpoch(-25)
80+
var UpgradePhoenixHeight = abi.ChainEpoch(-26)
8181

82-
var UpgradeWaffleHeight = abi.ChainEpoch(-26)
82+
var UpgradeWaffleHeight = abi.ChainEpoch(-27)
8383

84-
var UpgradeTuktukHeight = abi.ChainEpoch(-27)
84+
var UpgradeTuktukHeight = abi.ChainEpoch(-28)
8585

8686
// FIP-0081: for the power actor state for pledge calculations.
8787
// UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
8888
// Tuktuk migration. along with a RampStartEpoch matching the upgrade height.
8989
var UpgradeTuktukPowerRampDurationEpochs uint64 = 200
9090

91-
var UpgradeTeepHeight = abi.ChainEpoch(200)
91+
var UpgradeTeepHeight = abi.ChainEpoch(-29)
9292

9393
var UpgradeTeepInitialFilReserved = wholeFIL(1_400_000_000) // FIP-0100: 300M -> 1.4B FIL
9494

95-
var UpgradeTockHeight = abi.ChainEpoch(300)
95+
var UpgradeTockHeight = abi.ChainEpoch(-30)
9696

97-
var UpgradeTockFixHeight = abi.ChainEpoch(-28)
97+
const UpgradeTockFixHeight = -103
98+
99+
var UpgradeXxHeight = abi.ChainEpoch(200)
98100

99101
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
100102
0: DrandQuicknet,
@@ -174,7 +176,8 @@ func init() {
174176
UpgradeTuktukHeight = getUpgradeHeight("LOTUS_TUKTUK_HEIGHT", UpgradeTuktukHeight)
175177
UpgradeTeepHeight = getUpgradeHeight("LOTUS_TEEP_HEIGHT", UpgradeTeepHeight)
176178
UpgradeTockHeight = getUpgradeHeight("LOTUS_TOCK_HEIGHT", UpgradeTockHeight)
177-
UpgradeTockFixHeight = getUpgradeHeight("LOTUS_TOCK_FIX_HEIGHT", UpgradeTockFixHeight)
179+
// UpgradeTockFixHeight = getUpgradeHeight("LOTUS_TOCK_FIX_HEIGHT", UpgradeTockFixHeight)
180+
UpgradeXxHeight = getUpgradeHeight("LOTUS_XX_HEIGHT", UpgradeXxHeight)
178181

179182
DrandSchedule = map[abi.ChainEpoch]DrandEnum{
180183
0: DrandQuicknet,

build/buildconstants/params_butterfly.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,17 @@ const UpgradeTuktukHeight = -28
7474
// Tuktuk migration. along with a RampStartEpoch matching the upgrade height.
7575
var UpgradeTuktukPowerRampDurationEpochs = uint64(builtin.EpochsInYear)
7676

77-
// ??????
78-
const UpgradeTeepHeight = 4320
77+
const UpgradeTeepHeight = -29
7978

8079
var UpgradeTeepInitialFilReserved = wholeFIL(1_600_000_000) // FIP-0100: 300M -> 1.6B FIL
8180

81+
const UpgradeTockHeight = -30
82+
83+
// This fix upgrade only ran on calibrationnet
84+
const UpgradeTockFixHeight = -103
85+
8286
// ??????
83-
const UpgradeTockHeight = UpgradeTeepHeight + builtin.EpochsInDay*2
84-
const UpgradeTockFixHeight = -29
87+
const UpgradeXxHeight = 999999999999999
8588

8689
var ConsensusMinerMinPower = abi.NewStoragePower(2 << 30)
8790
var PreCommitChallengeDelay = abi.ChainEpoch(150)

build/buildconstants/params_calibnet.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ var UpgradeTockHeight abi.ChainEpoch = UpgradeTeepHeight + builtin.EpochsInDay*7
125125
// 2025-04-07T23:00:00Z
126126
const UpgradeTockFixHeight abi.ChainEpoch = 2558014
127127

128+
// ??????
129+
const UpgradeXxHeight = 999999999999999
130+
128131
var ConsensusMinerMinPower = abi.NewStoragePower(32 << 30)
129132
var PreCommitChallengeDelay = abi.ChainEpoch(150)
130133

build/buildconstants/params_interop.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,16 @@ var UpgradeTuktukHeight = abi.ChainEpoch(-28)
7373
// Tuktuk migration. along with a RampStartEpoch matching the upgrade height.
7474
var UpgradeTuktukPowerRampDurationEpochs = uint64(builtin.EpochsInYear)
7575

76-
const UpgradeTeepHeight abi.ChainEpoch = 50
76+
var UpgradeTeepHeight = abi.ChainEpoch(-29)
7777

7878
var UpgradeTeepInitialFilReserved = InitialFilReserved // FIP-0100: no change for interop
7979

80-
const UpgradeTockHeight abi.ChainEpoch = 100
80+
var UpgradeTockHeight = abi.ChainEpoch(-30)
8181

82-
const UpgradeTockFixHeight abi.ChainEpoch = -29
82+
// This fix upgrade only ran on calibrationnet
83+
const UpgradeTockFixHeight abi.ChainEpoch = -4
84+
85+
const UpgradeXxHeight = 50
8386

8487
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
8588
0: DrandQuicknet,

build/buildconstants/params_mainnet.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ var UpgradeTockHeight = UpgradeTeepHeight + builtin.EpochsInDay*90
138138
// Only applied to calibnet which was already upgraded to Teep&Tock
139139
var UpgradeTockFixHeight = abi.ChainEpoch(-1)
140140

141+
// ??????
142+
var UpgradeXxHeight = abi.ChainEpoch(9999999999)
143+
141144
var UpgradeTeepInitialFilReserved = InitialFilReserved // FIP-0100: no change for mainnet
142145

143146
var ConsensusMinerMinPower = abi.NewStoragePower(10 << 40)
@@ -155,8 +158,8 @@ func init() {
155158
}
156159
SetAddressNetwork(addrNetwork)
157160

158-
if os.Getenv("LOTUS_DISABLE_TEEP") == "1" {
159-
UpgradeTeepHeight = math.MaxInt64 - 1
161+
if os.Getenv("LOTUS_DISABLE_XX") == "1" {
162+
UpgradeXxHeight = math.MaxInt64 - 1
160163
}
161164

162165
// NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however,

0 commit comments

Comments
 (0)