Skip to content

Commit

Permalink
fix: use one-webcrypto from npm (#1525)
Browse files Browse the repository at this point in the history
The `one-webcrypto` repo moved to the storacha org and broke all clients
😅

Uses the published `@storacha/one-webcrypto` instead of the github repo.
This protects against org renames and removes the requirement to have
git installed in order to to install our client library.
  • Loading branch information
Alan Shaw authored Jul 29, 2024
1 parent 0aebf9f commit 9345c54
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 31 deletions.
8 changes: 4 additions & 4 deletions packages/access-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/access-client/src/crypto/aes-key.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion packages/access-client/src/crypto/encoding.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion packages/access-client/src/crypto/p256-ecdh.js
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/blob-index/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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:^",
Expand All @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/blob-index/test/helpers/random.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/filecoin-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/filecoin-api/test/utils.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion packages/upload-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/upload-api/test/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
35 changes: 17 additions & 18 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9345c54

Please sign in to comment.