Consolidate import-data commands into one (#594)

* feat: consolidate import-data commands into one

* Update cmd/boostd/import_data.go

Co-authored-by: Anton Evangelatov <[email protected]>

* Update cmd/boostd/import_data.go

Co-authored-by: Anton Evangelatov <[email protected]>

Co-authored-by: Anton Evangelatov <[email protected]>

Author: dirkmc

api/api.go

@@ -36,6 +36,7 @@ type Boost interface {
 	BoostIndexerAnnounceAllDeals(ctx context.Context) error                                                                        //perm:admin
 	BoostOfflineDealWithData(ctx context.Context, dealUuid uuid.UUID, filePath string) (*ProviderDealRejectionInfo, error)         //perm:admin
 	BoostDeal(ctx context.Context, dealUuid uuid.UUID) (*smtypes.ProviderDealState, error)                                         //perm:admin
+	BoostDealBySignedProposalCid(ctx context.Context, proposalCid cid.Cid) (*smtypes.ProviderDealState, error)                     //perm:admin
 	BoostDummyDeal(context.Context, smtypes.DealParams) (*ProviderDealRejectionInfo, error)                                        //perm:admin
 	BoostDagstoreRegisterShard(ctx context.Context, key string) error                                                              //perm:admin
 	BoostDagstoreInitializeShard(ctx context.Context, key string) error                                                            //perm:admin

api/proxy_gen.go

@@ -2,49 +2,77 @@ package main
 
 import (
 	"fmt"
+	"github.com/ipfs/go-cid"
+	"strings"
 
 	bcli "github.com/filecoin-project/boost/cli"
 	"github.com/google/uuid"
 	"github.com/urfave/cli/v2"
 )
 
 var importDataCmd = &cli.Command{
-	Name:  "import-data",
-	Usage: "Import data for offline deal made with Boost",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:     "deal-uuid",
-			Usage:    "uuid of the offline deal",
-			Required: true,
-		},
-		&cli.StringFlag{
-			Name:     "filepath",
-			Usage:    "path of the file containing the offline deal data",
-			Required: true,
-		},
-	},
+	Name:      "import-data",
+	Usage:     "Import data for offline deal made with Boost",
+	ArgsUsage: "<proposal CID> <file> or <deal UUID> <file>",
 	Action: func(cctx *cli.Context) error {
+		if cctx.Args().Len() < 2 {
+			return fmt.Errorf("must specify proposal CID / deal UUID and file path")
+		}
+
+		id := cctx.Args().Get(0)
+		filePath := cctx.Args().Get(1)
+
+		// Parse the first parameter as a deal UUID or a proposal CID
+		var proposalCid *cid.Cid
+		dealUuid, err := uuid.Parse(id)
+		if err != nil {
+			propCid, err := cid.Decode(id)
+			if err != nil {
+				return fmt.Errorf("could not parse '%s' as deal uuid or proposal cid", id)
+			}
+			proposalCid = &propCid
+		}
+
 		napi, closer, err := bcli.GetBoostAPI(cctx)
 		if err != nil {
 			return err
 		}
 		defer closer()
 
-		filePath := cctx.String("filepath")
-		id := cctx.String("deal-uuid")
+		// If the user has supplied a signed proposal cid
+		if proposalCid != nil {
+			// Look up the deal in the boost database
+			deal, err := napi.BoostDealBySignedProposalCid(cctx.Context, *proposalCid)
+			if err != nil {
+				// If the error is anything other than a Not Found error,
+				// return the error
+				if !strings.Contains(err.Error(), "not found") {
+					return err
+				}
 
-		dealUuid, err := uuid.Parse(id)
-		if err != nil {
-			return fmt.Errorf("failed to parse deal uuid '%s'", id)
+				// The deal is not in the boost database, try the legacy
+				// markets datastore (v1.1.0 deal)
+				err := napi.MarketImportDealData(cctx.Context, *proposalCid, filePath)
+				if err != nil {
+					return fmt.Errorf("couldnt import v1.1.0 deal, or find boost deal: %w", err)
+				}
+				fmt.Printf("Offline deal import for v1.1.0 deal %s scheduled for execution\n", proposalCid.String())
+				return nil
+			}
+
+			// Get the deal UUID from the deal
+			dealUuid = deal.DealUuid
 		}
+
+		// Deal proposal by deal uuid (v1.2.0 deal)
 		rej, err := napi.BoostOfflineDealWithData(cctx.Context, dealUuid, filePath)
 		if err != nil {
 			return fmt.Errorf("failed to execute offline deal: %w", err)
 		}
 		if rej != nil && rej.Reason != "" {
 			return fmt.Errorf("offline deal %s rejected: %s", dealUuid, rej.Reason)
 		}
-		fmt.Println("Offline deal accepted and scheduled for execution")
+		fmt.Printf("Offline deal import for v1.2.0 deal %s scheduled for execution\n", dealUuid)
 		return nil
 	},
 }

build/openrpc/boost.json.gz

@@ -40,7 +40,6 @@ func main() {
 			backupCmd,
 			restoreCmd,
 			dummydealCmd,
-			storageDealsCmd,
 			dataTransfersCmd,
 			retrievalDealsCmd,
 			indexProvCmd,

cmd/boostd/import_data.go

@@ -12,6 +12,7 @@
   * [BoostDagstoreRecoverShard](#boostdagstorerecovershard)
   * [BoostDagstoreRegisterShard](#boostdagstoreregistershard)
   * [BoostDeal](#boostdeal)
+  * [BoostDealBySignedProposalCid](#boostdealbysignedproposalcid)
   * [BoostDummyDeal](#boostdummydeal)
   * [BoostIndexerAnnounceAllDeals](#boostindexerannouncealldeals)
   * [BoostOfflineDealWithData](#boostofflinedealwithdata)
@@ -296,6 +297,71 @@ Response:
 }
 ```
 
+### BoostDealBySignedProposalCid
+
+
+Perms: admin
+
+Inputs:
+```json
+[
+  {
+    "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+  }
+]
+```
+
+Response:
+```json
+{
+  "DealUuid": "07070707-0707-0707-0707-070707070707",
+  "CreatedAt": "0001-01-01T00:00:00Z",
+  "ClientDealProposal": {
+    "Proposal": {
+      "PieceCID": {
+        "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+      },
+      "PieceSize": 1032,
+      "VerifiedDeal": true,
+      "Client": "f01234",
+      "Provider": "f01234",
+      "Label": "string value",
+      "StartEpoch": 10101,
+      "EndEpoch": 10101,
+      "StoragePricePerEpoch": "0",
+      "ProviderCollateral": "0",
+      "ClientCollateral": "0"
+    },
+    "ClientSignature": {
+      "Type": 2,
+      "Data": "Ynl0ZSBhcnJheQ=="
+    }
+  },
+  "IsOffline": true,
+  "ClientPeerID": "12D3KooWGzxzKZYveHXtpG6AsrUJBcWxHBFS2HsEoGTxrMLvKXtf",
+  "DealDataRoot": {
+    "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+  },
+  "InboundFilePath": "string value",
+  "Transfer": {
+    "Type": "string value",
+    "ClientID": "string value",
+    "Params": "Ynl0ZSBhcnJheQ==",
+    "Size": 42
+  },
+  "ChainDealID": 5432,
+  "PublishCID": null,
+  "SectorID": 9,
+  "Offset": 1032,
+  "Length": 1032,
+  "Checkpoint": 1,
+  "CheckpointAt": "0001-01-01T00:00:00Z",
+  "Err": "string value",
+  "Retry": "auto",
+  "NBytesReceived": 9
+}
+```
+
 ### BoostDummyDeal
 
 

cmd/boostd/legacy_deals.go

@@ -118,6 +118,10 @@ func (sm *BoostAPI) BoostDeal(ctx context.Context, dealUuid uuid.UUID) (*types.P
 	return sm.StorageProvider.Deal(ctx, dealUuid)
 }
 
+func (sm *BoostAPI) BoostDealBySignedProposalCid(ctx context.Context, proposalCid cid.Cid) (*types.ProviderDealState, error) {
+	return sm.StorageProvider.DealBySignedProposalCid(ctx, proposalCid)
+}
+
 func (sm *BoostAPI) BoostIndexerAnnounceAllDeals(ctx context.Context) error {
 	return sm.IndexProvider.IndexerAnnounceAllDeals(ctx)
 }

cmd/boostd/main.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"github.com/ipfs/go-cid"
 	"io"
 	"os"
 	"sync"
@@ -172,6 +173,14 @@ func (p *Provider) Deal(ctx context.Context, dealUuid uuid.UUID) (*types.Provide
 	return deal, nil
 }
 
+func (p *Provider) DealBySignedProposalCid(ctx context.Context, propCid cid.Cid) (*types.ProviderDealState, error) {
+	deal, err := p.dealsDB.BySignedProposalCID(ctx, propCid)
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, fmt.Errorf("getting deal %s: %w", propCid, ErrDealNotFound)
+	}
+	return deal, nil
+}
+
 func (p *Provider) NBytesReceived(dealUuid uuid.UUID) uint64 {
 	return p.transfers.getBytes(dealUuid)
 }