Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: cherry pick 472 #473

Merged
merged 1 commit into from
Oct 23, 2023
Merged

chore: cherry pick 472 #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions cli/storage-deals.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,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 {
Expand Down Expand Up @@ -104,14 +104,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{
Expand Down
2 changes: 1 addition & 1 deletion storageprovider/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down