Upgrade to version 11 at Norwegian height

filecoin-project · Mar 29, 2021 · cea46e5 · cea46e5
1 parent c1600ad
commit cea46e5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 1 deletion.
diff --git a/build/params_2k.go b/build/params_2k.go
@@ -28,6 +28,7 @@ const UpgradeOrangeHeight = 27
 const UpgradeClausHeight = 30
 
 const UpgradeActorsV3Height = 35
+const UpgradeNorwegianHeight = 40
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,

diff --git a/build/params_butterfly.go b/build/params_butterfly.go
@@ -32,6 +32,7 @@ const UpgradePersianHeight = 150
 const UpgradeClausHeight = 180
 const UpgradeOrangeHeight = 210
 const UpgradeActorsV3Height = 240
+const UpgradeNorwegianHeight = 999999
 
 func init() {
 	policy.SetConsensusMinerMinPower(abi.NewStoragePower(2 << 30))

diff --git a/build/params_calibnet.go b/build/params_calibnet.go
@@ -40,6 +40,7 @@ const UpgradeClausHeight = 250
 const UpgradeOrangeHeight = 300
 
 const UpgradeActorsV3Height = 600
+const UpgradeNorwegianHeight = 114000
 
 func init() {
 	policy.SetConsensusMinerMinPower(abi.NewStoragePower(32 << 30))

diff --git a/build/params_mainnet.go b/build/params_mainnet.go
@@ -56,6 +56,9 @@ const UpgradeClausHeight = 343200
 // 2021-03-04T00:00:30Z
 var UpgradeActorsV3Height = abi.ChainEpoch(550321)
 
+// 2021-04-12T22:00:00Z
+const UpgradeNorwegianHeight = 665280
+
 func init() {
 	policy.SetConsensusMinerMinPower(abi.NewStoragePower(10 << 40))
 

diff --git a/build/params_nerpanet.go b/build/params_nerpanet.go
@@ -39,6 +39,7 @@ const UpgradeClausHeight = 250
 const UpgradeOrangeHeight = 300
 
 const UpgradeActorsV3Height = 600
+const UpgradeNorwegianHeight = 999999
 
 func init() {
 	// Minimum block production power is set to 4 TiB

diff --git a/chain/actors/version.go b/chain/actors/version.go
@@ -21,7 +21,7 @@ func VersionForNetwork(version network.Version) Version {
 		return Version0
 	case network.Version4, network.Version5, network.Version6, network.Version7, network.Version8, network.Version9:
 		return Version2
-	case network.Version10:
+	case network.Version10, network.Version11:
 		return Version3
 	default:
 		panic(fmt.Sprintf("unsupported network version %d", version))

diff --git a/chain/stmgr/forks.go b/chain/stmgr/forks.go
@@ -186,6 +186,10 @@ func DefaultUpgradeSchedule() UpgradeSchedule {
 			StopWithin:      5,
 		}},
 		Expensive: true,
+	}, {
+		Height:    build.UpgradeNorwegianHeight,
+		Network:   network.Version11,
+		Migration: nil,
 	}}
 
 	for _, u := range updates {