upgrade to ucan 0.9

packages/client/test/client.spec.js

@@ -10,7 +10,7 @@ import fetch from '@web-std/fetch'
 test('encode inovocation', async () => {
   /** @type {Client.ConnectionView<Service.Service>} */
   const connection = Client.connect({
-    id: w3.principal,
+    id: w3,
     channel: HTTP.open({ url: new URL('about:blank'), fetch }),
     encoder: CAR,
     decoder: CBOR,
@@ -62,7 +62,7 @@ test('encode delegated invocation', async () => {
 
   /** @type {Client.ConnectionView<Service.Service>} */
   const connection = Client.connect({
-    id: w3.principal,
+    id: w3,
     channel: HTTP.open({ url: new URL('about:blank'), fetch }),
     encoder: CAR,
     decoder: CBOR,
@@ -140,12 +140,12 @@ test('encode delegated invocation', async () => {
 const service = Service.create()
 /** @type {Client.ConnectionView<Service.Service>} */
 const connection = Client.connect({
-  id: w3.principal,
+  id: w3,
   channel: HTTP.open({
     url: new URL('about:blank'),
     fetch: async (url, input) => {
       const invocations = await CAR.decode(input)
-      const promises = invocations.map((invocation) => {
+      const promises = invocations.map(invocation => {
         const [capabality] = invocation.capabilities
         switch (capabality.can) {
           case 'store/add': {

packages/client/test/fixtures.js

@@ -1,18 +1,18 @@
-import { SigningPrincipal } from '@ucanto/principal'
+import * as ed25519 from '@ucanto/principal/ed25519'
 
 /** did:key:z6Mkqa4oY9Z5Pf5tUcjLHLUsDjKwMC95HGXdE1j22jkbhz6r */
-export const alice = SigningPrincipal.parse(
+export const alice = ed25519.parse(
   'MgCZT5vOnYZoVAeyjnzuJIVY9J4LNtJ+f8Js0cTPuKUpFne0BVEDJjEu6quFIU8yp91/TY/+MYK8GvlKoTDnqOCovCVM='
 )
 /** did:key:z6MkffDZCkCTWreg8868fG1FGFogcJj5X6PY93pPcWDn9bob */
-export const bob = SigningPrincipal.parse(
+export const bob = ed25519.parse(
   'MgCYbj5AJfVvdrjkjNCxB3iAUwx7RQHVQ7H1sKyHy46Iose0BEevXgL1V73PD9snOCIoONgb+yQ9sycYchQC8kygR4qY='
 )
 /** did:key:z6MktafZTREjJkvV5mfJxcLpNBoVPwDLhTuMg9ng7dY4zMAL */
-export const mallory = SigningPrincipal.parse(
+export const mallory = ed25519.parse(
   'MgCYtH0AvYxiQwBG6+ZXcwlXywq9tI50G2mCAUJbwrrahkO0B0elFYkl3Ulf3Q3A/EvcVY0utb4etiSE8e6pi4H0FEmU='
 )
 
-export const service = SigningPrincipal.parse(
+export const service = ed25519.parse(
   'MgCYKXoHVy7Vk4/QjcEGi+MCqjntUiasxXJ8uJKY0qh11e+0Bs8WsdqGK7xothgrDzzWD0ME7ynPjz2okXDh8537lId8='
 )

packages/core/package.json

@@ -31,7 +31,7 @@
   "dependencies": {
     "@ipld/car": "^4.1.5",
     "@ipld/dag-cbor": "^7.0.3",
-    "@ipld/dag-ucan": "3.0.0-beta",
+    "@ipld/dag-ucan": "link:/Users/gozala/Projects/js-dag-ucan",
     "@ucanto/interface": "^1.0.0",
     "multiformats": "^9.8.1"
   },

packages/core/src/delegation.js

@@ -15,7 +15,7 @@ export const isLink =
  * @param {API.Proof} proof
  * @return {proof is API.Delegation}
  */
-export const isDelegation = (proof) => !Link.isLink(proof)
+export const isDelegation = proof => !Link.isLink(proof)
 
 /**
  * Represents UCAN chain view over the set of DAG UCAN nodes. You can think of
@@ -73,14 +73,14 @@ export class Delegation {
   }
 
   /**
-   * @type {API.UCAN.Principal}
+   * @type {API.Principal}
    */
   get issuer() {
     return this.data.issuer
   }
 
   /**
-   * @type {API.UCAN.Principal}
+   * @type {API.Principal}
    */
   get audience() {
     return this.data.audience
@@ -166,9 +166,8 @@ const decode = ({ bytes }) => {
  * not set it defaults to 30 seconds from now. Returns UCAN in primary - IPLD
  * representation.
  *
- * @template {number} A
  * @template {API.Capabilities} C
- * @param {API.DelegationOptions<C, A>} data
+ * @param {API.DelegationOptions<C>} data
  * @param {API.EncodeOptions} [options]
  * @returns {Promise<API.Delegation<C>>}
  */
@@ -230,7 +229,7 @@ const exportDAG = function* (root, blocks) {
  * @param {Iterable<API.Block>} dag
  * @returns {API.Delegation<C>}
  */
-export const importDAG = (dag) => {
+export const importDAG = dag => {
   /** @type {Array<[string, API.Block]>} */
   let entries = []
   for (const block of dag) {
@@ -262,7 +261,7 @@ export const create = ({ root, blocks }) => new Delegation(root, blocks)
 /**
  * @param {API.Delegation} delegation
  */
-const proofs = (delegation) => {
+const proofs = delegation => {
   /** @type {API.Proof[]} */
   const proofs = []
   const { root, blocks } = delegation

packages/core/src/invocation.js

@@ -6,7 +6,7 @@ import { delegate } from './delegation.js'
  * @param {API.InvocationOptions<Capability>} options
  * @return {API.IssuedInvocationView<Capability>}
  */
-export const invoke = (options) => new IssuedInvocation(options)
+export const invoke = options => new IssuedInvocation(options)
 
 /**
  * @template {API.Capability} Capability

packages/core/src/lib.js

@@ -10,3 +10,4 @@ export {
   decode as decodeLink,
 } from './link.js'
 export * as UCAN from '@ipld/dag-ucan'
+export * as DID from '@ipld/dag-ucan/did'

packages/core/test/fixtures.js

@@ -1,18 +1,18 @@
-import { SigningPrincipal } from '@ucanto/principal'
+import * as ed25519 from '@ucanto/principal/ed25519'
 
 /** did:key:z6Mkqa4oY9Z5Pf5tUcjLHLUsDjKwMC95HGXdE1j22jkbhz6r */
-export const alice = SigningPrincipal.parse(
+export const alice = ed25519.parse(
   'MgCZT5vOnYZoVAeyjnzuJIVY9J4LNtJ+f8Js0cTPuKUpFne0BVEDJjEu6quFIU8yp91/TY/+MYK8GvlKoTDnqOCovCVM='
 )
 /** did:key:z6MkffDZCkCTWreg8868fG1FGFogcJj5X6PY93pPcWDn9bob */
-export const bob = SigningPrincipal.parse(
+export const bob = ed25519.parse(
   'MgCYbj5AJfVvdrjkjNCxB3iAUwx7RQHVQ7H1sKyHy46Iose0BEevXgL1V73PD9snOCIoONgb+yQ9sycYchQC8kygR4qY='
 )
 /** did:key:z6MktafZTREjJkvV5mfJxcLpNBoVPwDLhTuMg9ng7dY4zMAL */
-export const mallory = SigningPrincipal.parse(
+export const mallory = ed25519.parse(
   'MgCYtH0AvYxiQwBG6+ZXcwlXywq9tI50G2mCAUJbwrrahkO0B0elFYkl3Ulf3Q3A/EvcVY0utb4etiSE8e6pi4H0FEmU='
 )
 
-export const service = SigningPrincipal.parse(
+export const service = ed25519.parse(
   'MgCYKXoHVy7Vk4/QjcEGi+MCqjntUiasxXJ8uJKY0qh11e+0Bs8WsdqGK7xothgrDzzWD0ME7ynPjz2okXDh8537lId8='
 )

packages/core/test/invocation.spec.js

@@ -35,7 +35,7 @@ test('expired invocation', async () => {
   const expiration = UCAN.now() - 5
   const invocation = invoke({
     issuer: alice,
-    audience: w3.principal,
+    audience: w3,
     capability: {
       can: 'store/add',
       with: alice.did(),
@@ -59,7 +59,7 @@ test('invocation with notBefore', async () => {
   const notBefore = UCAN.now() + 500
   const invocation = invoke({
     issuer: alice,
-    audience: w3.principal,
+    audience: w3,
     capability: {
       can: 'store/add',
       with: alice.did(),
@@ -81,7 +81,7 @@ test('invocation with notBefore', async () => {
 test('invocation with nonce', async () => {
   const invocation = invoke({
     issuer: alice,
-    audience: w3.principal,
+    audience: w3,
     capability: {
       can: 'store/add',
       with: alice.did(),
@@ -103,7 +103,7 @@ test('invocation with nonce', async () => {
 test('invocation with facts', async () => {
   const invocation = invoke({
     issuer: alice,
-    audience: w3.principal,
+    audience: w3,
     capability: {
       can: 'store/add',
       with: alice.did(),

packages/core/test/lib.spec.js

@@ -228,7 +228,7 @@ test('create delegation chain', async () => {
     })
   }
 
-  const data = await UCAN.issue({
+  const ucan = await UCAN.issue({
     issuer: mallory,
     audience: service,
     capabilities: [
@@ -240,8 +240,8 @@ test('create delegation chain', async () => {
     proofs: [delegation.cid],
   })
 
-  const { cid, bytes } = await UCAN.write(data)
-  const root = { cid, data, bytes }
+  const { cid, bytes } = await UCAN.write(ucan)
+  const root = { cid, data: ucan.model, bytes }
 
   {
     const invocation = Delegation.create({
@@ -346,7 +346,7 @@ test('import delegation', async () => {
   })
 
   const replica = Delegation.import(original.export())
-  assert.deepEqual(original, replica)
+  assert.deepEqual(replica, original)
 
   assert.equal(replica.issuer.did(), alice.did())
   assert.equal(replica.audience.did(), bob.did())
@@ -404,7 +404,7 @@ test('issue chained delegation', async () => {
     return assert.fail('must be a delegation')
   }
 
-  assert.deepEqual(proof.bytes, delegation.bytes)
+  assert.deepEqual(delegation.bytes, proof.bytes)
 
   assert.deepEqual([...proof.export()], [proof.root])
   assert.deepEqual([...delegation.export()], [proof.root])

packages/interface/package.json

@@ -23,7 +23,7 @@
     "build": "tsc --build"
   },
   "dependencies": {
-    "@ipld/dag-ucan": "3.0.0-beta",
+    "@ipld/dag-ucan": "link:/Users/gozala/Projects/js-dag-ucan",
     "multiformats": "^9.8.1"
   },
   "devDependencies": {

packages/interface/src/capability.ts

@@ -5,7 +5,7 @@ import {
   Result,
   Failure,
   PrincipalParser,
-  SigningPrincipal,
+  Signer,
   URI,
   Await,
   IssuedInvocationView,
@@ -167,7 +167,7 @@ export type InvokeCapabilityOptions<
   C extends {}
 > = UCANOptions &
   InferCreateOptions<R, C> & {
-    issuer: SigningPrincipal
+    issuer: Signer
   }
 
 export interface CapabilityParser<M extends Match = Match> extends View<M> {

packages/interface/src/lib.ts

@@ -13,13 +13,11 @@ import {
   Phantom,
   Resource,
   Signature,
+  Principal,
+  Verifier,
+  Signer,
 } from '@ipld/dag-ucan'
 import * as UCAN from '@ipld/dag-ucan'
-import type {
-  Principal,
-  PrincipalParser,
-  SigningPrincipal,
-} from './principal.js'
 import {
   CanIssue,
   InvalidAudience,
@@ -33,14 +31,13 @@ export type {
   MultibaseDecoder,
   MultibaseEncoder,
 } from 'multiformats/bases/interface'
-export * from './principal.js'
 export * from './capability.js'
 export * from './transport.js'
 export type {
   Transport,
   Principal,
-  PrincipalParser,
-  SigningPrincipal,
+  Verifier,
+  Signer,
   Phantom,
   Tuple,
   DID,
@@ -80,11 +77,8 @@ export interface UCANOptions {
   proofs?: Proof[]
 }
 
-export interface DelegationOptions<
-  C extends Capabilities,
-  A extends number = number
-> extends UCANOptions {
-  issuer: SigningPrincipal<A>
+export interface DelegationOptions<C extends Capabilities> extends UCANOptions {
+  issuer: Signer
   audience: Principal
   capabilities: C
   proofs?: Proof[]
@@ -93,17 +87,17 @@ export interface DelegationOptions<
 export interface Delegation<C extends Capabilities = Capabilities> {
   readonly root: UCANBlock<C>
   /**
-    * Map of all the IPLD blocks that where included with this delegation DAG.
-    * Usually this would be blocks corresponding to proofs, however it may
-    * also contain other blocks e.g. things that `capabilities` or `facts` may
-    * link.
-    * It is not guaranteed to include all the blocks of this DAG, as it represents
-    * a partial DAG of the delegation desired for transporting.
-    *
-    * Also note that map may contain blocks that are not part of this
-    * delegation DAG. That is because `Delegation` is usually constructed as
-    * view / selection over the CAR which may contain bunch of other blocks.
-    */
+   * Map of all the IPLD blocks that where included with this delegation DAG.
+   * Usually this would be blocks corresponding to proofs, however it may
+   * also contain other blocks e.g. things that `capabilities` or `facts` may
+   * link.
+   * It is not guaranteed to include all the blocks of this DAG, as it represents
+   * a partial DAG of the delegation desired for transporting.
+   *
+   * Also note that map may contain blocks that are not part of this
+   * delegation DAG. That is because `Delegation` is usually constructed as
+   * view / selection over the CAR which may contain bunch of other blocks.
+   */
   readonly blocks: Map<string, Block>
 
   readonly cid: UCANLink<C>
@@ -132,13 +126,13 @@ export interface Invocation<C extends Capability = Capability>
 
 export interface InvocationOptions<C extends Capability = Capability>
   extends UCANOptions {
-  issuer: SigningPrincipal
+  issuer: Signer
   capability: C
 }
 
 export interface IssuedInvocation<C extends Capability = Capability>
   extends DelegationOptions<[C]> {
-  readonly issuer: SigningPrincipal
+  readonly issuer: Signer
   readonly audience: Principal
   readonly capabilities: [C]
 
@@ -390,3 +384,7 @@ export interface URI<P extends Protocol = Protocol> extends URL {
 export type URIString<P extends URI> = `${URI['protocol']}${string}` & {
   protocol?: Protocol
 }
+
+export interface PrincipalParser {
+  parse(did: UCAN.DID): UCAN.Verifier
+}

packages/interface/src/query.ts

@@ -10,7 +10,7 @@ import type {
   ConnectionView,
   Service,
   Principal,
-  SigningPrincipal,
+  Signer,
   Failure,
 } from './lib.js'
 
@@ -137,7 +137,7 @@ type Store = {
 }
 declare var store: Store
 declare var channel: ConnectionView<{ store: Store }>
-declare const alice: SigningPrincipal
+declare const alice: Signer
 declare const bob: Principal
 declare const car: UCAN.Link