feat: Skeleton for nv23 (#11964)

* Use local GST Use local GST * Import actors and define upgrade heights Creatin a mock actor-bundle and define upgrade heights * Generate adapters Updates gen/inlinegen-data.json, and runs make actors-gen * Add schedule and migration Add schedule and migration * Add upgrade and network version fields/params Add upgrade and network version fields/params * Run make gen / make docsgen-cli Run make gen / make docsgen-cli * Update filecoin-ffi Update filecoin-ffi to the v1.28.0-dev tag, which supports the nv23 skeleton. * Update GST to v0.14.0-dev Update GST to v0.14.0-dev, which includes the nv23 skeleton * Add support for actor version 14 in actor registry Add support for actor version 14 in actor registry
filecoin-project · May 7, 2024 · 2d57bfe · 2d57bfe
1 parent d6d4fee
commit 2d57bfe
Show file tree

Hide file tree

Showing 62 changed files with 3,138 additions and 104 deletions.
diff --git a/api/types.go b/api/types.go
@@ -346,6 +346,7 @@ type ForkUpgradeParams struct {
  UpgradeWatermelonHeight abi.ChainEpoch
  UpgradeDragonHeight abi.ChainEpoch
  UpgradePhoenixHeight abi.ChainEpoch
+ UpgradeAussieHeight abi.ChainEpoch
 }
 
 // ChainExportConfig holds configuration for chain ranged exports.

diff --git a/build/actors/v14.tar.zst b/build/actors/v14.tar.zst
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
@@ -17746,7 +17746,7 @@
  "title": "number",
  "description": "Number is a number",
  "examples": [
- 22
+ 23
  ],
  "type": [
  "number"
@@ -17798,7 +17798,7 @@
  "title": "number",
  "description": "Number is a number",
  "examples": [
- 22
+ 23
  ],
  "type": [
  "number"
@@ -20569,7 +20569,8 @@
  "UpgradeThunderHeight": 10101,
  "UpgradeWatermelonHeight": 10101,
  "UpgradeDragonHeight": 10101,
- "UpgradePhoenixHeight": 10101
+ "UpgradePhoenixHeight": 10101,
+ "UpgradeAussieHeight": 10101
  },
  "Eip155ChainID": 123
  }
@@ -20599,6 +20600,10 @@
  "title": "number",
  "type": "number"
  },
+ "UpgradeAussieHeight": {
+ "title": "number",
+ "type": "number"
+ },
  "UpgradeBreezeHeight": {
  "title": "number",
  "type": "number"
@@ -23732,7 +23737,7 @@
  "title": "number",
  "description": "Number is a number",
  "examples": [
- 22
+ 23
  ],
  "type": [
  "number"

diff --git a/build/openrpc/gateway.json b/build/openrpc/gateway.json
@@ -8845,7 +8845,7 @@
  "title": "number",
  "description": "Number is a number",
  "examples": [
- 22
+ 23
  ],
  "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": [
- 22
+ 23
  ],
  "type": [
  "number"

diff --git a/build/params_2k.go b/build/params_2k.go
@@ -23,7 +23,7 @@ var NetworkBundle = "devnet"
 var BundleOverrides map[actorstypes.Version]string
 var ActorDebugging = true
 
-var GenesisNetworkVersion = network.Version21
+var GenesisNetworkVersion = network.Version22
 
 var UpgradeBreezeHeight = abi.ChainEpoch(-1)
 
@@ -67,9 +67,11 @@ var UpgradeThunderHeight = abi.ChainEpoch(-23)
 
 var UpgradeWatermelonHeight = abi.ChainEpoch(-24)
 
-var UpgradeDragonHeight = abi.ChainEpoch(20)
+var UpgradeDragonHeight = abi.ChainEpoch(-24)
 
-var UpgradePhoenixHeight = UpgradeDragonHeight + 120
+var UpgradePhoenixHeight = abi.ChainEpoch(-25)
+
+var UpgradeAussieHeight = abi.ChainEpoch(200)
 
 // This fix upgrade only ran on calibrationnet
 const UpgradeWatermelonFixHeight = -100
@@ -154,6 +156,7 @@ func init() {
  UpgradeThunderHeight = getUpgradeHeight("LOTUS_THUNDER_HEIGHT", UpgradeThunderHeight)
  UpgradeWatermelonHeight = getUpgradeHeight("LOTUS_WATERMELON_HEIGHT", UpgradeWatermelonHeight)
  UpgradeDragonHeight = getUpgradeHeight("LOTUS_DRAGON_HEIGHT", UpgradeDragonHeight)
+ UpgradeAussieHeight = getUpgradeHeight("LOTUS_AUSSIE_HEIGHT", UpgradeAussieHeight)
 
  UpgradePhoenixHeight = getUpgradeHeight("LOTUS_PHOENIX_HEIGHT", UpgradePhoenixHeight)
  DrandSchedule = map[abi.ChainEpoch]DrandEnum{

diff --git a/build/params_butterfly.go b/build/params_butterfly.go
@@ -56,10 +56,10 @@ const UpgradeHyggeHeight = -21
 const UpgradeLightningHeight = -22
 const UpgradeThunderHeight = -23
 const UpgradeWatermelonHeight = -24
+const UpgradeDragonHeight = -25
+const UpgradePhoenixHeight = -26
 
-const UpgradeDragonHeight = 5760
-
-const UpgradePhoenixHeight = UpgradeDragonHeight + 120
+const UpgradeAussieHeight = 400
 
 // This fix upgrade only ran on calibrationnet
 const UpgradeWatermelonFixHeight = -100

diff --git a/build/params_calibnet.go b/build/params_calibnet.go
@@ -98,6 +98,9 @@ const UpgradePhoenixHeight = UpgradeDragonHeight + 120
 // 2024-04-03T11:00:00Z
 const UpgradeCalibrationDragonFixHeight = 1493854
 
+// ?????
+const UpgradeAussieHeight = 999999999999999
+
 var SupportedProofTypes = []abi.RegisteredSealProof{
  abi.RegisteredSealProof_StackedDrg32GiBV1,
  abi.RegisteredSealProof_StackedDrg64GiBV1,

diff --git a/build/params_interop.go b/build/params_interop.go
@@ -54,8 +54,9 @@ var UpgradeHyggeHeight = abi.ChainEpoch(-21)
 var UpgradeLightningHeight = abi.ChainEpoch(-22)
 var UpgradeThunderHeight = abi.ChainEpoch(-23)
 var UpgradeWatermelonHeight = abi.ChainEpoch(-24)
+var UpgradeDragonHeight = abi.ChainEpoch(-25)
 
-const UpgradeDragonHeight = 50
+const UpgradeAussieHeight = 50
 
 const UpgradePhoenixHeight = UpgradeDragonHeight + 100
 

diff --git a/build/params_mainnet.go b/build/params_mainnet.go
@@ -100,11 +100,14 @@ const UpgradeThunderHeight = UpgradeLightningHeight + 2880*21
 const UpgradeWatermelonHeight = 3469380
 
 // 2024-04-24T14:00:00Z
-var UpgradeDragonHeight = abi.ChainEpoch(3855360)
+const UpgradeDragonHeight = 3855360
 
 // This epoch, 120 epochs after the "rest" of the nv22 upgrade, is when we switch to Drand quicknet
 // 2024-04-11T15:00:00Z
-var UpgradePhoenixHeight = UpgradeDragonHeight + 120
+const UpgradePhoenixHeight = UpgradeDragonHeight + 120
+
+// ??????
+var UpgradeAussieHeight = abi.ChainEpoch(9999999999)
 
 // This fix upgrade only ran on calibrationnet
 const UpgradeWatermelonFixHeight = -1
@@ -130,10 +133,8 @@ func init() {
  SetAddressNetwork(address.Mainnet)
  }
 
- if os.Getenv("LOTUS_DISABLE_DRAGON") == "1" {
- UpgradeDragonHeight = math.MaxInt64 - 1
- delete(DrandSchedule, UpgradePhoenixHeight)
- UpgradePhoenixHeight = math.MaxInt64
+ if os.Getenv("LOTUS_DISABLE_AUSSIE") == "1" {
+ UpgradeAussieHeight = 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/params_shared_vals.go b/build/params_shared_vals.go
@@ -30,7 +30,7 @@ const AllowableClockDriftSecs = uint64(1)
 /* inline-gen template
 const TestNetworkVersion = network.Version{{.latestNetworkVersion}}
 /* inline-gen start */
-const TestNetworkVersion = network.Version22
+const TestNetworkVersion = network.Version23
 
 /* inline-gen end */
 

diff --git a/build/params_testground.go b/build/params_testground.go
@@ -115,6 +115,7 @@ var (
  UpgradeDragonHeight abi.ChainEpoch = -26
  UpgradePhoenixHeight abi.ChainEpoch = -27
  UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -28
+ UpgradeAussieHeight abi.ChainEpoch = -29
 
  DrandSchedule = map[abi.ChainEpoch]DrandEnum{
  0: DrandMainnet,

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"
- builtin13 "github.com/filecoin-project/go-state-types/builtin"
+ builtin14 "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 = builtin13.MethodsAccount
+var Methods = builtin14.MethodsAccount
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
  if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
@@ -50,6 +50,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
  case actorstypes.Version13:
  return load13(store, act.Head)
 
+ case actorstypes.Version14:
+ return load14(store, act.Head)
+
  }
  }
 
@@ -123,6 +126,9 @@ func MakeState(store adt.Store, av actorstypes.Version, addr address.Address) (S
  case actorstypes.Version13:
  return make13(store, addr)
 
+ case actorstypes.Version14:
+ return make14(store, addr)
+
  }
  return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -153,5 +159,6 @@ func AllCodes() []cid.Cid {
  (&state11{}).Code(),
  (&state12{}).Code(),
  (&state13{}).Code(),
+ (&state14{}).Code(),
  }
 }
diff --git a/chain/actors/builtin/account/v14.go b/chain/actors/builtin/account/v14.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"
- builtin13 "github.com/filecoin-project/go-state-types/builtin"
+ builtin14 "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"
@@ -46,6 +46,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
  case actorstypes.Version13:
  return load13(store, act.Head)
 
+ case actorstypes.Version14:
+ return load14(store, act.Head)
+
  }
  }
 
@@ -119,13 +122,16 @@ func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
  case actorstypes.Version13:
  return make13(store)
 
+ case actorstypes.Version14:
+ return make14(store)
+
  }
  return nil, xerrors.Errorf("unknown actor version %d", av)
 }
 
 var (
- Address = builtin13.CronActorAddr
- Methods = builtin13.MethodsCron
+ Address = builtin14.CronActorAddr
+ Methods = builtin14.MethodsCron
 )
 
 type State interface {
@@ -151,5 +157,6 @@ func AllCodes() []cid.Cid {
  (&state11{}).Code(),
  (&state12{}).Code(),
  (&state13{}).Code(),
+ (&state14{}).Code(),
  }
 }
diff --git a/chain/actors/builtin/cron/v14.go b/chain/actors/builtin/cron/v14.go