Skip to content

Commit b0de2bd

Browse files
kamuik16kamuik16
authored
feat: nv25 network skeleton (#12707)
* chore: update dependencies and stuff * update stuff part 2 * chore: make gen * chore: update UpgradeTuktukHeight to var * chore: make actors-gen
1 parent 0d1d7c2 commit b0de2bd

Some content is hidden

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

66 files changed

+3214
-117
lines changed

‎api/types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ type ForkUpgradeParams struct {
193193
UpgradePhoenixHeight abi.ChainEpoch
194194
UpgradeWaffleHeight abi.ChainEpoch
195195
UpgradeTuktukHeight abi.ChainEpoch
196+
UpgradeXxHeight abi.ChainEpoch
196197
}
197198

198199
// ChainExportConfig holds configuration for chain ranged exports.

‎build/actors/v16.tar.zst‎

1.29 MB
Binary file not shown.

‎build/buildconstants/params.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ var Devnet = true
4242
/* inline-gen template
4343
const TestNetworkVersion = network.Version{{.latestNetworkVersion}}
4444
/* inline-gen start */
45-
const TestNetworkVersion = network.Version24
45+
const TestNetworkVersion = network.Version25
4646

4747
/* inline-gen end */

‎build/buildconstants/params_2k.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const GenesisFile = ""
2121
var NetworkBundle = "devnet"
2222
var ActorDebugging = true
2323

24-
var GenesisNetworkVersion = network.Version23
24+
var GenesisNetworkVersion = network.Version24
2525

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

@@ -71,7 +71,9 @@ var UpgradePhoenixHeight = abi.ChainEpoch(-25)
7171

7272
var UpgradeWaffleHeight = abi.ChainEpoch(-26)
7373

74-
var UpgradeTuktukHeight = abi.ChainEpoch(200)
74+
var UpgradeTuktukHeight = abi.ChainEpoch(-27)
75+
76+
var UpgradeXxHeight = abi.ChainEpoch(200)
7577

7678
// FIP-0081: for the power actor state for pledge calculations.
7779
// UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
@@ -167,6 +169,7 @@ func init() {
167169
UpgradeWaffleHeight = getUpgradeHeight("LOTUS_WAFFLE_HEIGHT", UpgradeWaffleHeight)
168170
UpgradePhoenixHeight = getUpgradeHeight("LOTUS_PHOENIX_HEIGHT", UpgradePhoenixHeight)
169171
UpgradeTuktukHeight = getUpgradeHeight("LOTUS_TUKTUK_HEIGHT", UpgradeTuktukHeight)
172+
UpgradeXxHeight = getUpgradeHeight("LOTUS_XX_HEIGHT", UpgradeXxHeight)
170173

171174
DrandSchedule = map[abi.ChainEpoch]DrandEnum{
172175
0: DrandQuicknet,

‎build/buildconstants/params_butterfly.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ const UpgradeWatermelonHeight = -24
5656
const UpgradeDragonHeight = -25
5757
const UpgradePhoenixHeight = -26
5858
const UpgradeWaffleHeight = -27
59+
const UpgradeTuktukHeight = -28
5960

6061
// ??????
61-
const UpgradeTuktukHeight = 999999999999999
62+
const UpgradeXxHeight = 999999999999999
6263

6364
// FIP-0081: for the power actor state for pledge calculations.
6465
// UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after

‎build/buildconstants/params_calibnet.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ const UpgradeWaffleHeight = 1779094
102102
// 2024-10-23T13:30:00Z
103103
const UpgradeTuktukHeight = 2078794
104104

105+
// ??????
106+
const UpgradeXxHeight = 999999999999999
107+
105108
// FIP-0081: for the power actor state for pledge calculations.
106109
// UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
107110
// Tuktuk migration. along with a RampStartEpoch matching the upgrade height.

‎build/buildconstants/params_interop.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ var UpgradeWatermelonHeight = abi.ChainEpoch(-24)
5555
var UpgradeDragonHeight = abi.ChainEpoch(-25)
5656
var UpgradePhoenixHeight = abi.ChainEpoch(-26)
5757
var UpgradeWaffleHeight = abi.ChainEpoch(-27)
58+
var UpgradeTuktukHeight = abi.ChainEpoch(-28)
5859

59-
const UpgradeTuktukHeight = 50
60+
const UpgradeXxHeight = 50
6061

6162
// FIP-0081: for the power actor state for pledge calculations.
6263
// UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after

‎build/buildconstants/params_mainnet.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ const UpgradePhoenixHeight abi.ChainEpoch = UpgradeDragonHeight + 120
110110
const UpgradeWaffleHeight abi.ChainEpoch = 4154640
111111

112112
// 2024-11-20T23:00:00Z
113-
var UpgradeTuktukHeight = abi.ChainEpoch(4461240)
113+
// var because of TestMigrationNV24 in itests/migration_test.go to test the FIP-0081 pledge ramp
114+
var UpgradeTuktukHeight abi.ChainEpoch = 4461240
115+
116+
// ??????
117+
var UpgradeXxHeight = abi.ChainEpoch(9999999999)
114118

115119
// FIP-0081: for the power actor state for pledge calculations.
116120
// UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
@@ -145,8 +149,8 @@ func init() {
145149
}
146150
SetAddressNetwork(addrNetwork)
147151

148-
if os.Getenv("LOTUS_DISABLE_TUKTUK") == "1" {
149-
UpgradeTuktukHeight = math.MaxInt64 - 1
152+
if os.Getenv("LOTUS_DISABLE_XX") == "1" {
153+
UpgradeXxHeight = math.MaxInt64 - 1
150154
}
151155

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

‎build/buildconstants/params_testground.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ var (
107107
UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -28
108108
UpgradeWaffleHeight abi.ChainEpoch = -29
109109
UpgradeTuktukHeight abi.ChainEpoch = -30
110+
UpgradeXxHeight abi.ChainEpoch = -31
110111

111112
UpgradeTuktukPowerRampDurationEpochs uint64 = 0
112113

‎build/builtin_actors_gen.go‎

Lines changed: 168 additions & 7 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)