fix: upgrade fr32-sha2-256-trunc-254-padded-binary-tree-multihash

storacha · Oct 24, 2023 · 762f9f4 · 762f9f4
1 parent f7ee580
commit 762f9f4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/packages/upload-client/package.json b/packages/upload-client/package.json
@@ -18,7 +18,7 @@
     "build": "tsc --build",
     "check": "tsc --build",
     "test": "npm-run-all -p -r mock test:all",
-    "test:all": "run-s test:browser test:node",
+    "test:all": "run-s test:node test:browser",
     "test:node": "hundreds -r html -r text mocha 'test/**/!(*.browser).test.js' -n experimental-vm-modules -n no-warnings",
     "test:browser": "playwright-test 'test/**/!(*.node).test.js'",
     "mock": "run-p mock:*",
@@ -72,7 +72,7 @@
     "@ucanto/interface": "^9.0.0",
     "@ucanto/transport": "^9.0.0",
     "@web3-storage/capabilities": "workspace:^",
-    "fr32-sha2-256-trunc254-padded-binary-tree-multihash": "^1.1.4",
+    "fr32-sha2-256-trunc254-padded-binary-tree-multihash": "^2.0.0",
     "ipfs-utils": "^9.0.14",
     "multiformats": "^12.1.2",
     "p-retry": "^5.1.2",

diff --git a/packages/upload-client/src/index.js b/packages/upload-client/src/index.js
@@ -13,7 +13,7 @@ export { Store, Upload, UnixFS, CAR }
 export * from './sharding.js'
 
 const CONCURRENT_REQUESTS = 3
-const PIECE_MULTIHASH_SIZE = PieceHasher.prefix.length + PieceHasher.size
+const PIECE_MULTIHASH_SIZE = PieceHasher.prefix.length + 1 + PieceHasher.size
 
 /**
  * Uploads a file to the service and returns the root data CID for the
@@ -133,6 +133,8 @@ async function uploadBlockStream(conf, blocks, options = {}) {
             const digestBytes = new Uint8Array(PIECE_MULTIHASH_SIZE)
             hasher.write(bytes)
             hasher.digestInto(digestBytes, 0, true)
+            // TODO: should we?
+            // hasher.free()
             const digest = Digest.decode(digestBytes)
             return /** @type {import('@web3-storage/capabilities/types').PieceLink} */ (
               Link.create(raw.code, digest)

diff --git a/packages/upload-client/test/index.test.js b/packages/upload-client/test/index.test.js
@@ -577,7 +577,7 @@ describe('uploadCAR', () => {
     assert.equal(pieceCIDs.length, 1)
     assert.equal(
       pieceCIDs[0].toString(),
-      'bafkzcibbammseumg3mjlev5odi5bpcsrp4gg62d7xnx44zkxzvgedq7nxldbc'
+      'bafkzcibcoibrsisrq3nrfmsxvynduf4kkf7qy33ip65w7ttfk7guyqod5w5mmei'
     )
   })
 })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml