feat: upgrade to new ucanto (#498)

storacha · Mar 8, 2023 · 790750d · 790750d
1 parent 1d3d562
commit 790750d
Show file tree

Hide file tree

Showing 8 changed files with 119 additions and 126 deletions.
diff --git a/packages/access-api/package.json b/packages/access-api/package.json
@@ -18,12 +18,12 @@
   "license": "(Apache-2.0 OR MIT)",
   "dependencies": {
     "@ipld/dag-ucan": "^3.2.0",
-    "@ucanto/core": "^5.0.0",
-    "@ucanto/interface": "^5.0.0",
-    "@ucanto/principal": "^5.0.0",
-    "@ucanto/server": "^5.0.0",
-    "@ucanto/transport": "^5.0.0",
-    "@ucanto/validator": "^5.0.0",
+    "@ucanto/core": "^5.1.0",
+    "@ucanto/interface": "^6.0.0",
+    "@ucanto/principal": "^5.1.0",
+    "@ucanto/server": "^6.0.0",
+    "@ucanto/transport": "^5.1.0",
+    "@ucanto/validator": "^6.0.0",
     "@web3-storage/access": "workspace:^",
     "@web3-storage/capabilities": "workspace:^",
     "@web3-storage/worker-utils": "0.4.3-dev",
@@ -47,7 +47,7 @@
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.11.18",
     "@types/qrcode": "^1.5.0",
-    "@ucanto/client": "^5.0.0",
+    "@ucanto/client": "^5.1.0",
     "better-sqlite3": "8.0.1",
     "buffer": "^6.0.3",
     "dotenv": "^16.0.3",

diff --git a/packages/access-client/package.json b/packages/access-client/package.json
@@ -61,12 +61,12 @@
     "@ipld/car": "^5.0.3",
     "@ipld/dag-cbor": "^9.0.0",
     "@ipld/dag-ucan": "^3.2.0",
-    "@ucanto/client": "^5.0.0",
-    "@ucanto/core": "^5.0.0",
-    "@ucanto/interface": "^5.0.0",
-    "@ucanto/principal": "^5.0.0",
-    "@ucanto/transport": "^5.0.0",
-    "@ucanto/validator": "^5.0.0",
+    "@ucanto/client": "^5.1.0",
+    "@ucanto/core": "^5.1.0",
+    "@ucanto/interface": "^6.0.0",
+    "@ucanto/principal": "^5.1.0",
+    "@ucanto/transport": "^5.1.0",
+    "@ucanto/validator": "^6.0.0",
     "@web3-storage/capabilities": "workspace:^",
     "bigint-mod-arith": "^3.1.2",
     "conf": "10.2.0",
@@ -91,7 +91,7 @@
     "@types/node": "^18.11.18",
     "@types/varint": "^6.0.1",
     "@types/ws": "^8.5.4",
-    "@ucanto/server": "^5.0.0",
+    "@ucanto/server": "^6.0.0",
     "assert": "^2.0.0",
     "delay": "^5.0.0",
     "hd-scripts": "^4.0.0",

diff --git a/packages/capabilities/package.json b/packages/capabilities/package.json
@@ -64,11 +64,11 @@
     "dist/src/**/*.d.ts.map"
   ],
   "dependencies": {
-    "@ucanto/core": "^5.0.0",
-    "@ucanto/interface": "^5.0.0",
-    "@ucanto/principal": "^5.0.0",
-    "@ucanto/transport": "^5.0.0",
-    "@ucanto/validator": "^5.0.0"
+    "@ucanto/core": "^5.1.0",
+    "@ucanto/interface": "^6.0.0",
+    "@ucanto/principal": "^5.1.0",
+    "@ucanto/transport": "^5.1.0",
+    "@ucanto/validator": "^6.0.0"
   },
   "devDependencies": {
     "@types/assert": "^1.5.6",

diff --git a/packages/upload-api/package.json b/packages/upload-api/package.json
@@ -46,21 +46,21 @@
   },
   "dependencies": {
     "@sentry/serverless": "^7.22.0",
-    "@ucanto/client": "^5.0.0",
-    "@ucanto/interface": "^5.0.0",
-    "@ucanto/principal": "^5.0.0",
-    "@ucanto/server": "^5.0.0",
-    "@ucanto/transport": "^5.0.0",
+    "@ucanto/client": "^5.1.0",
+    "@ucanto/interface": "^6.0.0",
+    "@ucanto/principal": "^5.1.0",
+    "@ucanto/server": "^6.0.0",
+    "@ucanto/transport": "^5.1.0",
     "@web3-storage/capabilities": "^3.0.0",
     "multiformats": "^11.0.1",
     "p-retry": "^5.1.2"
   },
   "devDependencies": {
     "@ipld/car": "^5.0.1",
-    "@ucanto/core": "^5.0.0",
     "@types/mocha": "^10.0.1",
-    "mocha": "^10.2.0",
-    "@web3-storage/sigv4": "^1.0.2"
+    "@ucanto/core": "^5.1.0",
+    "@web3-storage/sigv4": "^1.0.2",
+    "mocha": "^10.2.0"
   },
   "eslintConfig": {
     "extends": [

diff --git a/packages/upload-api/test/store.spec.js b/packages/upload-api/test/store.spec.js
@@ -23,7 +23,7 @@ describe('store/*', () => {
       const dudewhereBucket = new DudewhereBucket()
       const signer = await Signer.generate()
       const id = signer.withDID('did:web:test.web3.storage')
-      const access = AccessVerifier.create({ id: signer })
+      const access = AccessVerifier.create({ id })
 
       try {
         await test(assert, {

diff --git a/packages/upload-api/test/upload.spec.js b/packages/upload-api/test/upload.spec.js
@@ -23,7 +23,7 @@ describe('upload/*', () => {
       const dudewhereBucket = new DudewhereBucket()
       const signer = await Signer.generate()
       const id = signer.withDID('did:web:test.web3.storage')
-      const access = AccessVerifier.create({ id: signer })
+      const access = AccessVerifier.create({ id })
 
       try {
         await test(assert, {

diff --git a/packages/upload-client/package.json b/packages/upload-client/package.json
@@ -66,9 +66,9 @@
     "@ipld/car": "^5.0.3",
     "@ipld/dag-ucan": "^3.2.0",
     "@ipld/unixfs": "^2.0.1",
-    "@ucanto/client": "^5.0.0",
-    "@ucanto/interface": "^5.0.0",
-    "@ucanto/transport": "^5.0.0",
+    "@ucanto/client": "^5.1.0",
+    "@ucanto/interface": "^6.0.0",
+    "@ucanto/transport": "^5.1.0",
     "@web3-storage/capabilities": "workspace:^",
     "multiformats": "^11.0.1",
     "p-queue": "^7.3.0",
@@ -77,8 +77,8 @@
   "devDependencies": {
     "@types/assert": "^1.5.6",
     "@types/mocha": "^10.0.1",
-    "@ucanto/principal": "^5.0.0",
-    "@ucanto/server": "^5.0.0",
+    "@ucanto/principal": "^5.1.0",
+    "@ucanto/server": "^6.0.0",
     "assert": "^2.0.0",
     "blockstore-core": "^3.0.0",
     "c8": "^7.12.0",