feat(storagemarket): initial extraction

Types for storage market

Modify deals.Provider to implement storagemarket.StorageProvider

Inject storagemarket.StorageProvider

Storage Provider interfaces

Storage Client interfaces

Add ValidatePublishedDeal to ClientNodeAdapter

Remove FundManager from client

Remove Wallet from client

Remove StateManager, Events, Wallet from client

Rebasing

- Copy types.BigInt, use TokenAmount/BigInt for token amounts
- Remove auto-imported log package
- Move `checkAskSignature` to a client file.
- Plumb contexts through

fix(storagemarket): use publish cids

Switch back to publish message cids to reduce the dependency surface area

node/builder.go

@@ -47,6 +47,8 @@ import (
 	"github.com/filecoin-project/lotus/retrieval/discovery"
 	"github.com/filecoin-project/lotus/storage"
 	"github.com/filecoin-project/lotus/storage/sectorblocks"
+	"github.com/filecoin-project/lotus/storagemarket"
+	"github.com/filecoin-project/lotus/storagemarketadapter"
 )
 
 // special is a type used to give keys to modules which
@@ -227,7 +229,8 @@ func Online() Option {
 			Override(new(dtypes.ClientDealStore), modules.NewClientDealStore),
 			Override(new(dtypes.ClientDataTransfer), modules.NewClientDAGServiceDataTransfer),
 			Override(new(*deals.ClientRequestValidator), deals.NewClientRequestValidator),
-			Override(new(*deals.Client), deals.NewClient),
+			Override(new(storagemarket.StorageClient), deals.NewClient),
+			Override(new(storagemarket.StorageClientNode), storagemarketadapter.NewClientNodeAdapter),
 			Override(RegisterClientValidatorKey, modules.RegisterClientValidator),
 			Override(RunDealClientKey, modules.RunDealClient),
 
@@ -250,7 +253,8 @@ func Online() Option {
 			Override(new(dtypes.ProviderDealStore), modules.NewProviderDealStore),
 			Override(new(dtypes.ProviderDataTransfer), modules.NewProviderDAGServiceDataTransfer),
 			Override(new(*deals.ProviderRequestValidator), deals.NewProviderRequestValidator),
-			Override(new(*deals.Provider), deals.NewProvider),
+			Override(new(storagemarket.StorageProvider), deals.NewProvider),
+			Override(new(storagemarket.StorageProviderNode), storagemarketadapter.NewProviderNodeAdapter),
 			Override(RegisterProviderValidatorKey, modules.RegisterProviderValidator),
 			Override(HandleRetrievalKey, modules.HandleRetrieval),
 			Override(GetParamsKey, modules.GetParams),

node/impl/client/client.go

@@ -27,13 +27,13 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
-	"github.com/filecoin-project/lotus/chain/deals"
 	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/node/impl/full"
 	"github.com/filecoin-project/lotus/node/impl/paych"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	retrievalmarket "github.com/filecoin-project/lotus/retrieval"
+	"github.com/filecoin-project/lotus/storagemarket"
 )
 
 type API struct {
@@ -44,7 +44,7 @@ type API struct {
 	full.WalletAPI
 	paych.PaychAPI
 
-	DealClient   *deals.Client
+	SMDealClient storagemarket.StorageClient
 	RetDiscovery retrievalmarket.PeerResolver
 	Retrieval    retrievalmarket.RetrievalClient
 	Chain        *store.ChainStore
@@ -72,28 +72,30 @@ func (a *API) ClientStartDeal(ctx context.Context, data cid.Cid, addr address.Ad
 	if err != nil {
 		return nil, xerrors.Errorf("failed getting miner worker: %w", err)
 	}
-
-	proposal := deals.ClientDealProposal{
-		Data:               data,
-		PricePerEpoch:      epochPrice,
-		ProposalExpiration: math.MaxUint64, // TODO: set something reasonable
-		Duration:           blocksDuration,
-		Client:             addr,
-		ProviderAddress:    miner,
-		MinerWorker:        mw,
-		MinerID:            pid,
+	providerInfo := storagemarket.StorageProviderInfo{
+		Address: miner,
+		Worker:  mw,
+		PeerID:  pid,
 	}
+	result, err := a.SMDealClient.ProposeStorageDeal(
+		ctx,
+		addr,
+		&providerInfo,
+		data,
+		storagemarket.Epoch(math.MaxUint64),
+		storagemarket.Epoch(blocksDuration),
+		storagemarket.TokenAmount(epochPrice),
+		storagemarket.TokenAmount(storagemarket.EmptyInt))
 
-	c, err := a.DealClient.Start(ctx, proposal)
 	if err != nil {
 		return nil, xerrors.Errorf("failed to start deal: %w", err)
 	}
 
-	return &c, nil
+	return &result.ProposalCid, nil
 }
 
 func (a *API) ClientListDeals(ctx context.Context) ([]api.DealInfo, error) {
-	deals, err := a.DealClient.List()
+	deals, err := a.SMDealClient.ListInProgressDeals(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -117,10 +119,11 @@ func (a *API) ClientListDeals(ctx context.Context) ([]api.DealInfo, error) {
 }
 
 func (a *API) ClientGetDealInfo(ctx context.Context, d cid.Cid) (*api.DealInfo, error) {
-	v, err := a.DealClient.GetDeal(d)
+	v, err := a.SMDealClient.GetInProgressDeal(ctx, d)
 	if err != nil {
 		return nil, err
 	}
+
 	return &api.DealInfo{
 		ProposalCid:   v.ProposalCid,
 		State:         v.State,
@@ -315,5 +318,6 @@ func (a *API) ClientRetrieve(ctx context.Context, order api.RetrievalOrder, path
 }
 
 func (a *API) ClientQueryAsk(ctx context.Context, p peer.ID, miner address.Address) (*types.SignedStorageAsk, error) {
-	return a.DealClient.QueryAsk(ctx, p, miner)
+	info := storagemarket.StorageProviderInfo{Address: miner, PeerID: p}
+	return a.SMDealClient.GetAsk(ctx, info)
 }

node/modules/services.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/filecoin-project/lotus/chain"
 	"github.com/filecoin-project/lotus/chain/blocksync"
-	"github.com/filecoin-project/lotus/chain/deals"
 	"github.com/filecoin-project/lotus/chain/messagepool"
 	"github.com/filecoin-project/lotus/chain/sub"
 	"github.com/filecoin-project/lotus/node/hello"
@@ -18,6 +17,7 @@ import (
 	"github.com/filecoin-project/lotus/peermgr"
 	retrievalmarket "github.com/filecoin-project/lotus/retrieval"
 	"github.com/filecoin-project/lotus/retrieval/discovery"
+	"github.com/filecoin-project/lotus/storagemarket"
 )
 
 func RunHello(mctx helpers.MetricsCtx, lc fx.Lifecycle, h host.Host, svc *hello.Service) {
@@ -66,7 +66,7 @@ func HandleIncomingMessages(mctx helpers.MetricsCtx, lc fx.Lifecycle, pubsub *pu
 	go sub.HandleIncomingMessages(ctx, mpool, msgsub)
 }
 
-func RunDealClient(mctx helpers.MetricsCtx, lc fx.Lifecycle, c *deals.Client) {
+func RunDealClient(mctx helpers.MetricsCtx, lc fx.Lifecycle, c storagemarket.StorageClient) {
 	ctx := helpers.LifecycleCtx(mctx, lc)
 
 	lc.Append(fx.Hook{

node/modules/storageminer.go

@@ -40,6 +40,7 @@ import (
 	"github.com/filecoin-project/lotus/retrievaladapter"
 	"github.com/filecoin-project/lotus/storage"
 	"github.com/filecoin-project/lotus/storage/sectorblocks"
+	"github.com/filecoin-project/lotus/storagemarket"
 )
 
 func minerAddrFromDS(ds dtypes.MetadataDS) (address.Address, error) {
@@ -127,14 +128,12 @@ func HandleRetrieval(host host.Host, lc fx.Lifecycle, m retrievalmarket.Retrieva
 	})
 }
 
-func HandleDeals(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, h *deals.Provider) {
+func HandleDeals(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, h storagemarket.StorageProvider) {
 	ctx := helpers.LifecycleCtx(mctx, lc)
 
 	lc.Append(fx.Hook{
 		OnStart: func(context.Context) error {
-			h.Run(ctx)
-			host.SetStreamHandler(deals.DealProtocolID, h.HandleStream)
-			host.SetStreamHandler(deals.AskProtocolID, h.HandleAskStream)
+			h.Run(ctx, host)
 			return nil
 		},
 		OnStop: func(context.Context) error {