integrate client interface to allow for offline deals

node/impl/client/client.go

@@ -58,7 +58,7 @@ type API struct {
 	Filestore  dtypes.ClientFilestore `optional:"true"`
 }
 
-func (a *API) ClientStartDeal(ctx context.Context, data cid.Cid, addr address.Address, miner address.Address, epochPrice types.BigInt, blocksDuration uint64) (*cid.Cid, error) {
+func (a *API) ClientStartDeal(ctx context.Context, data *storagemarket.DataRef, addr address.Address, miner address.Address, epochPrice types.BigInt, blocksDuration uint64) (*cid.Cid, error) {
 	exist, err := a.WalletHas(ctx, addr)
 	if err != nil {
 		return nil, xerrors.Errorf("failed getting addr from wallet: %w", addr)
@@ -96,10 +96,7 @@ func (a *API) ClientStartDeal(ctx context.Context, data cid.Cid, addr address.Ad
 		ctx,
 		addr,
 		&providerInfo,
-		&storagemarket.DataRef{
-			TransferType: storagemarket.TTGraphsync,
-			Root:         data,
-		},
+		data,
 		ts.Height()+dealStartBuffer,
 		ts.Height()+dealStartBuffer+abi.ChainEpoch(blocksDuration),
 		epochPrice,
@@ -332,7 +329,7 @@ func (a *API) ClientRetrieve(ctx context.Context, order api.RetrievalOrder, path
 		return xerrors.New("Retrieval Timed Out")
 	case err := <-retrievalResult:
 		if err != nil {
-			return xerrors.Errorf("Retrieve: %w", err)
+			return xerrors.Errorf("RetrieveUnixfs: %w", err)
 		}
 	}
 

node/impl/storminer.go

@@ -10,12 +10,15 @@ import (
 	"strconv"
 
 	"github.com/filecoin-project/lotus/chain/types"
-
 	"github.com/filecoin-project/specs-actors/actors/abi"
+
 	"github.com/gorilla/mux"
+	"github.com/ipfs/go-cid"
 	files "github.com/ipfs/go-ipfs-files"
+	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
+	storagemarket "github.com/filecoin-project/go-fil-markets/storagemarket"
 	"github.com/filecoin-project/go-sectorbuilder"
 	"github.com/filecoin-project/go-sectorbuilder/fs"
 
@@ -34,9 +37,10 @@ type StorageMinerAPI struct {
 	SectorBuilder       sectorbuilder.Interface
 	SectorBlocks        *sectorblocks.SectorBlocks
 
-	Miner      *storage.Miner
-	BlockMiner *miner.Miner
-	Full       api.FullNode
+	StorageProvider storagemarket.StorageProvider
+	Miner           *storage.Miner
+	BlockMiner      *miner.Miner
+	Full            api.FullNode
 }
 
 func (sm *StorageMinerAPI) ServeRemote(w http.ResponseWriter, r *http.Request) {
@@ -261,4 +265,26 @@ func (sm *StorageMinerAPI) WorkerDone(ctx context.Context, task uint64, res sect
 	return sm.SectorBuilder.TaskDone(ctx, task, res)
 }
 
+func (sm *StorageMinerAPI) MarketImportDealData(ctx context.Context, propCid cid.Cid, path string) error {
+	fi, err := os.Open(path)
+	if err != nil {
+		return xerrors.Errorf("failed to open file: %w", err)
+	}
+	defer fi.Close()
+
+	return sm.StorageProvider.ImportDataForDeal(ctx, propCid, fi)
+}
+
+func (sm *StorageMinerAPI) MarketListDeals(ctx context.Context) ([]storagemarket.StorageDeal, error) {
+	return sm.StorageProvider.ListDeals(ctx)
+}
+
+func (sm *StorageMinerAPI) MarketListIncompleteDeals(ctx context.Context) ([]storagemarket.MinerDeal, error) {
+	return sm.StorageProvider.ListIncompleteDeals()
+}
+
+func (sm *StorageMinerAPI) SetPrice(ctx context.Context, p types.BigInt) error {
+	return sm.StorageProvider.AddAsk(abi.TokenAmount(p), 60*60*24*100) // lasts for 100 days?
+}
+
 var _ api.StorageMiner = &StorageMinerAPI{}