@veramo/credential-ld 3.1.5-next.115 → 3.1.5-next.119

package/src/ld-credential-module.ts

@@ -10,7 +10,7 @@ import {
 import fetch from 'cross-fetch'
 import Debug from 'debug'
 import { extendContextLoader, purposes } from 'jsonld-signatures'
-import * as vc from 'vc-js'
+import * as vc from '@digitalbazaar/vc'
 import { LdContextLoader } from './ld-context-loader'
 import { LdSuiteLoader } from './ld-suite-loader'
 import { RequiredAgentMethods } from './ld-suites'

package/src/ld-default-contexts.ts

@@ -1,25 +1,28 @@
 import { ContextDoc } from './types'
 
 async function _read(_path: string): Promise<ContextDoc> {
-  return await import('../contexts/' + _path);
+  return await import('./contexts/' + _path);
 }
 
 /**
  * Provides a hardcoded map of common context definitions
  */
 export const LdDefaultContexts = new Map([
-  ['https://www.w3.org/2018/credentials/v1', _read('w3_2018_credentials_v1.json')],
-  ['https://www.w3.org/ns/did/v1', _read('security_context_v1.json')],
-  ['https://w3id.org/did/v0.11', _read('did_v0.11.json')],
-
-  ['https://veramo.io/contexts/socialmedia/v1', _read('socialmedia-v1.json')],
-  ['https://veramo.io/contexts/kyc/v1', _read('kyc-v1.json')],
-  ['https://veramo.io/contexts/profile/v1', _read('profile-v1.json')],
-  ['https://ns.did.ai/transmute/v1', _read('transmute_v1.json')],
-  [
-    'https://identity.foundation/EcdsaSecp256k1RecoverySignature2020/lds-ecdsa-secp256k1-recovery2020-0.0.jsonld',
-    _read('lds-ecdsa-secp256k1-recovery2020-0.0.json'),
-  ],
-  ['https://w3id.org/security/suites/ed25519-2018/v1', _read('ed25519-signature-2018-v1.json')],
-  ['https://w3id.org/security/suites/x25519-2019/v1', _read('X25519KeyAgreementKey2019.json')],
+  ['https://www.w3.org/2018/credentials/v1', _read('www.w3.org_2018_credentials_v1.json')],
+  ['https://www.w3.org/ns/did/v1', _read('www.w3.org_ns_did_v1.json')],
+  ['https://w3id.org/security/v1', _read('w3id.org_security_v1.json')],
+  ['https://w3id.org/security/v2', _read('w3id.org_security_v2.json')],
+  ['https://w3id.org/security/v3-unstable', _read('w3id.org_security_v3-unstable.json')],
+  ['https://w3id.org/security/suites/ed25519-2018/v1', _read('w3id.org_security_suites_ed25519-2018_v1.json')],
+  ['https://w3id.org/security/suites/x25519-2019/v1', _read('w3id.org_security_suites_x25519-2019_v1.json')],
+  // ['https://w3id.org/did/v0.11', _read('did_v0.11.json')],
+  // ['https://veramo.io/contexts/socialmedia/v1', _read('socialmedia-v1.json')],
+  // ['https://veramo.io/contexts/kyc/v1', _read('kyc-v1.json')],
+  ['https://veramo.io/contexts/profile/v1', _read('veramo.io_contexts_profile_v1.json')],
+  // ['https://ns.did.ai/transmute/v1', _read('transmute_v1.json')],
+  ['https://identity.foundation/EcdsaSecp256k1RecoverySignature2020/lds-ecdsa-secp256k1-recovery2020-0.0.jsonld', _read('lds-ecdsa-secp256k1-recovery2020-0.0.json')],
+  ['https://identity.foundation/EcdsaSecp256k1RecoverySignature2020/lds-ecdsa-secp256k1-recovery2020-2.0.jsonld', _read('w3id.org_security_suites_secp256k1recovery-2020_v2.json')],
+  ['https://w3id.org/security/suites/secp256k1recovery-2020/v2', _read('w3id.org_security_suites_secp256k1recovery-2020_v2.json')],
+  // ['https://w3id.org/security/suites/ed25519-2018/v1', _read('ed25519-signature-2018-v1.json')],
+  // ['https://w3id.org/security/suites/x25519-2019/v1', _read('X25519KeyAgreementKey2019.json')],
 ])

package/src/ld-suites.ts

@@ -38,7 +38,7 @@ export abstract class VeramoLdSignature {
     // TODO: Remove invalid field 'verifiers' from Presentation. Needs to be adapted for LD credentials
     // Only remove empty array (vc.signPresentation will throw then)
     const sanitizedPresentation = presentation as any
-    if (sanitizedPresentation.verifier.length == 0) {
+    if (sanitizedPresentation.verifier?.length == 0) {
       delete sanitizedPresentation.verifier
     }
   }

package/src/suites/EcdsaSecp256k1RecoverySignature2020.ts

@@ -1,5 +1,5 @@
 import { RequiredAgentMethods, VeramoLdSignature } from '../ld-suites'
-import { CredentialPayload, DIDDocument, IAgentContext, IKey, TKeyType } from '@veramo/core'
+import { CredentialPayload, DIDDocument, IAgentContext, IKey, PresentationPayload, TKeyType } from '@veramo/core'
 import {
   EcdsaSecp256k1RecoveryMethod2020,
   EcdsaSecp256k1RecoverySignature2020,
@@ -64,18 +64,33 @@ export class VeramoEcdsaSecp256k1RecoverySignature2020 extends VeramoLdSignature
   preSigningCredModification(credential: CredentialPayload): void {
     credential['@context'] = [
       ...asArray(credential['@context'] || []),
-      'https://identity.foundation/EcdsaSecp256k1RecoverySignature2020/lds-ecdsa-secp256k1-recovery2020-0.0.jsonld',
+      'https://w3id.org/security/suites/secp256k1recovery-2020/v2',
+    ]
+  }
+  
+  preSigningPresModification(presentation: PresentationPayload): void {
+    super.preSigningPresModification(presentation)
+    presentation['@context'] = [
+      ...asArray(presentation['@context'] || []),
+      'https://w3id.org/security/suites/secp256k1recovery-2020/v2',
     ]
   }
 
   preDidResolutionModification(didUrl: string, didDoc: DIDDocument): void {
-    // did:ethr
+//    did:ethr
+    const idx = didDoc['@context']?.indexOf('https://identity.foundation/EcdsaSecp256k1RecoverySignature2020/lds-ecdsa-secp256k1-recovery2020-0.0.jsonld') || -1
+    if (Array.isArray(didDoc['@context']) && idx !== -1) {
+      didDoc['@context'][idx] = "https://w3id.org/security/suites/secp256k1recovery-2020/v2"
+    }
+
     if (didUrl.toLowerCase().startsWith('did:ethr')) {
-      // TODO: EcdsaSecp256k1RecoveryMethod2020 does not support blockchainAccountId
-      // blockchainAccountId to ethereumAddress
+      //EcdsaSecp256k1RecoveryMethod2020 does not support older format blockchainAccountId
       didDoc.verificationMethod?.forEach((x) => {
         if (x.blockchainAccountId) {
-          x.ethereumAddress = x.blockchainAccountId.substring(0, x.blockchainAccountId.lastIndexOf('@'))
+          if (x.blockchainAccountId.lastIndexOf('@eip155:') !== -1) {
+            const [ address, chain ] = x.blockchainAccountId.split("@eip155:")
+            x.blockchainAccountId = `eip155:${chain}:${address}`
+          }
         }
       })
     }

package/contexts/lds-ecdsa-secp256k1-recovery2020-0.0.json

@@ -1,60 +0,0 @@
-{
-  "@context": {
-    "@version": 1.1,
-    "id": "@id",
-    "type": "@type",
-    "esrs2020": "https://identity.foundation/EcdsaSecp256k1RecoverySignature2020#",
-
-    "EcdsaSecp256k1RecoverySignature2020": {
-      "@id": "https://w3id.org/security#EcdsaSecp256k1RecoverySignature2020",
-      "@context": {
-        "@version": 1.1,
-        "@protected": true,
-
-        "id": "@id",
-        "type": "@type",
-
-        "sec": "https://w3id.org/security#",
-        "xsd": "http://www.w3.org/2001/XMLSchema#",
-
-        "challenge": "sec:challenge",
-        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
-        "domain": "sec:domain",
-        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
-        "jws": "sec:jws",
-        "nonce": "sec:nonce",
-        "proofPurpose": {
-          "@id": "sec:proofPurpose",
-          "@type": "@vocab",
-          "@context": {
-            "@version": 1.1,
-            "@protected": true,
-
-            "id": "@id",
-            "type": "@type",
-
-            "sec": "https://w3id.org/security#",
-
-            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
-            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
-          }
-        },
-        "proofValue": "sec:proofValue",
-        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
-      }
-    },
-
-    "EcdsaSecp256k1RecoveryMethod2020": "esrs2020:EcdsaSecp256k1RecoveryMethod2020",
-    "publicKeyJwk": {
-      "@id": "esrs2020:publicKeyJwk",
-      "@type": "@json"
-    },
-    "privateKeyJwk": {
-      "@id": "esrs2020:privateKeyJwk",
-      "@type": "@json"
-    },
-    "publicKeyHex": "esrs2020:publicKeyHex",
-    "privateKeyHex": "esrs2020:privateKeyHex",
-    "ethereumAddress": "esrs2020:ethereumAddress"
-  }
-}