Merge pull request #9483 from filecoin-project/jen/calib

chore: build: add calib upgrade param for shark
filecoin-project · Oct 13, 2022 · c4fdeb1 · c4fdeb1
2 parents e549a3f + 6d5139e
commit c4fdeb1
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/build/params_2k.go b/build/params_2k.go
@@ -56,7 +56,7 @@ var UpgradeOhSnapHeight = abi.ChainEpoch(-18)
 
 var UpgradeSkyrHeight = abi.ChainEpoch(-19)
 
-var UpgradeV17Height = abi.ChainEpoch(100)
+var UpgradeSharkHeight = abi.ChainEpoch(100)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
@@ -109,7 +109,7 @@ func init() {
 	UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight)
 	UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight)
 	UpgradeSkyrHeight = getUpgradeHeight("LOTUS_SKYR_HEIGHT", UpgradeSkyrHeight)
-	UpgradeV17Height = getUpgradeHeight("LOTUS_V17_HEIGHT", UpgradeV17Height)
+	UpgradeSharkHeight = getUpgradeHeight("LOTUS_SHARK_HEIGHT", UpgradeSharkHeight)
 
 	BuildType |= Build2k
 

diff --git a/build/params_butterfly.go b/build/params_butterfly.go
@@ -49,7 +49,7 @@ const UpgradeHyperdriveHeight = -16
 const UpgradeChocolateHeight = -17
 const UpgradeOhSnapHeight = -18
 const UpgradeSkyrHeight = -19
-const UpgradeV17Height = abi.ChainEpoch(50)
+const UpgradeSharkHeight = abi.ChainEpoch(50)
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg512MiBV1,

diff --git a/build/params_calibnet.go b/build/params_calibnet.go
@@ -69,7 +69,8 @@ const UpgradeOhSnapHeight = 682006
 // 2022-06-16T17:30:00Z
 const UpgradeSkyrHeight = 1044660
 
-var UpgradeV17Height = abi.ChainEpoch(99999999999999)
+// 2022-10-20T16:00:07Z
+const UpgradeSharkHeight = 1407374
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg32GiBV1,

diff --git a/build/params_interop.go b/build/params_interop.go
@@ -49,7 +49,7 @@ var UpgradeChocolateHeight = abi.ChainEpoch(-17)
 var UpgradeOhSnapHeight = abi.ChainEpoch(-18)
 var UpgradeSkyrHeight = abi.ChainEpoch(-19)
 
-const UpgradeV17Height = abi.ChainEpoch(99999999999999)
+const UpgradeSharkHeight = abi.ChainEpoch(99999999999999)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
@@ -103,7 +103,7 @@ func init() {
 	UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight)
 	UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight)
 	UpgradeSkyrHeight = getUpgradeHeight("LOTUS_SKYR_HEIGHT", UpgradeSkyrHeight)
-	UpgradeV17Height = getUpgradeHeight("LOTUS_V17_HEIGHT", UpgradeV17Height)
+	UpgradeSharkHeight = getUpgradeHeight("LOTUS_SHARK_HEIGHT", UpgradeSharkHeight)
 
 	BuildType |= BuildInteropnet
 	SetAddressNetwork(address.Testnet)

diff --git a/build/params_mainnet.go b/build/params_mainnet.go
@@ -79,7 +79,7 @@ const UpgradeOhSnapHeight = 1594680
 // 2022-07-06T14:00:00Z
 const UpgradeSkyrHeight = 1960320
 
-var UpgradeV17Height = abi.ChainEpoch(99999999999999)
+var UpgradeSharkHeight = abi.ChainEpoch(99999999999999)
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg32GiBV1,
@@ -95,8 +95,8 @@ func init() {
 		SetAddressNetwork(address.Mainnet)
 	}
 
-	if os.Getenv("LOTUS_DISABLE_V17") == "1" {
-		UpgradeV17Height = math.MaxInt64
+	if os.Getenv("LOTUS_DISABLE_SHARK") == "1" {
+		UpgradeSharkHeight = 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
@@ -107,7 +107,7 @@ var (
 	UpgradeChocolateHeight  abi.ChainEpoch = -16
 	UpgradeOhSnapHeight     abi.ChainEpoch = -17
 	UpgradeSkyrHeight       abi.ChainEpoch = -18
-	UpgradeV17Height        abi.ChainEpoch = -19
+	UpgradeSharkHeight      abi.ChainEpoch = -19
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0: DrandMainnet,

diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go
@@ -192,7 +192,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule {
 		}},
 		Expensive: true,
 	}, {
-		Height:    build.UpgradeV17Height,
+		Height:    build.UpgradeSharkHeight,
 		Network:   network.Version17,
 		Migration: UpgradeActorsV9,
 		PreMigrations: []stmgr.PreMigration{{