fix: use one-webcrypto from npm

storacha · Jul 29, 2024 · be9d836 · be9d836
1 parent 0aebf9f
commit be9d836
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 31 deletions.
diff --git a/packages/access-client/package.json b/packages/access-client/package.json
@@ -99,6 +99,8 @@
   "dependencies": {
     "@ipld/car": "^5.1.1",
     "@ipld/dag-ucan": "^3.4.0",
+    "@scure/bip39": "^1.2.1",
+    "@storacha/one-webcrypto": "^1.0.1",
     "@ucanto/client": "^9.0.1",
     "@ucanto/core": "^10.0.1",
     "@ucanto/interface": "^10.0.1",
@@ -110,14 +112,11 @@
     "bigint-mod-arith": "^3.1.2",
     "conf": "11.0.2",
     "multiformats": "^12.1.2",
-    "one-webcrypto": "https://github.com/web3-storage/one-webcrypto",
     "p-defer": "^4.0.0",
     "type-fest": "^4.9.0",
-    "uint8arrays": "^4.0.6",
-    "@scure/bip39": "^1.2.1"
+    "uint8arrays": "^4.0.6"
   },
   "devDependencies": {
-    "@web3-storage/eslint-config-w3up": "workspace:^",
     "@types/assert": "^1.5.6",
     "@types/inquirer": "^9.0.4",
     "@types/mocha": "^10.0.1",
@@ -126,6 +125,7 @@
     "@types/varint": "^6.0.1",
     "@types/ws": "^8.5.4",
     "@ucanto/server": "^10.0.0",
+    "@web3-storage/eslint-config-w3up": "workspace:^",
     "assert": "^2.0.0",
     "mocha": "^10.2.0",
     "playwright-test": "^12.3.4",

diff --git a/packages/access-client/src/crypto/aes-key.js b/packages/access-client/src/crypto/aes-key.js
@@ -1,4 +1,4 @@
-import { webcrypto } from 'one-webcrypto'
+import { webcrypto } from '@storacha/one-webcrypto'
 import * as uint8arrays from 'uint8arrays'
 import { randomIV } from './encoding.js'
 

diff --git a/packages/access-client/src/crypto/encoding.js b/packages/access-client/src/crypto/encoding.js
@@ -1,4 +1,4 @@
-import { webcrypto } from 'one-webcrypto'
+import { webcrypto } from '@storacha/one-webcrypto'
 import * as uint8arrays from 'uint8arrays'
 import * as bigintModArith from 'bigint-mod-arith'
 

diff --git a/packages/access-client/src/crypto/p256-ecdh.js b/packages/access-client/src/crypto/p256-ecdh.js
@@ -1,4 +1,4 @@
-import { webcrypto } from 'one-webcrypto'
+import { webcrypto } from '@storacha/one-webcrypto'
 import * as uint8arrays from 'uint8arrays'
 import * as DID from '@ipld/dag-ucan/did'
 import { AesKey } from './aes-key.js'

diff --git a/packages/blob-index/package.json b/packages/blob-index/package.json
@@ -40,6 +40,7 @@
   },
   "dependencies": {
     "@ipld/dag-cbor": "^9.0.6",
+    "@storacha/one-webcrypto": "^1.0.1",
     "@ucanto/core": "^10.0.1",
     "@ucanto/interface": "^10.0.1",
     "@web3-storage/capabilities": "workspace:^",
@@ -52,7 +53,6 @@
     "@web3-storage/eslint-config-w3up": "workspace:^",
     "c8": "^7.14.0",
     "entail": "^2.1.2",
-    "one-webcrypto": "git://github.com/web3-storage/one-webcrypto",
     "typescript": "5.2.2"
   },
   "eslintConfig": {

diff --git a/packages/blob-index/test/helpers/random.js b/packages/blob-index/test/helpers/random.js
@@ -3,7 +3,7 @@ import { CID } from 'multiformats'
 import { sha256 } from 'multiformats/hashes/sha2'
 import * as CAR from '@ucanto/transport/car'
 import * as raw from 'multiformats/codecs/raw'
-import { webcrypto } from 'one-webcrypto'
+import { webcrypto } from '@storacha/one-webcrypto'
 
 /** @param {number} size */
 export async function randomBytes(size) {

diff --git a/packages/filecoin-api/package.json b/packages/filecoin-api/package.json
@@ -166,6 +166,7 @@
     "p-map": "^6.0.0"
   },
   "devDependencies": {
+    "@storacha/one-webcrypto": "^1.0.1",
     "@types/assert": "^1.5.10",
     "@types/mocha": "^10.0.1",
     "@ucanto/client": "^9.0.1",
@@ -176,7 +177,6 @@
     "c8": "^10.1.2",
     "mocha": "^10.2.0",
     "multiformats": "^12.1.2",
-    "one-webcrypto": "git://github.com/web3-storage/one-webcrypto",
     "p-wait-for": "^5.0.2",
     "typescript": "5.2.2"
   },

diff --git a/packages/filecoin-api/test/utils.js b/packages/filecoin-api/test/utils.js
@@ -1,6 +1,6 @@
 import { Aggregate, Piece } from '@web3-storage/data-segment'
 import { CID } from 'multiformats'
-import { webcrypto } from 'one-webcrypto'
+import { webcrypto } from '@storacha/one-webcrypto'
 import { sha256 } from 'multiformats/hashes/sha2'
 import * as raw from 'multiformats/codecs/raw'
 

diff --git a/packages/upload-api/package.json b/packages/upload-api/package.json
@@ -210,6 +210,7 @@
   "devDependencies": {
     "@ipld/car": "^5.1.1",
     "@ipld/dag-ucan": "^3.4.0",
+    "@storacha/one-webcrypto": "^1.0.1",
     "@types/mocha": "^10.0.1",
     "@ucanto/core": "^10.0.1",
     "@web-std/blob": "^3.0.5",
@@ -218,7 +219,6 @@
     "@web3-storage/sigv4": "^1.0.2",
     "is-subset": "^0.1.1",
     "mocha": "^10.2.0",
-    "one-webcrypto": "git://github.com/web3-storage/one-webcrypto",
     "typescript": "5.2.2"
   },
   "eslintConfig": {

diff --git a/packages/upload-api/test/util.js b/packages/upload-api/test/util.js
@@ -3,7 +3,7 @@ import { createServer, connect } from '../src/lib.js'
 import { ed25519 } from '@ucanto/principal'
 import { delegate } from '@ucanto/core'
 import { CID } from 'multiformats'
-import { webcrypto } from 'one-webcrypto'
+import { webcrypto } from '@storacha/one-webcrypto'
 import { sha256 } from 'multiformats/hashes/sha2'
 import * as CAR from '@ucanto/transport/car'
 import * as raw from 'multiformats/codecs/raw'

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml