output piece_cid_v2

Author: LexLuthr

cmd/curio/storacha-migration.go

@@ -13,10 +13,10 @@ import (
 	"github.com/urfave/cli/v2"
 	"golang.org/x/xerrors"
 
+	commcid "github.com/filecoin-project/go-fil-commcid"
 	"github.com/filecoin-project/go-padreader"
 	"github.com/filecoin-project/go-state-types/abi"
 
-	"github.com/filecoin-project/curio/cmd/curio/internal/translations"
 	"github.com/filecoin-project/curio/deps"
 	"github.com/filecoin-project/curio/harmony/harmonydb"
 	"github.com/filecoin-project/curio/lib/parkpiece"
@@ -34,8 +34,8 @@ type importPiecesOutput struct {
 }
 
 type storachaImportResult struct {
-	Imported bool
-	PieceCID string
+	Imported   bool
+	PieceCIDV2 string
 }
 
 type storachaParkedPieceState struct {
@@ -53,7 +53,7 @@ type storachaFinalRecoveryRow struct {
 
 var importPiecesCmd = &cli.Command{
 	Name:  "import-pieces",
-	Usage: translations.T("Imports already existing pieces from storage to piece park system"),
+	Usage: "Imports already existing pieces from storage to piece park system",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:  "source",
@@ -183,7 +183,7 @@ func runImportPieces(ctx context.Context, dep *deps.Deps, sourcePath, targetPath
 				return out, err
 			}
 			if result.Imported {
-				out.Pieces = append(out.Pieces, result.PieceCID)
+				out.Pieces = append(out.Pieces, result.PieceCIDV2)
 				out.Count++
 			}
 		}
@@ -242,7 +242,7 @@ func runImportPieces(ctx context.Context, dep *deps.Deps, sourcePath, targetPath
 			return out, err
 		}
 		if result.Imported {
-			out.Pieces = append(out.Pieces, result.PieceCID)
+			out.Pieces = append(out.Pieces, result.PieceCIDV2)
 			out.Count++
 		}
 	}
@@ -398,7 +398,7 @@ func importStagedStorachaPiece(ctx context.Context, dep *deps.Deps, storageID st
 		}
 	}
 
-	return storachaImportResult{Imported: true, PieceCID: pi.PieceCIDV1.String()}, nil
+	return storachaImportResult{Imported: true, PieceCIDV2: strings.TrimSuffix(filepath.Base(stagingPath), ".car")}, nil
 }
 
 // recoverFinalStorachaPieces scans incomplete storacha-migration rows where the
@@ -441,14 +441,32 @@ func recoverFinalStorachaPieces(ctx context.Context, dep *deps.Deps, storageID s
 			return err
 		}
 		if imported {
-			out.Pieces = append(out.Pieces, row.PieceCID)
+			pcidV2, err := storachaPieceCIDV2FromRow(row)
+			if err != nil {
+				return err
+			}
+			out.Pieces = append(out.Pieces, pcidV2)
 			out.Count++
 		}
 	}
 
 	return nil
 }
 
+func storachaPieceCIDV2FromRow(row storachaFinalRecoveryRow) (string, error) {
+	pcidV1, err := cid.Parse(row.PieceCID)
+	if err != nil {
+		return "", xerrors.Errorf("parsing piece cid %s: %w", row.PieceCID, err)
+	}
+
+	pcidV2, err := commcid.PieceCidV2FromV1(pcidV1, uint64(row.RawSize))
+	if err != nil {
+		return "", xerrors.Errorf("getting piece cid v2: %w", err)
+	}
+
+	return pcidV2.String(), nil
+}
+
 // recoverFinalStorachaPiece handles the post-rename crash window for one DB row.
 // It requires target/s-t00-<id> to exist, rebuilds the piece info from the DB
 // row, reuses the same claim/ref checks as staged import, then declares the

cmd/curio/storacha-migration_test.go

@@ -33,6 +33,7 @@ type storachaMigrationTestEnv struct {
 }
 
 type storachaPieceFixture struct {
+	cidV2    string
 	fileName string
 	info     *mk20.PieceInfo
 	data     []byte
@@ -97,7 +98,8 @@ func TestStorachaMigrationFreshImport(t *testing.T) {
 	out, err := runImportPieces(env.ctx, env.dep, env.sourceDir, env.targetDir, 20)
 	require.NoError(t, err)
 	require.Equal(t, 1, out.Count)
-	require.Equal(t, []string{fx.info.PieceCIDV1.String()}, out.Pieces)
+	require.Equal(t, []string{fx.cidV2}, out.Pieces)
+	require.NotEqual(t, []string{fx.info.PieceCIDV1.String()}, out.Pieces)
 
 	pp := parkedPieceByCID(t, env, fx)
 	require.True(t, pp.complete)
@@ -375,7 +377,7 @@ func TestStorachaMigrationBatchProcessesStagingBeforeSource(t *testing.T) {
 	out, err := runImportPieces(env.ctx, env.dep, env.sourceDir, env.targetDir, 1)
 	require.NoError(t, err)
 	require.Equal(t, 1, out.Count)
-	require.Equal(t, []string{staged.info.PieceCIDV1.String()}, out.Pieces)
+	require.Equal(t, []string{staged.cidV2}, out.Pieces)
 
 	stagedPP := parkedPieceByCID(t, env, staged)
 	assertFileBytes(t, storachaFinalPiecePath(env.targetDir, stagedPP.id), staged.data)
@@ -397,7 +399,7 @@ func TestStorachaMigrationBatchProcessesFinalRecoveryBeforeSource(t *testing.T)
 	out, err := runImportPieces(env.ctx, env.dep, env.sourceDir, env.targetDir, 1)
 	require.NoError(t, err)
 	require.Equal(t, 1, out.Count)
-	require.Equal(t, []string{recovered.info.PieceCIDV1.String()}, out.Pieces)
+	require.Equal(t, []string{recovered.cidV2}, out.Pieces)
 
 	pp := parkedPieceByID(t, env, pieceID)
 	require.True(t, pp.complete)
@@ -415,7 +417,7 @@ func TestStorachaMigrationInvalidStagedFileDoesNotConsumeBatch(t *testing.T) {
 	out, err := runImportPieces(env.ctx, env.dep, env.sourceDir, env.targetDir, 1)
 	require.NoError(t, err)
 	require.Equal(t, 1, out.Count)
-	require.Equal(t, []string{source.info.PieceCIDV1.String()}, out.Pieces)
+	require.Equal(t, []string{source.cidV2}, out.Pieces)
 
 	pp := parkedPieceByCID(t, env, source)
 	assertFileBytes(t, storachaFinalPiecePath(env.targetDir, pp.id), source.data)
@@ -527,6 +529,7 @@ func newStorachaPieceFixture(t *testing.T, seed uint64) storachaPieceFixture {
 	require.NoError(t, err)
 
 	return storachaPieceFixture{
+		cidV2:    pcidV2.String(),
 		fileName: pcidV2.String() + ".car",
 		info:     info,
 		data:     bytes.Repeat([]byte{byte(seed % 251)}, int(rawSize)),