WIP: expanding API to serve post producer needs

api/api.go

@@ -53,6 +53,7 @@ type FullNode interface {
 	ChainGetBlock(context.Context, cid.Cid) (*types.BlockHeader, error)
 	ChainGetBlockMessages(context.Context, cid.Cid) (*BlockMessages, error)
 	ChainGetBlockReceipts(context.Context, cid.Cid) ([]*types.MessageReceipt, error)
+	ChainGetTipSetByHeight(context.Context, uint64, *types.TipSet) (*types.TipSet, error)
 
 	// messages
 
@@ -101,15 +102,18 @@ type FullNode interface {
 
 	//ClientListAsks() []Ask
 
+	// if tipset is nil, we'll use heaviest
+	StateCall(context.Context, *types.Message, *types.TipSet) (*types.MessageReceipt, error)
+	StateGetActor(ctx context.Context, actor address.Address, ts *types.TipSet) (*types.Actor, error)
+	StateReadState(ctx context.Context, act *types.Actor, ts *types.TipSet) (*ActorState, error)
+
 	StateMinerSectors(context.Context, address.Address) ([]*SectorInfo, error)
 	StateMinerProvingSet(context.Context, address.Address) ([]*SectorInfo, error)
 	StateMinerPower(context.Context, address.Address, *types.TipSet) (MinerPower, error)
 	StateMinerWorker(context.Context, address.Address, *types.TipSet) (address.Address, error)
 	StateMinerPeerID(ctx context.Context, m address.Address, ts *types.TipSet) (peer.ID, error)
-	// if tipset is nil, we'll use heaviest
+	StateMinerProvingPeriodEnd(ctx context.Context, actor address.Address, ts *types.TipSet) (uint64, error)
-	StateCall(context.Context, *types.Message, *types.TipSet) (*types.MessageReceipt, error)
+	StateMinerProvingSet(ctx context.Context, actor address.Address, ts *types.TipSet) ([]SectorSetEntry, error)
-	StateGetActor(ctx context.Context, actor address.Address, ts *types.TipSet) (*types.Actor, error)
-	StateReadState(ctx context.Context, act *types.Actor, ts *types.TipSet) (*ActorState, error)
 
 	PaychGet(ctx context.Context, from, to address.Address, ensureFunds types.BigInt) (*ChannelInfo, error)
 	PaychList(context.Context) ([]address.Address, error)
@@ -269,3 +273,9 @@ type RetrievalOrder struct {
 	Miner       address.Address
 	MinerPeerID peer.ID
 }
+
+type SectorSetEntry struct {
+	SectorID uint64
+	CommR    []byte
+	CommD    []byte
+}

api/struct.go

@@ -39,14 +39,15 @@ type FullNodeStruct struct {
 	CommonStruct
 
 	Internal struct {
-		ChainNotify           func(context.Context) (<-chan *store.HeadChange, error)                    `perm:"read"`
+		ChainNotify            func(context.Context) (<-chan *store.HeadChange, error)                    `perm:"read"`
-		ChainSubmitBlock      func(ctx context.Context, blk *chain.BlockMsg) error                       `perm:"write"`
+		ChainSubmitBlock       func(ctx context.Context, blk *chain.BlockMsg) error                       `perm:"write"`
-		ChainHead             func(context.Context) (*types.TipSet, error)                               `perm:"read"`
+		ChainHead              func(context.Context) (*types.TipSet, error)                               `perm:"read"`
-		ChainGetRandomness    func(context.Context, *types.TipSet, []*types.Ticket, int) ([]byte, error) `perm:"read"`
+		ChainGetRandomness     func(context.Context, *types.TipSet, []*types.Ticket, int) ([]byte, error) `perm:"read"`
-		ChainWaitMsg          func(context.Context, cid.Cid) (*MsgWait, error)                           `perm:"read"`
+		ChainWaitMsg           func(context.Context, cid.Cid) (*MsgWait, error)                           `perm:"read"`
-		ChainGetBlock         func(context.Context, cid.Cid) (*types.BlockHeader, error)                 `perm:"read"`
+		ChainGetBlock          func(context.Context, cid.Cid) (*types.BlockHeader, error)                 `perm:"read"`
-		ChainGetBlockMessages func(context.Context, cid.Cid) (*BlockMessages, error)                     `perm:"read"`
+		ChainGetBlockMessages  func(context.Context, cid.Cid) (*BlockMessages, error)                     `perm:"read"`
-		ChainGetBlockReceipts func(context.Context, cid.Cid) ([]*types.MessageReceipt, error)            `perm:"read"`
+		ChainGetBlockReceipts  func(context.Context, cid.Cid) ([]*types.MessageReceipt, error)            `perm:"read"`
+		ChainGetTipSetByHeight func(context.Context, uint64, *types.TipSet) (*types.TipSet, error)        `perm:"read"`
 
 		MpoolPending     func(context.Context, *types.TipSet) ([]*types.SignedMessage, error) `perm:"read"`
 		MpoolPush        func(context.Context, *types.SignedMessage) error                    `perm:"write"`
@@ -75,14 +76,16 @@ type FullNodeStruct struct {
 		ClientRetrieve    func(ctx context.Context, order RetrievalOrder, path string) error                                                          `perm:"admin"`
 		ClientQueryAsk    func(ctx context.Context, p peer.ID, miner address.Address) (*types.SignedStorageAsk, error)                                `perm:"read"`
 
-		StateMinerSectors    func(context.Context, address.Address) ([]*SectorInfo, error)                       `perm:"read"`
+		StateMinerSectors          func(context.Context, address.Address) ([]*SectorInfo, error)                                `perm:"read"`
-		StateMinerProvingSet func(context.Context, address.Address) ([]*SectorInfo, error)                       `perm:"read"`
+		StateMinerProvingSet       func(context.Context, address.Address) ([]*SectorInfo, error)                                `perm:"read"`
-		StateMinerPower      func(context.Context, address.Address, *types.TipSet) (MinerPower, error)           `perm:"read"`
+		StateMinerPower            func(context.Context, address.Address, *types.TipSet) (MinerPower, error)                    `perm:"read"`
-		StateMinerWorker     func(context.Context, address.Address, *types.TipSet) (address.Address, error)      `perm:"read"`
+		StateMinerWorker           func(context.Context, address.Address, *types.TipSet) (address.Address, error)               `perm:"read"`
-		StateMinerPeerID     func(ctx context.Context, m address.Address, ts *types.TipSet) (peer.ID, error)     `perm:"read"`
+		StateMinerPeerID           func(ctx context.Context, m address.Address, ts *types.TipSet) (peer.ID, error)              `perm:"read"`
-		StateCall            func(context.Context, *types.Message, *types.TipSet) (*types.MessageReceipt, error) `perm:"read"`
+		StateMinerProvingPeriodEnd func(ctx context.Context, actor address.Address, ts *types.TipSet) (uint64, error)           `perm:"read"`
-		StateGetActor        func(context.Context, address.Address, *types.TipSet) (*types.Actor, error)         `perm:"read"`
+		StateMinerProvingSet       func(ctx context.Context, actor address.Address, ts *types.TipSet) ([]SectorSetEntry, error) `perm:"read"`
-		StateReadState       func(context.Context, *types.Actor, *types.TipSet) (*ActorState, error)             `perm:"read"`
+		StateCall                  func(context.Context, *types.Message, *types.TipSet) (*types.MessageReceipt, error)          `perm:"read"`
+		StateGetActor              func(context.Context, address.Address, *types.TipSet) (*types.Actor, error)                  `perm:"read"`
+		StateReadState             func(context.Context, *types.Actor, *types.TipSet) (*ActorState, error)                      `perm:"read"`
 
 		PaychGet                   func(ctx context.Context, from, to address.Address, ensureFunds types.BigInt) (*ChannelInfo, error)                                                      `perm:"sign"`
 		PaychList                  func(context.Context) ([]address.Address, error)                                                                                                         `perm:"read"`
@@ -230,6 +233,10 @@ func (c *FullNodeStruct) ChainWaitMsg(ctx context.Context, msgc cid.Cid) (*MsgWa
 	return c.Internal.ChainWaitMsg(ctx, msgc)
 }
 
+func (c *FullNodeStruct) ChainGetTipSetByHeight(ctx context.Context, h uint64, ts *types.TipSet) (*types.TipSet, error) {
+	return c.Internal.ChainGetTipSetByHeight(ctx, h, ts)
+}
+
 func (c *FullNodeStruct) WalletNew(ctx context.Context, typ string) (address.Address, error) {
 	return c.Internal.WalletNew(ctx, typ)
 }
@@ -297,6 +304,13 @@ func (c *FullNodeStruct) StateMinerWorker(ctx context.Context, m address.Address
 func (c *FullNodeStruct) StateMinerPeerID(ctx context.Context, m address.Address, ts *types.TipSet) (peer.ID, error) {
 	return c.Internal.StateMinerPeerID(ctx, m, ts)
 }
+func (c *FullNodeStruct) StateMinerProvingPeriodEnd(ctx context.Context, actor address.Address, ts *types.TipSet) (uint64, error) {
+	return c.Internal.StateMinerProvingPeriodEnd(ctx, actor, ts)
+}
+
+func (c *FullNodeStruct) StateMinerProvingSet(ctx context.Context, actor address.Address, ts *types.TipSet) ([]SectorSetEntry, error) {
+	return c.Internal.StateMinerProvingSet(ctx, actor, ts)
+}
 
 func (c *FullNodeStruct) StateCall(ctx context.Context, msg *types.Message, ts *types.TipSet) (*types.MessageReceipt, error) {
 	return c.Internal.StateCall(ctx, msg, ts)

chain/stmgr/utils.go

@@ -137,13 +137,7 @@ func GetMinerProvingPeriodEnd(ctx context.Context, sm *StateManager, ts *types.T
 	return mas.ProvingPeriodEnd, nil
 }
 
-type SectorSetEntry struct {
+func GetMinerProvingSet(ctx context.Context, sm *StateManager, ts *types.TipSet, maddr address.Address) ([]api.SectorSetEntry, error) {
-	SectorID uint64
-	CommR    []byte
-	CommD    []byte
-}
-
-func GetMinerProvingSet(ctx context.Context, sm *StateManager, ts *types.TipSet, maddr address.Address) ([]SectorSetEntry, error) {
 	var mas actors.StorageMinerActorState
 	_, err := sm.LoadActorState(ctx, maddr, &mas, ts)
 	if err != nil {
@@ -156,13 +150,13 @@ func GetMinerProvingSet(ctx context.Context, sm *StateManager, ts *types.TipSet,
 		return nil, err
 	}
 
-	var sset []SectorSetEntry
+	var sset []api.SectorSetEntry
 	if err := a.ForEach(func(i uint64, v *cbg.Deferred) error {
 		var comms [][]byte
 		if err := cbor.DecodeInto(v.Raw, &comms); err != nil {
 			return err
 		}
-		sset = append(sset, SectorSetEntry{
+		sset = append(sset, api.SectorSetEntry{
 			SectorID: i,
 			CommR:    comms[0],
 			CommD:    comms[1],

node/impl/full/chain.go

@@ -108,3 +108,7 @@ func (a *ChainAPI) ChainGetBlockReceipts(ctx context.Context, bcid cid.Cid) ([]*
 
 	return out, nil
 }
+
+func (a *ChainAPI) ChainGetTipSetByHeight(ctx context.Context, h uint64, ts *types.TipSet) (*types.TipSet, error) {
+	panic("NYI")
+}

node/impl/full/state.go

@@ -190,6 +190,13 @@ func (a *StateAPI) StateMinerPeerID(ctx context.Context, m address.Address, ts *
 	return stmgr.GetMinerPeerID(ctx, a.StateManager, ts, m)
 }
 
+func (a *StateAPI) StateMinerProvingPeriodEnd(ctx context.Context, actor address.Address, ts *types.TipSet) (uint64, error) {
+	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)
 }

storage/miner.go

@@ -44,12 +44,17 @@ type storageMinerApi interface {
 
 	// Call a read only method on actors (no interaction with the chain required)
 	StateCall(ctx context.Context, msg *types.Message, ts *types.TipSet) (*types.MessageReceipt, error)
+	StateMinerWorker(ctx context.Context, address.Address, ts *types.TipSet) (address.Address, error)
+	StateMinerProvingPeriodEnd(ctx context.Context, actor address.Address, ts *types.TipSet) (uint64, error)
+	StateMinerProvingSet(ctx context.Context, actor address.Address, ts *types.TipSet) ([]api.SectorSetEntry, error)
 
 	MpoolPush(context.Context, *types.SignedMessage) error
 	MpoolGetNonce(context.Context, address.Address) (uint64, error)
 
 	ChainWaitMsg(context.Context, cid.Cid) (*api.MsgWait, error)
 	ChainNotify(context.Context) (<-chan *store.HeadChange, error)
+	ChainGetRandomness(context.Context, ts *types.TipSet, []*types.Ticket, int) ([]byte, error)
+	ChainGetTipSetByHeight(context.Context, uint64, *types.TipSet) (*types.TipSet, error)
 
 	WalletBalance(context.Context, address.Address) (types.BigInt, error)
 	WalletSign(context.Context, address.Address, []byte) (*types.Signature, error)
@@ -204,12 +209,47 @@ func (m *Miner) runPoSt(ctx context.Context) {
 	}
 }
 
-func (m *Miner) maybeDoPost(ctx context.Context, ts *types.TipSet) (<-chan error, *types.BlockHeader) {
+func (m *Miner) maybeDoPost(ctx context.Context, ts *types.TipSet) (<-chan error, *types.BlockHeader, error) {
+	ppe, err := m.api.StateMinerProvingPeriodEnd(ctx, m.actor, ts)
+	if err != nil {
+		return nil, nil, xerrors.Errorf("failed to get proving period end for miner: %w", err)
+	}
 
+	if ppe < ts.Height() {
+		return nil, nil, nil
+	}
+
+	sset, err := m.api.StateMinerProvingSet(ctx, m.actor, ts)
+	if err != nil {
+		return nil, nil, xerrors.Errorf("failed to get proving set for miner: %w", err)
+	}
+
+	r, err := m.api.ChainGetRandomness(ctx, ts, nil,  ts.Height() - ppe)
+	if err != nil {
+		return nil, nil, xerrors.Errorf("failed to get chain randomness for post: %w", err)
+	}
+
+	sourceTs, err := m.api.ChainGetTipSetByHeight(ctx, ppe, ts)
+	if err != nil {
+		return nil, nil, xerrors.Errorf("failed to get post start tipset: %w", err)
+	}
+
+	ret := make(chan error, 1)
+	go func() {
+	proof, err := s.secst.RunPoSt(ctx, sset, r)
+	if err != nil {
+		ret <- xerrors.Errorf("running post failed: %w", err)
+		return
+	}
+
+	panic("submit post maybe?")
+}()
+
+	return ret, sourceTs.MinTicketBlock(), nil
 }
 
 func (m *Miner) runPreflightChecks(ctx context.Context) error {
-	worker, err := m.getWorkerAddr(ctx)
+	worker, err := m.api.StateMinerWorker(ctx, m.maddr, nil)
 	if err != nil {
 		return err
 	}
@@ -229,22 +269,3 @@ func (m *Miner) runPreflightChecks(ctx context.Context) error {
 	return nil
 }
 
-func (m *Miner) getWorkerAddr(ctx context.Context) (address.Address, error) {
-	msg := &types.Message{
-		To:     m.maddr,
-		From:   m.maddr, // it doesnt like it if we dont give it a from... probably should fix that
-		Method: actors.MAMethods.GetWorkerAddr,
-		Params: nil,
-	}
-
-	recpt, err := m.api.StateCall(ctx, msg, nil)
-	if err != nil {
-		return address.Undef, errors.Wrapf(err, "calling getWorker(%s)", m.maddr)
-	}
-
-	if recpt.ExitCode != 0 {
-		return address.Undef, fmt.Errorf("failed to call getWorker(%s): return %d", m.maddr, recpt.ExitCode)
-	}
-
-	return address.NewFromBytes(recpt.Return)
-}

storage/sector/store.go

@@ -8,6 +8,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/filecoin-project/go-lotus/api"
 	"github.com/filecoin-project/go-lotus/lib/sectorbuilder"
 
 	logging "github.com/ipfs/go-log"
@@ -162,6 +163,10 @@ func (s *Store) WaitSeal(ctx context.Context, sector uint64) (sectorbuilder.Sect
 	return s.sb.SealStatus(sector)
 }
 
+func (s *Store) RunPoSt(ctx context.Context, sectors []api.SectorSetEntry, r []byte) ([]byte, error) {
+	panic("NYI")
+}
+
 func (s *Store) Stop() {
 	close(s.closeCh)
 }