Merge remote-tracking branch 'origin/testnet/3' into feat/4stage-seal

api/api_storage.go

@@ -8,6 +8,9 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/specs-actors/actors/abi"
+
+	"github.com/filecoin-project/go-fil-markets/storagemarket"
+	"github.com/filecoin-project/lotus/chain/types"
 )
 
 // alias because cbor-gen doesn't like non-alias types
@@ -109,7 +112,18 @@ type StorageMiner interface {
 	/*// WorkerQueue registers a remote worker
 	WorkerQueue(context.Context, WorkerCfg) (<-chan WorkerTask, error)
 
-	WorkerDone(ctx context.Context, task uint64, res SealRes) error*/
+	// WorkerQueue registers a remote worker
+	WorkerQueue(context.Context, sectorbuilder.WorkerCfg) (<-chan sectorbuilder.WorkerTask, error)
+
+	WorkerDone(ctx context.Context, task uint64, res sectorbuilder.SealRes) error
+*/
+	MarketImportDealData(ctx context.Context, propcid cid.Cid, path string) error
+	MarketListDeals(ctx context.Context) ([]storagemarket.StorageDeal, error)
+	MarketListIncompleteDeals(ctx context.Context) ([]storagemarket.MinerDeal, error)
+	SetPrice(context.Context, types.BigInt) error
+
+	DealsImportData(ctx context.Context, dealPropCid cid.Cid, file string) error
+	DealsList(ctx context.Context) ([]storagemarket.StorageDeal, error)
 }
 
 type SealRes struct {