Merge pull request #6471 from filecoin-project/feat/ddo-payload-cid

Feat/ddo payload cid

Author: tediou5

venus-shared/api/market/v1/api.go

@@ -198,6 +198,7 @@ type IMarket interface {
 	GetDirectDealByAllocationID(ctx context.Context, id types.AllocationId) (*market.DirectDeal, error)          //perm:read
 	ListDirectDeals(ctx context.Context, queryParams market.DirectDealQueryParams) ([]*market.DirectDeal, error) //perm:read
 	UpdateDirectDealState(ctx context.Context, id uuid.UUID, state market.DirectDealState) error                 //perm:write
+	UpdateDirectDealPayloadCID(ctx context.Context, id uuid.UUID, payloadCID cid.Cid) error                      //perm:write
 
 	UpdateStorageDealPayloadSize(ctx context.Context, dealProposal cid.Cid, payloadSize uint64) error //perm:write
 

venus-shared/api/market/v1/method.md

@@ -114,6 +114,7 @@ curl http://<ip>:<port>/rpc/v1 -X POST -H "Content-Type: application/json"  -H "
   * [SectorSetExpectedSealDuration](#sectorsetexpectedsealduration)
   * [UpdateDealOnPacking](#updatedealonpacking)
   * [UpdateDealStatus](#updatedealstatus)
+  * [UpdateDirectDealPayloadCID](#updatedirectdealpayloadcid)
   * [UpdateDirectDealState](#updatedirectdealstate)
   * [UpdateStorageDealPayloadSize](#updatestoragedealpayloadsize)
   * [UpdateStorageDealStatus](#updatestoragedealstatus)
@@ -1049,6 +1050,9 @@ Response:
   "Client": "f01234",
   "Provider": "f01234",
   "PayloadSize": 42,
+  "PayloadCID": {
+    "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+  },
   "State": 1,
   "AllocationID": 42,
   "ClaimID": 42,
@@ -1086,6 +1090,9 @@ Response:
   "Client": "f01234",
   "Provider": "f01234",
   "PayloadSize": 42,
+  "PayloadCID": {
+    "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+  },
   "State": 1,
   "AllocationID": 42,
   "ClaimID": 42,
@@ -1218,12 +1225,12 @@ Inputs:
 [
   {
     "SkipCommP": true,
-    "NoCopyCarFile": true,
-    "SkipGenerateIndex": true,
     "DealParams": [
       {
-        "FilePath": "string value",
         "PayloadSize": 42,
+        "PayloadCID": {
+          "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+        },
         "DealUUID": "07070707-0707-0707-0707-070707070707",
         "AllocationID": 42,
         "PieceCID": {
@@ -1377,6 +1384,9 @@ Response:
     "Client": "f01234",
     "Provider": "f01234",
     "PayloadSize": 42,
+    "PayloadCID": {
+      "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+    },
     "State": 1,
     "AllocationID": 42,
     "ClaimID": 42,
@@ -2870,6 +2880,23 @@ Inputs:
 
 Response: `{}`
 
+### UpdateDirectDealPayloadCID
+
+
+Perms: write
+
+Inputs:
+```json
+[
+  "07070707-0707-0707-0707-070707070707",
+  {
+    "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+  }
+]
+```
+
+Response: `{}`
+
 ### UpdateDirectDealState
 
 

venus-shared/api/market/v1/mock/mock_imarket.go

@@ -190,6 +190,7 @@ type DirectDeal struct {
 	Provider  address.Address
 
 	PayloadSize uint64
+	PayloadCID  cid.Cid
 
 	State DirectDealState
 
@@ -210,19 +211,13 @@ type DirectDeal struct {
 
 type DirectDealParams struct {
 	// Commp will not be calculated and verified
-	SkipCommP bool
-	// not copy car file to piece storage
-	NoCopyCarFile bool
-	// skip generate index
-	SkipGenerateIndex bool
-
+	SkipCommP  bool
 	DealParams []DirectDealParam
 }
 
 type DirectDealParam struct {
-	// FilePath and PayloadSize cannot both be empty
-	FilePath    string
 	PayloadSize uint64
+	PayloadCID  cid.Cid
 
 	DealUUID     uuid.UUID
 	AllocationID uint64