Merge branch 'main' into governance-committee-add-narissa

TBD54566975 · Apr 2, 2024 · ef7c9f2 · ef7c9f2
2 parents 08c9727 + 3d0e5a4
commit ef7c9f2
Show file tree

Hide file tree

Showing 9 changed files with 289 additions and 132 deletions.
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
  "@tbdex/http-server": "0.27.0",
  "@tbdex/protocol": "0.27.0",
  "@web5/api": "0.8.4",
- "@web5/credentials": "0.4.2",
+ "@web5/credentials": "0.4.5",
  "@web5/crypto": "0.4.0",
  "@web5/crypto-aws-kms": "0.2.0",
  "@web5/dids": "0.4.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/site/docs/web5/build/verifiable-credentials/fan-club-vc.mdx b/site/docs/web5/build/verifiable-credentials/fan-club-vc.mdx
@@ -44,7 +44,7 @@ After installing the packages, we'll import them into our project as shown below
  {
  code: `
 import { DidKeyMethod } from '@web5/dids';
-import { VerifiableCredential, PresentationExchange } from '@web5/credentials';
+import { VerifiableCredential, PresentationExchange, VerifiablePresentation } from '@web5/credentials';
  `,
  language: 'JavaScript', 
  title: 'Issuer.js'
@@ -54,6 +54,7 @@ import { VerifiableCredential, PresentationExchange } from '@web5/credentials';
 import web5.sdk.crypto.InMemoryKeyManager
 import web5.sdk.dids.methods.key.DidKey
 import web5.sdk.credentials.VerifiableCredential
+import web5.sdk.credentials.VerifiablePresentation
 import web5.sdk.credentials.PresentationExchange
  `,
  language: 'Kotlin', 
@@ -165,11 +166,11 @@ Let's break down the `VerifiableCredential.create()` method to understand what e
 vcDataModel: {
  '@context': [ 'https://www.w3.org/2018/credentials/v1' ],
  type: [ 'VerifiableCredential', 'SwiftiesFanClub' ],
- id: 'urn:uuid:daa5ff01-9b7d-485b-9410-22a42952d46c',
- issuer: 'did:key:z6Mkn4w6nSaWe4fjNJRvaHZwFnMm5VexvjzDeozEu2G7jC34',
+ id: 'urn:uuid:c699153c-ea5b-4a10-89e1-dad8bcd95a03',
+ issuer: 'did:dht:yhqhpn1fi9syrantkcou9rdzk864kwhnbm1dnc9ejzdhm1tdrcyo',
  issuanceDate: '2023-12-14T08:20:41Z',
  credentialSubject: {
- id: 'did:key:z6MkjGSeekPGE9QfczHWyW8v2ZzJU68kqSHzV7L2dmQyuyDu',
+ id: 'did:dht:syd4h8aosm3e74qspb7anue5cbzfmgho76rq3yqwozs9ri1kp1do',
  level: 'Stan',
  legit: true
  }
@@ -187,11 +188,11 @@ vcDataModel: {
  "VerifiableCredential",
  "SwiftiesFanClub"
  ],
- "id": "urn:uuid:daa5ff01-9b7d-485b-9410-22a42952d46c",
- "issuer": "did:key:z6Mkn4w6nSaWe4fjNJRvaHZwFnMm5VexvjzDeozEu2G7jC34",
+ "id": "urn:uuid:c699153c-ea5b-4a10-89e1-dad8bcd95a03",
+ "issuer": "did:dht:yhqhpn1fi9syrantkcou9rdzk864kwhnbm1dnc9ejzdhm1tdrcyo",
  "issuanceDate": "2023-12-14T08:20:41Z",
  "credentialSubject": {
- "id": "did:key:z6MkjGSeekPGE9QfczHWyW8v2ZzJU68kqSHzV7L2dmQyuyDu",
+ "id": "did:dht:syd4h8aosm3e74qspb7anue5cbzfmgho76rq3yqwozs9ri1kp1do",
  "level": "Stan",
  "legit": true
  }
@@ -317,41 +318,56 @@ The result of the presentation:
  {
  code: `
 {
- "presentation": {
+ "vpDataModel": {
  "@context": [
- "https://www.w3.org/2018/credentials/v1",
- "https://identity.foundation/presentation-exchange/submission/v1"
+ "https://www.w3.org/2018/credentials/v1"
  ],
  "type": [
- "VerifiablePresentation",
- "PresentationSubmission"
+ "VerifiablePresentation"
  ],
- "presentation_submission": {
- "id": "kMqRP0zRKaiZNlbtbEIxd",
- "definition_id": "presDefId123",
- "descriptor_map": [
- {
- "id": "legitness",
- "format": "jwt_vc",
- "path": "$.verifiableCredential[0]"
- }
- ]
- },
+ "id": "urn:uuid:956875ff-18da-42fe-86ba-c228fa83affa",
+ "holder": "did:dht:syd4h8aosm3e74qspb7anue5cbzfmgho76rq3yqwozs9ri1kp1do",
  "verifiableCredential": [
  "eyJ0eXAiOipOSl...WndCJ9.eyJ2YyTk0MN2pDMzQhdG...UR1In0.rtlg8k9KU8_ENkrY06y..."
- ]
- },
- "presentationSubmissionLocation": 1,
- "presentationSubmission": {
- "id": "kMqRP0zRKaiZNlbtbEIxd",
- "definition_id": "presDefId123",
- "descriptor_map": [
- {
- "id": "legitness",
- "format": "jwt_vc",
- "path": "$.verifiableCredential[0]"
+ ],
+ "presentationResult": {
+ "presentation": {
+ "@context": [
+ "https://www.w3.org/2018/credentials/v1",
+ "https://identity.foundation/presentation-exchange/submission/v1"
+ ],
+ "type": [
+ "VerifiablePresentation",
+ "PresentationSubmission"
+ ],
+ "presentation_submission": {
+ "id": "MvH8D95tqItRlr70T2isw",
+ "definition_id": "presDefId123",
+ "descriptor_map": [
+ {
+ "id": "legitness",
+ "format": "jwt_vc",
+ "path": "$.verifiableCredential[0]"
+ }
+ ]
+ },
+ "verifiableCredential": [
+ "eyJ0eXAiOipOSl...WndCJ9.eyJ2YyTk0MN2pDMzQhdG...UR1In0.rtlg8k9KU8_ENkrY06y..."
+ ]
+ },
+ "presentationSubmissionLocation": 1,
+ "presentationSubmission": {
+ "id": "MvH8D95tqItRlr70T2isw",
+ "definition_id": "presDefId123",
+ "descriptor_map": [
+ {
+ "id": "legitness",
+ "format": "jwt_vc",
+ "path": "$.verifiableCredential[0]"
+ }
+ ]
  }
- ]
+ }
  }
 }
  `,
@@ -368,7 +384,7 @@ The result of the presentation:
  ],
  "id": "urn:uuid:956875ff-18da-42fe-86ba-c228fa83affa",
  "presentation_submission": {
- "id": "kMqRP0zRKaiZNlbtbEIxd",
+ "id": "18656032-8ccb-48bb-adba-9b92bb849878",
  "definitionId": "presDefId123",
  "descriptorMap": [
  {
@@ -379,9 +395,9 @@ The result of the presentation:
  ]
  },
  "verifiableCredential": [
- "eyJ0eXAiOipOSl...WndCJ9.eyJ2YyTk0MN2pDMzQhdG...UR1In0.rtlg8k9KU8_ENkrY06y..."
-  ],
- "holder": "did:key:z6MkjGSeekPGE9QfczHWyW8v2ZzJU68kqSHzV7L2dmQyuyDu"
+ "eyJ0eXAiOipOSl...WndCJ9.eyJ2YyTk0MN2pDMzQhdG...UR1In0.rtlg8k9KU8_ENkrY06y.."
+ ],
+ "holder": "did:dht:syd4h8aosm3e74qspb7anue5cbzfmgho76rq3yqwozs9ri1kp1do"
 }
  `,
  language: 'Kotlin',
@@ -429,10 +445,10 @@ vcDataModel: {
  '@context': [ 'https://www.w3.org/2018/credentials/v1' ],
  type: [ 'VerifiableCredential', 'SwiftiesFanClub' ],
  id: 'urn:uuid:daa5ff01-9b7d-485b-9410-22a42952d46c',
- issuer: 'did:key:z6Mkn4w6nSaWe4fjNJRvaHZwFnMm5VexvjzDeozEu2G7jC34',
+ issuer: 'did:dht:syd4h8aosm3e74qspb7anue5cbzfmgho76rq3yqwozs9ri1kp1do',
  issuanceDate: '2023-12-14T08:20:41Z',
  credentialSubject: {
- id: 'did:key:z6MkjGSeekPGE9QfczHWyW8v2ZzJU68kqSHzV7L2dmQyuyDu',
+ id: 'did:dht:syd4h8aosm3e74qspb7anue5cbzfmgho76rq3yqwozs9ri1kp1do',
  level: 'Stan',
  legit: true
  }
@@ -452,10 +468,10 @@ vcDataModel: {
  "SwiftiesFanClub"
  ],
  "id": "urn:uuid:daa5ff01-9b7d-485b-9410-22a42952d46c",
- "issuer": "did:key:z6Mkn4w6nSaWe4fjNJRvaHZwFnMm5VexvjzDeozEu2G7jC34",
+ "issuer": "did:dht:syd4h8aosm3e74qspb7anue5cbzfmgho76rq3yqwozs9ri1kp1do",
  "issuanceDate": "2023-12-14T08:20:41Z",
  "credentialSubject": {
- "id": "did:key:z6MkjGSeekPGE9QfczHWyW8v2ZzJU68kqSHzV7L2dmQyuyDu",
+ "id": "did:dht:syd4h8aosm3e74qspb7anue5cbzfmgho76rq3yqwozs9ri1kp1do",
  "level": "Stan",
  "legit": true
  }