fix: upgrade ucanto to 8 (#794)

Upgrades ucanto to 8. There are no breaking changes that affect normal functionality as expected
storacha · May 22, 2023 · 00b011d · 00b011d
1 parent a5ceee4
commit 00b011d
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 516 deletions.
diff --git a/packages/access-api/package.json b/packages/access-api/package.json
@@ -20,10 +20,10 @@
   "dependencies": {
     "@ipld/dag-ucan": "^3.3.2",
     "@ucanto/client": "^7.0.1",
-    "@ucanto/core": "^7.0.1",
-    "@ucanto/interface": "^7.0.1",
+    "@ucanto/core": "^8.0.0",
+    "@ucanto/interface": "^8.0.0",
     "@ucanto/principal": "^7.0.0",
-    "@ucanto/server": "^7.0.2",
+    "@ucanto/server": "^8.0.0",
     "@ucanto/transport": "^7.0.3",
     "@ucanto/validator": "^7.0.0",
     "@web3-storage/access": "workspace:^",
@@ -53,7 +53,7 @@
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.11.18",
     "@types/qrcode": "^1.5.0",
-    "@ucanto/client": "^5.1.0",
+    "@ucanto/client": "^7.0.1",
     "better-sqlite3": "8.0.1",
     "buffer": "^6.0.3",
     "esbuild": "^0.17.2",

diff --git a/packages/access-api/src/routes/validate-email.js b/packages/access-api/src/routes/validate-email.js
@@ -146,7 +146,7 @@ async function authorize(req, env) {
       principal: Verifier,
     })
 
-    if (confirmResult.error) {
+    if (confirmResult.error || !confirmResult.ok) {
       throw new Error('error confirming', {
         cause: confirmResult,
       })

diff --git a/packages/access-client/package.json b/packages/access-client/package.json
@@ -62,8 +62,8 @@
     "@ipld/car": "^5.1.1",
     "@ipld/dag-ucan": "^3.3.2",
     "@ucanto/client": "^7.0.1",
-    "@ucanto/core": "^7.0.1",
-    "@ucanto/interface": "^7.0.1",
+    "@ucanto/core": "^8.0.0",
+    "@ucanto/interface": "^8.0.0",
     "@ucanto/principal": "^7.0.0",
     "@ucanto/transport": "^7.0.3",
     "@ucanto/validator": "^7.0.0",
@@ -92,7 +92,7 @@
     "@types/sinon": "^10.0.13",
     "@types/varint": "^6.0.1",
     "@types/ws": "^8.5.4",
-    "@ucanto/server": "^7.0.2",
+    "@ucanto/server": "^8.0.0",
     "assert": "^2.0.0",
     "hd-scripts": "^4.0.0",
     "mocha": "^10.2.0",

diff --git a/packages/capabilities/package.json b/packages/capabilities/package.json
@@ -64,8 +64,8 @@
     "dist/src/**/*.d.ts.map"
   ],
   "dependencies": {
-    "@ucanto/core": "^7.0.1",
-    "@ucanto/interface": "^7.0.1",
+    "@ucanto/core": "^8.0.0",
+    "@ucanto/interface": "^8.0.0",
     "@ucanto/principal": "^7.0.0",
     "@ucanto/transport": "^7.0.3",
     "@ucanto/validator": "^7.0.0"

diff --git a/packages/upload-api/package.json b/packages/upload-api/package.json
@@ -59,9 +59,9 @@
   },
   "dependencies": {
     "@ucanto/client": "^7.0.1",
-    "@ucanto/interface": "^7.0.1",
+    "@ucanto/interface": "^8.0.0",
     "@ucanto/principal": "^7.0.0",
-    "@ucanto/server": "^7.0.2",
+    "@ucanto/server": "^8.0.0",
     "@ucanto/transport": "^7.0.3",
     "@web3-storage/capabilities": "workspace:^",
     "multiformats": "^11.0.2",
@@ -70,7 +70,7 @@
   "devDependencies": {
     "@ipld/car": "^5.1.1",
     "@types/mocha": "^10.0.1",
-    "@ucanto/core": "^7.0.1",
+    "@ucanto/core": "^8.0.0",
     "@web-std/blob": "^3.0.4",
     "@web3-storage/sigv4": "^1.0.2",
     "hd-scripts": "^4.1.0",

diff --git a/packages/upload-client/package.json b/packages/upload-client/package.json
@@ -68,7 +68,7 @@
     "@ipld/dag-ucan": "^3.2.0",
     "@ipld/unixfs": "^2.1.1",
     "@ucanto/client": "^7.0.1",
-    "@ucanto/interface": "^7.0.1",
+    "@ucanto/interface": "^8.0.0",
     "@ucanto/transport": "^7.0.3",
     "@web3-storage/capabilities": "workspace:^",
     "ipfs-utils": "^9.0.14",
@@ -80,7 +80,7 @@
     "@types/assert": "^1.5.6",
     "@types/mocha": "^10.0.1",
     "@ucanto/principal": "^7.0.0",
-    "@ucanto/server": "^7.0.2",
+    "@ucanto/server": "^8.0.0",
     "assert": "^2.0.0",
     "blockstore-core": "^3.0.0",
     "c8": "^7.13.0",

diff --git a/packages/w3up-client/package.json b/packages/w3up-client/package.json
@@ -75,8 +75,8 @@
   "dependencies": {
     "@ipld/dag-ucan": "^3.3.2",
     "@ucanto/client": "^7.0.1",
-    "@ucanto/core": "^7.0.1",
-    "@ucanto/interface": "^7.0.1",
+    "@ucanto/core": "^8.0.0",
+    "@ucanto/interface": "^8.0.0",
     "@ucanto/principal": "^7.0.0",
     "@ucanto/transport": "^7.0.3",
     "@web3-storage/access": "workspace:^",
@@ -87,7 +87,7 @@
     "@docusaurus/core": "^2.2.0",
     "@ipld/car": "^5.1.1",
     "@types/mocha": "^10.0.1",
-    "@ucanto/server": "^7.0.2",
+    "@ucanto/server": "^8.0.0",
     "assert": "^2.0.0",
     "c8": "^7.13.0",
     "docusaurus-plugin-typedoc": "^0.18.0",