Update Codename for nv22

Update codename for nv22 to Dragen, from the previous placeholder Pineapple
filecoin-project · Jan 25, 2024 · 6179fe4 · 6179fe4
1 parent 2560c3b
commit 6179fe4
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 14 deletions.
diff --git a/api/types.go b/api/types.go
@@ -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

diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz
diff --git a/build/params_2k.go b/build/params_2k.go
@@ -67,7 +67,7 @@ var UpgradeThunderHeight = abi.ChainEpoch(-23)
 
 var UpgradeWatermelonHeight = abi.ChainEpoch(-24)
 
-var UpgradePineappleHeight = abi.ChainEpoch(200)
+var UpgradeDragonHeight = abi.ChainEpoch(200)
 
 // This fix upgrade only ran on calibrationnet
 const UpgradeWatermelonFixHeight = -100
@@ -131,7 +131,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
 

diff --git a/build/params_butterfly.go b/build/params_butterfly.go
@@ -57,7 +57,7 @@ const UpgradeThunderHeight = -23
 const UpgradeWatermelonHeight = -24
 
 // ??????
-const UpgradePineappleHeight = 200
+const UpgradeDragonHeight = 200
 
 // This fix upgrade only ran on calibrationnet
 const UpgradeWatermelonFixHeight = -100

diff --git a/build/params_calibnet.go b/build/params_calibnet.go
@@ -89,7 +89,7 @@ const UpgradeWatermelonFixHeight = 1070494
 const UpgradeWatermelonFix2Height = 1108174
 
 // ??????
-const UpgradePineappleHeight = 999999999999999
+const UpgradeDragonHeight = 999999999999999
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg32GiBV1,

diff --git a/build/params_interop.go b/build/params_interop.go
@@ -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
 
 // This fix upgrade only ran on calibrationnet
 const UpgradeWatermelonFixHeight = -1

diff --git a/build/params_mainnet.go b/build/params_mainnet.go
@@ -99,7 +99,7 @@ const UpgradeThunderHeight = UpgradeLightningHeight + 2880*21
 const UpgradeWatermelonHeight = 3469380
 
 // ??????
-var UpgradePineappleHeight = abi.ChainEpoch(999999999999999)
+var UpgradeDragonHeight = abi.ChainEpoch(999999999999999)
 
 // This fix upgrade only ran on calibrationnet
 const UpgradeWatermelonFixHeight = -1
@@ -122,8 +122,8 @@ func init() {
 		SetAddressNetwork(address.Mainnet)
 	}
 
-	if os.Getenv("LOTUS_DISABLE_PINEAPPLE") == "1" {
-		UpgradePineappleHeight = math.MaxInt64
+	if os.Getenv("LOTUS_DISABLE_DRAGON") == "1" {
+		UpgradeDragonHeight = math.MaxInt64
 	}
 
 	// NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however,

diff --git a/build/params_testground.go b/build/params_testground.go
@@ -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
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0: DrandMainnet,

diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go
@@ -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{{

diff --git a/documentation/en/api-v0-methods.md b/documentation/en/api-v0-methods.md
@@ -5470,7 +5470,7 @@ Response:
     "UpgradeLightningHeight": 10101,
     "UpgradeThunderHeight": 10101,
     "UpgradeWatermelonHeight": 10101,
-    "UpgradePineappleHeight": 10101
+    "UpgradeDragonHeight": 10101
   },
   "Eip155ChainID": 123
 }

diff --git a/documentation/en/api-v1-unstable-methods.md b/documentation/en/api-v1-unstable-methods.md
@@ -7072,7 +7072,7 @@ Response:
     "UpgradeLightningHeight": 10101,
     "UpgradeThunderHeight": 10101,
     "UpgradeWatermelonHeight": 10101,
-    "UpgradePineappleHeight": 10101
+    "UpgradeDragonHeight": 10101
   },
   "Eip155ChainID": 123
 }

diff --git a/node/impl/full/state.go b/node/impl/full/state.go
@@ -1914,7 +1914,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
 }