chore: upgrade to new version

storacha · Aug 9, 2023 · 85771c0 · 85771c0
1 parent bbc09f6
commit 85771c0
Show file tree

Hide file tree

Showing 13 changed files with 1,084 additions and 1,105 deletions.
diff --git a/packages/capabilities/package.json b/packages/capabilities/package.json
@@ -60,7 +60,7 @@
     "@ucanto/principal": "^8.0.0",
     "@ucanto/transport": "^8.0.0",
     "@ucanto/validator": "^8.0.0",
-    "@web3-storage/data-segment": "^3.0.0"
+    "@web3-storage/data-segment": "^3.0.1"
   },
   "devDependencies": {
     "@types/assert": "^1.5.6",

diff --git a/packages/capabilities/src/filecoin.js b/packages/capabilities/src/filecoin.js
@@ -21,31 +21,14 @@ const FR32_SHA2_256_TRUNC254_PADDED_BINARY_TREE = 0x1011
  */
 const RAW_CODE = 0x55
 
-/**
- * @see https://github.com/multiformats/go-multihash/blob/dc3bd6897fcd17f6acd8d4d6ffd2cea3d4d3ebeb/multihash.go#L73
- */
-const SHA2_256_TRUNC254_PADDED = 0x1012
-/**
- * @see https://github.com/ipfs/go-cid/blob/829c826f6be23320846f4b7318aee4d17bf8e094/cid.go#L104
- */
-const FilCommitmentUnsealed = 0xf101
-
-const PIECE_CID_V2 = Schema.link({
+const PIECE_LINK = Schema.link({
   code: RAW_CODE,
   version: 1,
   multihash: {
     code: FR32_SHA2_256_TRUNC254_PADDED_BINARY_TREE,
   },
 })
 
-const PIECE_CID_V1 = Schema.link({
-  code: FilCommitmentUnsealed,
-  version: 1,
-  multihash: {
-    code: SHA2_256_TRUNC254_PADDED,
-  },
-})
-
 /**
  * `filecoin/add` capability allows agent to add a filecoin piece to be aggregated
  * so that it can be stored by a Storage provider on a future time.
@@ -66,7 +49,7 @@ export const filecoinAdd = capability({
      *
      * @see https://github.com/filecoin-project/FIPs/pull/758/files
      */
-    piece: /** @type {import('./types').PieceLinkSchema} */ (PIECE_CID_V2),
+    piece: /** @type {import('./types').PieceLinkSchema} */ (PIECE_LINK),
   }),
   derives: (claim, from) => {
     return (
@@ -94,7 +77,7 @@ export const aggregateAdd = capability({
      *
      * @see https://github.com/filecoin-project/FIPs/pull/758/files
      */
-    piece: /** @type {import('./types').PieceLinkSchema} */ (PIECE_CID_V2),
+    piece: /** @type {import('./types').PieceLinkSchema} */ (PIECE_LINK),
     /**
      * Storefront requestin piece to be aggregated
      */
@@ -137,9 +120,7 @@ export const dealAdd = capability({
      * @see https://github.com/filecoin-project/go-state-types/blob/1e6cf0d47cdda75383ef036fc2725d1cf51dbde8/abi/piece.go#L47-L50
      * @see https://github.com/filecoin-project/FIPs/pull/758/files
      */
-    aggregate: /** @type {import('./types').LegacyPieceLinkSchema} */ (
-      PIECE_CID_V1
-    ),
+    aggregate: /** @type {import('./types').PieceLinkSchema} */ (PIECE_LINK),
     /**
      * Storefront requesting deal
      */
@@ -176,7 +157,7 @@ export const chainTrackerInfo = capability({
      *
      * @see https://github.com/filecoin-project/FIPs/pull/758/files
      */
-    piece: /** @type {import('./types').PieceLinkSchema} */ (PIECE_CID_V2),
+    piece: /** @type {import('./types').PieceLinkSchema} */ (PIECE_LINK),
   }),
   derives: (claim, from) => {
     return (

diff --git a/packages/capabilities/src/types.ts b/packages/capabilities/src/types.ts
@@ -2,7 +2,7 @@ import type { TupleToUnion } from 'type-fest'
 import * as Ucanto from '@ucanto/interface'
 import type { Schema } from '@ucanto/core'
 import { InferInvokedCapability, Unit, DID } from '@ucanto/interface'
-import type { PieceLink, LegacyPieceLink } from '@web3-storage/data-segment'
+import type { PieceLink } from '@web3-storage/data-segment'
 import { space, info, recover, recoverValidation } from './space.js'
 import * as provider from './provider.js'
 import { top } from './top.js'
@@ -26,8 +26,6 @@ export interface InsufficientStorage {
  */
 export type PieceLinkSchema = Schema.Schema<PieceLink>
 
-export type LegacyPieceLinkSchema = Schema.Schema<LegacyPieceLink>
-
 // Access
 export type Access = InferInvokedCapability<typeof AccessCaps.access>
 export type AccessAuthorize = InferInvokedCapability<
@@ -91,14 +89,14 @@ export interface FilecoinAddFailure extends Ucanto.Failure {
 
 export interface AggregateAddSuccess {
   piece: PieceLink
-  aggregate?: LegacyPieceLink
+  aggregate?: PieceLink
 }
 export interface AggregateAddFailure extends Ucanto.Failure {
   name: string
 }
 
 export interface DealAddSuccess {
-  aggregate?: LegacyPieceLink
+  aggregate?: PieceLink
 }
 
 export type DealAddFailure = DealAddParseFailure | DealAddFailureWithBadPiece

diff --git a/packages/filecoin-api/package.json b/packages/filecoin-api/package.json
@@ -86,7 +86,7 @@
     "@ucanto/server": "^8.0.0",
     "@ucanto/transport": "^8.0.0",
     "@web3-storage/capabilities": "workspace:^",
-    "@web3-storage/data-segment": "^3.0.0"
+    "@web3-storage/data-segment": "^3.0.1"
   },
   "devDependencies": {
     "@ipld/car": "^5.1.1",

diff --git a/packages/filecoin-api/src/dealer.js b/packages/filecoin-api/src/dealer.js
@@ -35,7 +35,7 @@ export const add = async ({ capability, invocation }, context) => {
 }
 
 /**
- * @param {import('@web3-storage/data-segment').LegacyPieceLink} aggregate
+ * @param {import('@web3-storage/data-segment').PieceLink} aggregate
  * @param {Server.API.Link<unknown, number, number, 0 | 1>} offerCid
  * @param {string} storefront
  * @param {string | undefined} label
@@ -85,7 +85,7 @@ async function enqueue(
 }
 
 /**
- * @param {import('@web3-storage/data-segment').LegacyPieceLink} aggregate
+ * @param {import('@web3-storage/data-segment').PieceLink} aggregate
  * @param {import('@web3-storage/data-segment').PieceLink[]} pieces
  * @param {string} storefront
  * @param {string | undefined} label

diff --git a/packages/filecoin-api/src/types.ts b/packages/filecoin-api/src/types.ts
@@ -8,7 +8,7 @@ import type {
   Match,
 } from '@ucanto/interface'
 import type { ProviderInput } from '@ucanto/server'
-import { PieceLink, LegacyPieceLink } from '@web3-storage/data-segment'
+import { PieceLink } from '@web3-storage/data-segment'
 import { UnknownLink } from '@ucanto/interface'
 
 export * as UcantoInterface from '@ucanto/interface'
@@ -70,7 +70,7 @@ export interface AggregatorRecord {
 }
 
 export interface DealerRecord {
-  aggregate: LegacyPieceLink
+  aggregate: PieceLink
   pieces: PieceLink[]
   storefront: string
   label?: string

diff --git a/packages/filecoin-api/test/services/dealer.js b/packages/filecoin-api/test/services/dealer.js
@@ -49,7 +49,7 @@ export const test = {
       throw new Error('invocation failed', { cause: response.out.error })
     }
     assert.ok(response.out.ok)
-    assert.deepEqual(response.out.ok.aggregate, aggregate.link)
+    assert.ok(response.out.ok.aggregate?.equals(aggregate.link))
 
     // Validate effect in receipt
     const fx = await Filecoin.dealAdd
@@ -111,7 +111,7 @@ export const test = {
         throw new Error('invocation failed', { cause: response.out.error })
       }
       assert.ok(response.out.ok)
-      assert.deepEqual(response.out.ok.aggregate, aggregate.link)
+      assert.ok(response.out.ok.aggregate?.equals(aggregate.link))
 
       // Validate queue and store
       await pWaitFor(() => context.queuedMessages.length === 0)

diff --git a/packages/filecoin-api/test/utils.js b/packages/filecoin-api/test/utils.js
@@ -86,6 +86,6 @@ export async function randomAggregate(length, size) {
 
   return {
     pieces,
-    aggregate: aggregateBuild.toInfo(),
+    aggregate: aggregateBuild,
   }
 }
diff --git a/packages/filecoin-client/package.json b/packages/filecoin-client/package.json
@@ -69,7 +69,7 @@
     "@types/mocha": "^10.0.1",
     "@ucanto/principal": "^8.0.0",
     "@ucanto/server": "^8.0.1",
-    "@web3-storage/data-segment": "^3.0.0",
+    "@web3-storage/data-segment": "^3.0.1",
     "assert": "^2.0.0",
     "c8": "^7.13.0",
     "hd-scripts": "^4.0.0",

diff --git a/packages/filecoin-client/src/dealer.js b/packages/filecoin-client/src/dealer.js
@@ -25,7 +25,7 @@ export const connection = connect({
  * Add a piece (aggregate) to the dealer system of the filecoin pipeline to offer to SPs.
  *
  * @param {import('./types.js').InvocationConfig} conf - Configuration
- * @param {import('@web3-storage/data-segment').LegacyPieceLink} aggregate
+ * @param {import('@web3-storage/data-segment').PieceLink} aggregate
  * @param {import('@web3-storage/data-segment').PieceLink[]} pieces
  * @param {string} storefront
  * @param {string} label

diff --git a/packages/filecoin-client/test/dealer.test.js b/packages/filecoin-client/test/dealer.test.js
@@ -81,7 +81,7 @@ describe('dealer.add', () => {
     )
 
     assert.ok(res.out.ok)
-    assert.deepEqual(res.out.ok, dealAddResponse)
+    assert.ok(res.out.ok.aggregate?.equals(dealAddResponse.aggregate))
     // includes effect fx in receipt
     assert.ok(res.fx.join)
   })
@@ -144,7 +144,7 @@ describe('dealer.add', () => {
     )
 
     assert.ok(res.out.ok)
-    assert.deepEqual(res.out.ok, dealAddResponse)
+    assert.ok(res.out.ok.aggregate?.equals(dealAddResponse.aggregate))
     // does not include effect fx in receipt
     assert.ok(!res.fx.join)
   })

diff --git a/packages/filecoin-client/test/helpers/random.js b/packages/filecoin-client/test/helpers/random.js
@@ -80,6 +80,6 @@ export async function randomAggregate(length, size) {
 
   return {
     pieces,
-    aggregate: aggregateBuild.toInfo(),
+    aggregate: aggregateBuild,
   }
 }