fix 2k build
This commit is contained in:
parent
4bf03b485f
commit
3671f2a6ff
@ -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,
|
||||
}
|
||||
|
@ -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()
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user