Merge pull request #472 from ipfs-force-community/fix/deal-uuid

fix: use the received deal uuid
ipfs-force-community · Oct 20, 2023 · 9a8cf5d · 9a8cf5d
2 parents d3874c1 + a697437
commit 9a8cf5d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cli/storage-deals.go b/cli/storage-deals.go
@@ -66,7 +66,7 @@ var dealsImportDataCmd = &cli.Command{
 			Usage: "Actually send transaction performing the action",
 		},
 	},
-	ArgsUsage: "<proposal CID> <file>",
+	ArgsUsage: "<proposal CID or uuid> <file>",
 	Action: func(cctx *cli.Context) error {
 		api, closer, err := NewMarketNode(cctx)
 		if err != nil {
@@ -117,14 +117,18 @@ var dealsBatchImportDataCmd = &cli.Command{
 	Flags: []cli.Flag{
 		&cli.StringSliceFlag{
 			Name:  "proposals",
-			Usage: "proposal cid and car file, eg. --proposals <proposal_cid>,<path_to_car_file>  --proposals <proposal_cid>,<path_to_car_file>",
+			Usage: "proposal cid(or uuid) and car file, eg. --proposals <proposal_cid>,<path_to_car_file>  --proposals <uuid>,<path_to_car_file>",
 		},
 		&cli.StringFlag{
 			Name: "manifest",
 			Usage: `A file containing proposal cid and piece cid, eg.
 proposalCID,pieceCID
 baadfdxxx,badddxxx
 basdefxxx,baefaxxx
+or
+uuid,pieceCID
+baad-xxx,badddxxx
+bass-xxx,baefaxxx
 `,
 		},
 		&cli.BoolFlag{

diff --git a/storageprovider/stream.go b/storageprovider/stream.go
@@ -401,7 +401,7 @@ func (storageDealStream *StorageDealStream) HandleNewDealStream(s network2.Strea
 	}
 
 	deal := &types.MinerDeal{
-		ID:                 uuid.New(),
+		ID:                 proposal.DealUUID,
 		Client:             s.Conn().RemotePeer(),
 		Miner:              storageDealStream.net.ID(),
 		ClientDealProposal: proposal.ClientDealProposal,