From 3671f2a6ff1848add5bd59ff616fe9655689dbb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 31 May 2021 21:43:21 +0200
Subject: [PATCH] fix 2k build

---
 build/params_2k.go             | 2 ++
 chain/store/checkpoint_test.go | 4 ++--
 cli/filplus.go                 | 2 +-
 cmd/lotus-shed/cron-count.go   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/params_2k.go b/build/params_2k.go
index 3e107b4ed..387d2da0b 100644
--- a/build/params_2k.go
+++ b/build/params_2k.go
@@ -39,6 +39,8 @@ var UpgradeNorwegianHeight = abi.ChainEpoch(-13)
 
 var UpgradeTurboHeight = abi.ChainEpoch(-14)
 
+var UpgradeHyperdriveHeight = abi.ChainEpoch(-15)
+
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
 }
diff --git a/chain/store/checkpoint_test.go b/chain/store/checkpoint_test.go
index 320b76797..81bbab6ea 100644
--- a/chain/store/checkpoint_test.go
+++ b/chain/store/checkpoint_test.go
@@ -18,7 +18,7 @@ func TestChainCheckpoint(t *testing.T) {
 	// Let the first miner mine some blocks.
 	last := cg.CurTipset.TipSet()
 	for i := 0; i < 4; i++ {
-		ts, err := cg.NextTipSetFromMiners(last, cg.Miners[:1])
+		ts, err := cg.NextTipSetFromMiners(last, cg.Miners[:1], 0)
 		require.NoError(t, err)
 
 		last = ts.TipSet.TipSet()
@@ -57,7 +57,7 @@ func TestChainCheckpoint(t *testing.T) {
 	// Let the second miner miner mine a fork
 	last = checkpointParents
 	for i := 0; i < 4; i++ {
-		ts, err := cg.NextTipSetFromMiners(last, cg.Miners[1:])
+		ts, err := cg.NextTipSetFromMiners(last, cg.Miners[1:], 0)
 		require.NoError(t, err)
 
 		last = ts.TipSet.TipSet()
diff --git a/cli/filplus.go b/cli/filplus.go
index 9a6fa2ccf..53dc5092b 100644
--- a/cli/filplus.go
+++ b/cli/filplus.go
@@ -3,7 +3,6 @@ package cli
 import (
 	"context"
 	"fmt"
-	"github.com/filecoin-project/lotus/api/v0api"
 
 	verifreg4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/verifreg"
 
@@ -15,6 +14,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 
+	"github.com/filecoin-project/lotus/api/v0api"
 	"github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors"
diff --git a/cmd/lotus-shed/cron-count.go b/cmd/lotus-shed/cron-count.go
index 79fd6ec42..622f38791 100644
--- a/cmd/lotus-shed/cron-count.go
+++ b/cmd/lotus-shed/cron-count.go
@@ -60,7 +60,7 @@ func findDeadlineCrons(c *cli.Context) (map[address.Address]struct{}, error) {
 		// All miners have active cron before v4.
 		// v4 upgrade epoch is last epoch running v3 epoch and api.StateReadState reads
 		// parent state, so v4 state isn't read until upgrade epoch + 2
-		if ts.Height() <= build.UpgradeActorsV4Height+1 {
+		if ts.Height() <= build.UpgradeTurboHeight+1 {
 			activeMiners[mAddr] = struct{}{}
 			continue
 		}