scaffolding and refactoring to make post scheduler work

node/impl/full/chain.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/filecoin-project/go-lotus/api"
-	"github.com/filecoin-project/go-lotus/chain"
 	"github.com/filecoin-project/go-lotus/chain/store"
 	"github.com/filecoin-project/go-lotus/chain/types"
 	"golang.org/x/xerrors"
@@ -27,7 +26,7 @@ func (a *ChainAPI) ChainNotify(ctx context.Context) (<-chan *store.HeadChange, e
 	return a.Chain.SubHeadChanges(ctx), nil
 }
 
-func (a *ChainAPI) ChainSubmitBlock(ctx context.Context, blk *chain.BlockMsg) error {
+func (a *ChainAPI) ChainSubmitBlock(ctx context.Context, blk *types.BlockMsg) error {
 	if err := a.Chain.AddBlock(blk.Header); err != nil {
 		return xerrors.Errorf("AddBlock failed: %w", err)
 	}

node/impl/full/state.go

@@ -12,7 +12,6 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-lotus/api"
-	"github.com/filecoin-project/go-lotus/chain"
 	"github.com/filecoin-project/go-lotus/chain/actors"
 	"github.com/filecoin-project/go-lotus/chain/address"
 	"github.com/filecoin-project/go-lotus/chain/gen"
@@ -94,62 +93,8 @@ func (a *StateAPI) StateMinerSectors(ctx context.Context, addr address.Address)
 	return sinfos, nil
 }
 
-func (a *StateAPI) StateMinerProvingSet(ctx context.Context, addr address.Address) ([]*api.SectorInfo, error) {
-	ts := a.Chain.GetHeaviestTipSet()
-
-	stc, err := a.StateManager.TipSetState(ts.Cids())
-	if err != nil {
-		return nil, err
-	}
-
-	cst := hamt.CSTFromBstore(a.Chain.Blockstore())
-
-	st, err := state.LoadStateTree(cst, stc)
-	if err != nil {
-		return nil, err
-	}
-
-	act, err := st.GetActor(addr)
-	if err != nil {
-		return nil, err
-	}
-
-	var minerState actors.StorageMinerActorState
-	if err := cst.Get(ctx, act.Head, &minerState); err != nil {
-		return nil, err
-	}
-
-	nd, err := hamt.LoadNode(ctx, cst, minerState.ProvingSet)
-	if err != nil {
-		return nil, err
-	}
-
-	var sinfos []*api.SectorInfo
-	// Note to self: the hamt isnt a great data structure to use here... need to implement the sector set
-	err = nd.ForEach(ctx, func(k string, val interface{}) error {
-		sid, err := strconv.ParseUint(k, 10, 64)
-		if err != nil {
-			return err
-		}
-
-		bval, ok := val.([]byte)
-		if !ok {
-			return fmt.Errorf("expected to get bytes in sector set hamt")
-		}
-
-		var comms [][]byte
-		if err := cbor.DecodeInto(bval, &comms); err != nil {
-			return err
-		}
-
-		sinfos = append(sinfos, &api.SectorInfo{
-			SectorID: sid,
-			CommR:    comms[0],
-			CommD:    comms[1],
-		})
-		return nil
-	})
-	return sinfos, nil
+func (a *StateAPI) StateMinerProvingSet(ctx context.Context, addr address.Address, ts *types.TipSet) ([]*api.SectorInfo, error) {
+	return stmgr.GetMinerProvingSet(ctx, a.StateManager, ts, addr)
 }
 
 func (a *StateAPI) StateMinerPower(ctx context.Context, maddr address.Address, ts *types.TipSet) (api.MinerPower, error) {
@@ -194,9 +139,6 @@ func (a *StateAPI) StateMinerProvingPeriodEnd(ctx context.Context, actor address
 	return stmgr.GetMinerProvingPeriodEnd(ctx, a.StateManager, ts, actor)
 }
 
-func (a *StateAPI) StateMinerProvingSet(ctx context.Context, actor address.Address, ts *types.TipSet) ([]api.SectorSetEntry, error) {
-	return stmgr.GetMinerProvingSet(ctx, a.StateManager, ts, actor)
-}
 func (a *StateAPI) StateCall(ctx context.Context, msg *types.Message, ts *types.TipSet) (*types.MessageReceipt, error) {
 	return a.StateManager.Call(ctx, msg, ts)
 }
@@ -248,13 +190,13 @@ func (a *StateAPI) StateReadState(ctx context.Context, act *types.Actor, ts *typ
 }
 
 // This is on StateAPI because miner.Miner requires this, and MinerAPI requires miner.Miner
-func (a *StateAPI) MinerCreateBlock(ctx context.Context, addr address.Address, parents *types.TipSet, tickets []*types.Ticket, proof types.ElectionProof, msgs []*types.SignedMessage, ts uint64) (*chain.BlockMsg, error) {
+func (a *StateAPI) MinerCreateBlock(ctx context.Context, addr address.Address, parents *types.TipSet, tickets []*types.Ticket, proof types.ElectionProof, msgs []*types.SignedMessage, ts uint64) (*types.BlockMsg, error) {
 	fblk, err := gen.MinerCreateBlock(ctx, a.StateManager, a.Wallet, addr, parents, tickets, proof, msgs, ts)
 	if err != nil {
 		return nil, err
 	}
 
-	var out chain.BlockMsg
+	var out types.BlockMsg
 	out.Header = fblk.Header
 	for _, msg := range fblk.BlsMessages {
 		out.BlsMessages = append(out.BlsMessages, msg.Cid())

node/impl/full/wallet.go

@@ -32,7 +32,7 @@ func (a *WalletAPI) WalletList(ctx context.Context) ([]address.Address, error) {
 }
 
 func (a *WalletAPI) WalletBalance(ctx context.Context, addr address.Address) (types.BigInt, error) {
-	return a.StateManager.GetBalance(addr)
+	return a.StateManager.GetBalance(addr, nil)
 }
 
 func (a *WalletAPI) WalletSign(ctx context.Context, k address.Address, msg []byte) (*types.Signature, error) {