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
filecoin-project · Nov 25, 2024 · b0de2bd · b0de2bd
1 parent 0d1d7c2
commit b0de2bd
Show file tree

Hide file tree

Showing 66 changed files with 3,214 additions and 117 deletions.
diff --git a/api/types.go b/api/types.go
@@ -193,6 +193,7 @@ type ForkUpgradeParams struct {
 	UpgradePhoenixHeight     abi.ChainEpoch
 	UpgradeWaffleHeight      abi.ChainEpoch
 	UpgradeTuktukHeight      abi.ChainEpoch
+	UpgradeXxHeight          abi.ChainEpoch
 }
 
 // ChainExportConfig holds configuration for chain ranged exports.

diff --git a/build/actors/v16.tar.zst b/build/actors/v16.tar.zst
diff --git a/build/buildconstants/params.go b/build/buildconstants/params.go
@@ -42,6 +42,6 @@ var Devnet = true
 /* inline-gen template
 const TestNetworkVersion = network.Version{{.latestNetworkVersion}}
 /* inline-gen start */
-const TestNetworkVersion = network.Version24
+const TestNetworkVersion = network.Version25
 
 /* inline-gen end */
diff --git a/build/buildconstants/params_2k.go b/build/buildconstants/params_2k.go
@@ -21,7 +21,7 @@ const GenesisFile = ""
 var NetworkBundle = "devnet"
 var ActorDebugging = true
 
-var GenesisNetworkVersion = network.Version23
+var GenesisNetworkVersion = network.Version24
 
 var UpgradeBreezeHeight = abi.ChainEpoch(-1)
 
@@ -71,7 +71,9 @@ var UpgradePhoenixHeight = abi.ChainEpoch(-25)
 
 var UpgradeWaffleHeight = abi.ChainEpoch(-26)
 
-var UpgradeTuktukHeight = abi.ChainEpoch(200)
+var UpgradeTuktukHeight = abi.ChainEpoch(-27)
+
+var UpgradeXxHeight = abi.ChainEpoch(200)
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
@@ -167,6 +169,7 @@ func init() {
 	UpgradeWaffleHeight = getUpgradeHeight("LOTUS_WAFFLE_HEIGHT", UpgradeWaffleHeight)
 	UpgradePhoenixHeight = getUpgradeHeight("LOTUS_PHOENIX_HEIGHT", UpgradePhoenixHeight)
 	UpgradeTuktukHeight = getUpgradeHeight("LOTUS_TUKTUK_HEIGHT", UpgradeTuktukHeight)
+	UpgradeXxHeight = getUpgradeHeight("LOTUS_XX_HEIGHT", UpgradeXxHeight)
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0: DrandQuicknet,

diff --git a/build/buildconstants/params_butterfly.go b/build/buildconstants/params_butterfly.go
@@ -56,9 +56,10 @@ const UpgradeWatermelonHeight = -24
 const UpgradeDragonHeight = -25
 const UpgradePhoenixHeight = -26
 const UpgradeWaffleHeight = -27
+const UpgradeTuktukHeight = -28
 
 // ??????
-const UpgradeTuktukHeight = 999999999999999
+const UpgradeXxHeight = 999999999999999
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after

diff --git a/build/buildconstants/params_calibnet.go b/build/buildconstants/params_calibnet.go
@@ -102,6 +102,9 @@ const UpgradeWaffleHeight = 1779094
 // 2024-10-23T13:30:00Z
 const UpgradeTuktukHeight = 2078794
 
+// ??????
+const UpgradeXxHeight = 999999999999999
+
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
 // Tuktuk migration. along with a RampStartEpoch matching the upgrade height.

diff --git a/build/buildconstants/params_interop.go b/build/buildconstants/params_interop.go
@@ -55,8 +55,9 @@ var UpgradeWatermelonHeight = abi.ChainEpoch(-24)
 var UpgradeDragonHeight = abi.ChainEpoch(-25)
 var UpgradePhoenixHeight = abi.ChainEpoch(-26)
 var UpgradeWaffleHeight = abi.ChainEpoch(-27)
+var UpgradeTuktukHeight = abi.ChainEpoch(-28)
 
-const UpgradeTuktukHeight = 50
+const UpgradeXxHeight = 50
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after

diff --git a/build/buildconstants/params_mainnet.go b/build/buildconstants/params_mainnet.go
@@ -110,7 +110,11 @@ const UpgradePhoenixHeight abi.ChainEpoch = UpgradeDragonHeight + 120
 const UpgradeWaffleHeight abi.ChainEpoch = 4154640
 
 // 2024-11-20T23:00:00Z
-var UpgradeTuktukHeight = abi.ChainEpoch(4461240)
+// var because of TestMigrationNV24 in itests/migration_test.go to test the FIP-0081 pledge ramp
+var UpgradeTuktukHeight abi.ChainEpoch = 4461240
+
+// ??????
+var UpgradeXxHeight = abi.ChainEpoch(9999999999)
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
@@ -145,8 +149,8 @@ func init() {
 	}
 	SetAddressNetwork(addrNetwork)
 
-	if os.Getenv("LOTUS_DISABLE_TUKTUK") == "1" {
-		UpgradeTuktukHeight = math.MaxInt64 - 1
+	if os.Getenv("LOTUS_DISABLE_XX") == "1" {
+		UpgradeXxHeight = math.MaxInt64 - 1
 	}
 
 	// NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however,

diff --git a/build/buildconstants/params_testground.go b/build/buildconstants/params_testground.go
@@ -107,6 +107,7 @@ var (
 	UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -28
 	UpgradeWaffleHeight               abi.ChainEpoch = -29
 	UpgradeTuktukHeight               abi.ChainEpoch = -30
+	UpgradeXxHeight                   abi.ChainEpoch = -31
 
 	UpgradeTuktukPowerRampDurationEpochs uint64 = 0
 

diff --git a/build/builtin_actors_gen.go b/build/builtin_actors_gen.go
diff --git a/build/openrpc/full.json b/build/openrpc/full.json
@@ -17089,7 +17089,7 @@
                         "title": "number",
                         "description": "Number is a number",
                         "examples": [
-                            24
+                            25
                         ],
                         "type": [
                             "number"
@@ -17141,7 +17141,7 @@
                         "title": "number",
                         "description": "Number is a number",
                         "examples": [
-                            24
+                            25
                         ],
                         "type": [
                             "number"
@@ -19914,7 +19914,8 @@
                                 "UpgradeDragonHeight": 10101,
                                 "UpgradePhoenixHeight": 10101,
                                 "UpgradeWaffleHeight": 10101,
-                                "UpgradeTuktukHeight": 10101
+                                "UpgradeTuktukHeight": 10101,
+                                "UpgradeXxHeight": 10101
                             },
                             "Eip155ChainID": 123
                         }
@@ -20051,6 +20052,10 @@
                                 "UpgradeWatermelonHeight": {
                                     "title": "number",
                                     "type": "number"
+                                },
+                                "UpgradeXxHeight": {
+                                    "title": "number",
+                                    "type": "number"
                                 }
                             },
                             "type": "object"
@@ -23198,7 +23203,7 @@
                     "title": "number",
                     "description": "Number is a number",
                     "examples": [
-                        24
+                        25
                     ],
                     "type": [
                         "number"

diff --git a/build/openrpc/gateway.json b/build/openrpc/gateway.json
@@ -10252,7 +10252,7 @@
                     "title": "number",
                     "description": "Number is a number",
                     "examples": [
-                        24
+                        25
                     ],
                     "type": [
                         "number"

diff --git a/build/openrpc/miner.json b/build/openrpc/miner.json
@@ -538,7 +538,7 @@
                         "title": "number",
                         "description": "Number is a number",
                         "examples": [
-                            24
+                            25
                         ],
                         "type": [
                             "number"

diff --git a/chain/actors/builtin/account/account.go b/chain/actors/builtin/account/account.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin15 "github.com/filecoin-project/go-state-types/builtin"
+	builtin16 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
 	"github.com/filecoin-project/go-state-types/manifest"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
@@ -22,7 +22,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 )
 
-var Methods = builtin15.MethodsAccount
+var Methods = builtin16.MethodsAccount
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
@@ -56,6 +56,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version15:
 			return load15(store, act.Head)
 
+		case actorstypes.Version16:
+			return load16(store, act.Head)
+
 		}
 	}
 
@@ -135,6 +138,9 @@ func MakeState(store adt.Store, av actorstypes.Version, addr address.Address) (S
 	case actorstypes.Version15:
 		return make15(store, addr)
 
+	case actorstypes.Version16:
+		return make16(store, addr)
+
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -167,5 +173,6 @@ func AllCodes() []cid.Cid {
 		(&state13{}).Code(),
 		(&state14{}).Code(),
 		(&state15{}).Code(),
+		(&state16{}).Code(),
 	}
 }
diff --git a/chain/actors/builtin/account/v16.go b/chain/actors/builtin/account/v16.go
diff --git a/chain/actors/builtin/cron/cron.go b/chain/actors/builtin/cron/cron.go
@@ -5,7 +5,7 @@ import (
 	"golang.org/x/xerrors"
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin15 "github.com/filecoin-project/go-state-types/builtin"
+	builtin16 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/manifest"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
@@ -52,6 +52,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version15:
 			return load15(store, act.Head)
 
+		case actorstypes.Version16:
+			return load16(store, act.Head)
+
 		}
 	}
 
@@ -131,13 +134,16 @@ func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
 	case actorstypes.Version15:
 		return make15(store)
 
+	case actorstypes.Version16:
+		return make16(store)
+
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
 
 var (
-	Address = builtin15.CronActorAddr
-	Methods = builtin15.MethodsCron
+	Address = builtin16.CronActorAddr
+	Methods = builtin16.MethodsCron
 )
 
 type State interface {
@@ -165,5 +171,6 @@ func AllCodes() []cid.Cid {
 		(&state13{}).Code(),
 		(&state14{}).Code(),
 		(&state15{}).Code(),
+		(&state16{}).Code(),
 	}
 }
diff --git a/chain/actors/builtin/cron/v16.go b/chain/actors/builtin/cron/v16.go