Storage miner API improvements

node/impl/full/state.go

@@ -38,11 +38,11 @@ type StateAPI struct {
 	Chain        *store.ChainStore
 }
 
-func (a *StateAPI) StateMinerSectors(ctx context.Context, addr address.Address, ts *types.TipSet) ([]*api.SectorInfo, error) {
+func (a *StateAPI) StateMinerSectors(ctx context.Context, addr address.Address, ts *types.TipSet) ([]*api.ChainSectorInfo, error) {
 	return stmgr.GetMinerSectorSet(ctx, a.StateManager, ts, addr)
 }
 
-func (a *StateAPI) StateMinerProvingSet(ctx context.Context, addr address.Address, ts *types.TipSet) ([]*api.SectorInfo, error) {
+func (a *StateAPI) StateMinerProvingSet(ctx context.Context, addr address.Address, ts *types.TipSet) ([]*api.ChainSectorInfo, error) {
 	return stmgr.GetMinerProvingSet(ctx, a.StateManager, ts, addr)
 }
 

node/impl/storminer.go

@@ -21,6 +21,15 @@ type StorageMinerAPI struct {
 	Full  api.FullNode
 }
 
+func (sm *StorageMinerAPI) WorkerStats(context.Context) (api.WorkerStats, error) {
+	free, reserved, total := sm.SectorBuilder.WorkerStats()
+	return api.WorkerStats{
+		Free:     free,
+		Reserved: reserved,
+		Total:    total,
+	}, nil
+}
+
 func (sm *StorageMinerAPI) ActorAddress(context.Context) (address.Address, error) {
 	return sm.SectorBuilderConfig.Miner, nil
 }
@@ -29,13 +38,41 @@ func (sm *StorageMinerAPI) StoreGarbageData(ctx context.Context) error {
 	return sm.Miner.StoreGarbageData(ctx)
 }
 
-func (sm *StorageMinerAPI) SectorsStatus(ctx context.Context, sid uint64) (sectorbuilder.SectorSealingStatus, error) {
-	return sm.SectorBuilder.SealStatus(sid)
+func (sm *StorageMinerAPI) SectorsStatus(ctx context.Context, sid uint64) (api.SectorInfo, error) {
+	info, err := sm.Miner.GetSectorInfo(sid)
+	if err != nil {
+		return api.SectorInfo{}, err
+	}
+
+	deals := make([]uint64, len(info.Pieces))
+	for i, piece := range info.Pieces {
+		deals[i] = piece.DealID
+	}
+
+	return api.SectorInfo{
+		SectorID: sid,
+		State:    info.State,
+		CommD:    info.CommD,
+		CommR:    info.CommR,
+		Proof:    info.Proof,
+		Deals:    deals,
+		Ticket:   info.Ticket.SB(),
+		Seed:     info.Seed.SB(),
+	}, nil
 }
 
 // List all staged sectors
 func (sm *StorageMinerAPI) SectorsList(context.Context) ([]uint64, error) {
-	return sm.SectorBuilder.GetAllStagedSectors()
+	sectors, err := sm.Miner.ListSectors()
+	if err != nil {
+		return nil, err
+	}
+
+	out := make([]uint64, len(sectors))
+	for i, sector := range sectors {
+		out[i] = sector.SectorID
+	}
+	return out, nil
 }
 
 func (sm *StorageMinerAPI) SectorsRefs(context.Context) (map[string][]api.SealedRef, error) {