Migrate miner actor

api/test/window_post.go

@@ -4,6 +4,13 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/filecoin-project/lotus/api/apibstore"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+	lotusminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner"
+	cbor "github.com/ipfs/go-ipld-cbor"
+
+	v0miner "github.com/filecoin-project/specs-actors/actors/builtin/miner"
+
 	"os"
 	"strings"
 	"testing"
@@ -15,7 +22,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/lotus/extern/sector-storage/mock"
 	sealing "github.com/filecoin-project/lotus/extern/storage-sealing"
-	miner2 "github.com/filecoin-project/specs-actors/actors/builtin/miner"
 
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
@@ -159,7 +165,7 @@ func TestWindowPost(t *testing.T, b APIBuilder, blocktime time.Duration, nSector
 		head, err := client.ChainHead(ctx)
 		require.NoError(t, err)
 
-		if head.Height() > di.PeriodStart+(miner2.WPoStProvingPeriod)+2 {
+		if head.Height() > di.PeriodStart+(v0miner.WPoStProvingPeriod)+2 {
 			break
 		}
 
@@ -178,6 +184,14 @@ func TestWindowPost(t *testing.T, b APIBuilder, blocktime time.Duration, nSector
 	require.Equal(t, p.MinerPower, p.TotalPower)
 	require.Equal(t, p.MinerPower.RawBytePower, types.NewInt(uint64(ssz)*uint64(nSectors+GenesisPreseals)))
 
+	store := cbor.NewCborStore(apibstore.NewAPIBlockstore(client))
+
+	mact, err := client.StateGetActor(ctx, maddr, types.EmptyTSK)
+	require.NoError(t, err)
+
+	minState, err := lotusminer.Load(adt.WrapStore(ctx, store), mact)
+	require.NoError(t, err)
+
 	fmt.Printf("Drop some sectors\n")
 
 	// Drop 2 sectors from deadline 2 partition 0 (full partition / deadline)
@@ -186,12 +200,14 @@ func TestWindowPost(t *testing.T, b APIBuilder, blocktime time.Duration, nSector
 		require.NoError(t, err)
 		require.Greater(t, len(parts), 0)
 
-		n, err := parts[0].Sectors.Count()
+		secs, err := parts[0].AllSectors()
+		require.NoError(t, err)
+		n, err := secs.Count()
 		require.NoError(t, err)
 		require.Equal(t, uint64(2), n)
 
 		// Drop the partition
-		err = parts[0].Sectors.ForEach(func(sid uint64) error {
+		err = secs.ForEach(func(sid uint64) error {
 			return miner.StorageMiner.(*impl.StorageMinerAPI).IStorageMgr.(*mock.SectorMgr).MarkCorrupted(abi.SectorID{
 				Miner:  abi.ActorID(mid),
 				Number: abi.SectorNumber(sid),
@@ -208,15 +224,17 @@ func TestWindowPost(t *testing.T, b APIBuilder, blocktime time.Duration, nSector
 		require.NoError(t, err)
 		require.Greater(t, len(parts), 0)
 
-		n, err := parts[0].Sectors.Count()
+		secs, err := parts[0].AllSectors()
+		require.NoError(t, err)
+		n, err := secs.Count()
 		require.NoError(t, err)
 		require.Equal(t, uint64(2), n)
 
 		// Drop the sector
-		sn, err := parts[0].Sectors.First()
+		sn, err := secs.First()
 		require.NoError(t, err)
 
-		all, err := parts[0].Sectors.All(2)
+		all, err := secs.All(2)
 		require.NoError(t, err)
 		fmt.Println("the sectors", all)
 
@@ -238,7 +256,7 @@ func TestWindowPost(t *testing.T, b APIBuilder, blocktime time.Duration, nSector
 		head, err := client.ChainHead(ctx)
 		require.NoError(t, err)
 
-		if head.Height() > di.PeriodStart+(miner2.WPoStProvingPeriod)+2 {
+		if head.Height() > di.PeriodStart+(minState.WpostProvingPeriod())+2 {
 			break
 		}
 
@@ -268,7 +286,7 @@ func TestWindowPost(t *testing.T, b APIBuilder, blocktime time.Duration, nSector
 		head, err := client.ChainHead(ctx)
 		require.NoError(t, err)
 
-		if head.Height() > di.PeriodStart+(miner2.WPoStProvingPeriod)+2 {
+		if head.Height() > di.PeriodStart+(minState.WpostProvingPeriod())+2 {
 			break
 		}
 

chain/actors/builtin/miner/miner.go

@@ -46,6 +46,7 @@ type State interface {
 	Info() (MinerInfo, error)
 
 	DeadlineInfo(epoch abi.ChainEpoch) *dline.Info
+	WpostProvingPeriod() abi.ChainEpoch
 }
 
 type Deadline interface {

chain/actors/builtin/miner/v0.go

@@ -14,21 +14,21 @@ import (
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/specs-actors/actors/builtin/miner"
+	v0miner "github.com/filecoin-project/specs-actors/actors/builtin/miner"
 )
 
 type v0State struct {
-	miner.State
+	v0miner.State
 	store adt.Store
 }
 
 type v0Deadline struct {
-	miner.Deadline
+	v0miner.Deadline
 	store adt.Store
 }
 
 type v0Partition struct {
-	miner.Partition
+	v0miner.Partition
 	store adt.Store
 }
 
@@ -69,13 +69,13 @@ func (s *v0State) GetSectorExpiration(num abi.SectorNumber) (out *SectorExpirati
 	// 2. If it's faulty, it will expire early within the first 14 entries
 	// of the expiration queue.
 	stopErr := errors.New("stop")
-	err = dls.ForEach(s.store, func(dlIdx uint64, dl *miner.Deadline) error {
+	err = dls.ForEach(s.store, func(dlIdx uint64, dl *v0miner.Deadline) error {
 		partitions, err := dl.PartitionsArray(s.store)
 		if err != nil {
 			return err
 		}
 		quant := s.State.QuantSpecForDeadline(dlIdx)
-		var part miner.Partition
+		var part v0miner.Partition
 		return partitions.ForEach(&part, func(partIdx int64) error {
 			if found, err := part.Sectors.IsSet(uint64(num)); err != nil {
 				return err
@@ -89,11 +89,11 @@ func (s *v0State) GetSectorExpiration(num abi.SectorNumber) (out *SectorExpirati
 				return stopErr
 			}
 
-			q, err := miner.LoadExpirationQueue(s.store, part.EarlyTerminated, quant)
+			q, err := v0miner.LoadExpirationQueue(s.store, part.EarlyTerminated, quant)
 			if err != nil {
 				return err
 			}
-			var exp miner.ExpirationSet
+			var exp v0miner.ExpirationSet
 			return q.ForEach(&exp, func(epoch int64) error {
 				if early, err := exp.EarlySectors.IsSet(uint64(num)); err != nil {
 					return err
@@ -151,7 +151,7 @@ func (s *v0State) LoadSectorsFromSet(filter *bitfield.BitField, filterOut bool)
 			}
 		}
 
-		var oci miner.SectorOnChainInfo
+		var oci v0miner.SectorOnChainInfo
 		if err := oci.UnmarshalCBOR(bytes.NewReader(v.Raw)); err != nil {
 			return err
 		}
@@ -184,13 +184,13 @@ func (s *v0State) ForEachDeadline(cb func(uint64, Deadline) error) error {
 	if err != nil {
 		return err
 	}
-	return dls.ForEach(s.store, func(i uint64, dl *miner.Deadline) error {
+	return dls.ForEach(s.store, func(i uint64, dl *v0miner.Deadline) error {
 		return cb(i, &v0Deadline{*dl, s.store})
 	})
 }
 
 func (s *v0State) NumDeadlines() (uint64, error) {
-	return miner.WPoStPeriodDeadlines, nil
+	return v0miner.WPoStPeriodDeadlines, nil
 }
 
 func (s *v0State) Info() (MinerInfo, error) {
@@ -230,6 +230,9 @@ func (s *v0State) Info() (MinerInfo, error) {
 func (s *v0State) DeadlineInfo(epoch abi.ChainEpoch) *dline.Info {
 	return s.State.DeadlineInfo(epoch)
 }
+func (s *v0State) WpostProvingPeriod() abi.ChainEpoch {
+	return v0miner.WPoStProvingPeriod
+}
 
 func (d *v0Deadline) LoadPartition(idx uint64) (Partition, error) {
 	p, err := d.Deadline.LoadPartition(d.store, idx)
@@ -244,7 +247,7 @@ func (d *v0Deadline) ForEachPartition(cb func(uint64, Partition) error) error {
 	if err != nil {
 		return err
 	}
-	var part miner.Partition
+	var part v0miner.Partition
 	return ps.ForEach(&part, func(i int64) error {
 		return cb(uint64(i), &v0Partition{part, d.store})
 	})

chain/stmgr/forks_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/specs-actors/actors/builtin"
 	init_ "github.com/filecoin-project/specs-actors/actors/builtin/init"
-	"github.com/filecoin-project/specs-actors/actors/builtin/miner"
+	v0miner "github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	v0power "github.com/filecoin-project/specs-actors/actors/builtin/power"
 	"github.com/filecoin-project/specs-actors/actors/builtin/verifreg"
 	"github.com/filecoin-project/specs-actors/actors/runtime"
@@ -33,7 +33,7 @@ import (
 )
 
 func init() {
-	miner.SupportedProofTypes = map[abi.RegisteredSealProof]struct{}{
+	v0miner.SupportedProofTypes = map[abi.RegisteredSealProof]struct{}{
 		abi.RegisteredSealProof_StackedDrg2KiBV1: {},
 	}
 	v0power.ConsensusMinerMinPower = big.NewInt(2048)

node/impl/full/state.go

@@ -27,7 +27,6 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/util/smoothing"
 
 	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/multisig"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/power"