add functions needed to import data on the miner side

storagemarket/impl/provider.go

@@ -1,8 +1,11 @@
 package storageimpl
 
 import (
+	"bytes"
 	"context"
 	"errors"
+	"io"
+	"os"
 	"sync"
 
 	"github.com/ipfs/go-cid"
@@ -292,3 +295,50 @@ func (p *Provider) Stop() error {
 	<-p.stopped
 	return p.net.StopHandlingRequests()
 }
+
+func (p *Provider) ImportDataForDeal(ctx context.Context, propCid cid.Cid, data io.Reader) error {
+	// TODO: be able to check if we have enough disk space
+	var d MinerDeal
+	if err := p.deals.Get(propCid).Get(&d); err != nil {
+		return xerrors.Errorf("failed getting deal %s: %w", propCid, err)
+	}
+
+	tempfi, err := p.fs.CreateTemp()
+	if err != nil {
+		return xerrors.Errorf("failed to create temp file for data import: %w", err)
+	}
+
+	n, err := io.Copy(tempfi, data)
+	if err != nil {
+		return xerrors.Errorf("importing deal data failed: %w", err)
+	}
+	_ = n // TODO: verify n?
+
+	_, err = tempfi.Seek(0, os.SEEK_SET)
+	if err != nil {
+		return xerrors.Errorf("failed to seek through temp imported file: %w", err)
+	}
+
+	commP, err := p.pio.ReadPiece(tempfi)
+	if err != nil {
+		return xerrors.Errorf("failed to generate commP")
+	}
+
+	if !bytes.Equal(commP.Bytes(), d.Proposal.PieceRef) {
+		return xerrors.Errorf("given data does not match expected commP (got: %x, expected %x)", commP.Bytes(), d.Proposal.PieceRef)
+	}
+
+	select {
+	case p.updated <- minerDealUpdate{
+		newState: storagemarket.StorageDealPublishing,
+		id:       propCid,
+		mut: func(deal *MinerDeal) {
+			deal.PiecePath = tempfi.Path()
+		},
+	}:
+	case <-ctx.Done():
+		return ctx.Err()
+	}
+
+	return nil
+}

storagemarket/impl/provider_states.go

@@ -3,7 +3,6 @@ package storageimpl
 import (
 	"bytes"
 	"context"
-	"fmt"
 
 	"github.com/filecoin-project/go-padreader"
 	"github.com/ipfs/go-cid"
@@ -80,7 +79,8 @@ func (p *Provider) validating(ctx context.Context, deal MinerDeal) (func(*MinerD
 // State: StorageDealTransferring
 func (p *Provider) transferring(ctx context.Context, deal MinerDeal) (func(*MinerDeal), error) {
 	if deal.Ref.TransferType == storagemarket.TTManual {
-		return nil, fmt.Errorf("attempted to graphsync a deal marked as manual transfer")
+		log.Info("deal entering manual transfer state")
+		return nil, nil
 	}
 
 	ssb := builder.NewSelectorSpecBuilder(ipldfree.NodeBuilder())

storagemarket/types.go

@@ -16,7 +16,7 @@ import (
 	"github.com/filecoin-project/go-fil-markets/shared/types"
 )
 
-//go:generate cbor-gen-for ClientDeal MinerDeal StorageDeal Balance StorageDealProposal
+//go:generate cbor-gen-for ClientDeal MinerDeal StorageDeal Balance StorageDealProposal DataRef
 
 const DealProtocolID = "/fil/storage/mk/1.0.1"
 const AskProtocolID = "/fil/storage/ask/1.0.1"
@@ -207,6 +207,8 @@ type StorageProvider interface {
 
 	// GetStorageCollateral returns the current collateral balance
 	GetStorageCollateral(ctx context.Context) (Balance, error)
+
+	ImportDataForDeal(ctx context.Context, propCid cid.Cid, data io.Reader) error
 }
 
 // Node dependencies for a StorageProvider