payload cid (rpcpool#140)

trustless-engineering · Jul 29, 2024 · c9b1840 · c9b1840
1 parent 70c3cc4
commit c9b1840
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/cmd-car-split.go b/cmd-car-split.go
@@ -60,6 +60,7 @@ type subsetInfo struct {
 type carFile struct {
 	name       string
 	commP      cid.Cid
+	payloadCid cid.Cid
 	paddedSize uint64
 	fileSize   int64
 }
@@ -170,7 +171,7 @@ func newCmd_SplitCar() *cli.Command {
 						return fmt.Errorf("failed to calculate commitment to cid: %w", err)
 					}
 
-					carFiles = append(carFiles, carFile{name: fmt.Sprintf("epoch-%d-%d.car", epoch, currentFileNum), commP: commCid, paddedSize: ps, fileSize: currentFileSize})
+					carFiles = append(carFiles, carFile{name: fmt.Sprintf("epoch-%d-%d.car", epoch, currentFileNum), commP: commCid, payloadCid: sl.(cidlink.Link).Cid, paddedSize: ps, fileSize: currentFileSize})
 
 					err = closeFile(bufferedWriter, currentFile)
 					if err != nil {
@@ -315,7 +316,7 @@ func newCmd_SplitCar() *cli.Command {
 				return fmt.Errorf("failed to calculate commitment to cid: %w", err)
 			}
 
-			carFiles = append(carFiles, carFile{name: fmt.Sprintf("epoch-%d-%d.car", epoch, currentFileNum), commP: commCid, paddedSize: ps, fileSize: currentFileSize})
+			carFiles = append(carFiles, carFile{name: fmt.Sprintf("epoch-%d-%d.car", epoch, currentFileNum), commP: commCid, payloadCid: sl.(cidlink.Link).Cid, paddedSize: ps, fileSize: currentFileSize})
 
 			f, err := os.Create(meta)
 			defer f.Close()
@@ -324,7 +325,7 @@ func newCmd_SplitCar() *cli.Command {
 			}
 
 			w := csv.NewWriter(f)
-			err = w.Write([]string{"car file", "piece cid", "padded piece size", "file size"})
+			err = w.Write([]string{"car file", "piece cid", "payload cid", "padded piece size", "file size"})
 			if err != nil {
 				return err
 			}
@@ -333,6 +334,7 @@ func newCmd_SplitCar() *cli.Command {
 				err = w.Write([]string{
 					c.name,
 					c.commP.String(),
+					c.payloadCid.String(),
 					strconv.FormatUint(c.paddedSize, 10),
 					strconv.FormatInt(c.fileSize, 10),
 				})

diff --git a/dataprep-tools/filecoin/boost_create_deals.py b/dataprep-tools/filecoin/boost_create_deals.py
@@ -192,10 +192,12 @@ def create_deals(metadata_obj):
         file_name = os.path.basename(line[0])
         # Only allow the new metadata
         assert (
-            len(line) == 4
-        ), f"metadata.csv should have 4 columns, instead found {len(line)}, {line}"
+            len(line) == 5
+        ), f"metadata.csv should have 5 columns, instead found f{len(line)}, {line}"
+
         commp_piece_cid = line[1]
         padded_size = line[2]
+        payload_cid = line[3]
 
         check_obj = client.check_exists(epoch + "/" + file_name)
         if not check_obj[0]:
@@ -417,9 +419,9 @@ def create_deals(metadata_obj):
     client.connect()
 
     # Load the payload CI
-    payload_cid = client.read_object("%s/epoch-%s.cid" % (epoch, epoch)).strip()
+    epoch_cid = client.read_object("%s/epoch-%s.cid" % (epoch, epoch)).strip()
 
-    logging.info("creating deals for epoch %s with payload %s", epoch, payload_cid)
+    logging.info("creating deals for epoch %s with payload %s", epoch, epoch_cid)
 
     # Load metadata csv produced by split-and-commp
     ret = 0