chore: update mdoc and ssi-types

Signed-off-by: Timo Glastra <[email protected]>

Author: TimoGlastra

lib/PEX.ts

@@ -100,7 +100,7 @@ export class PEX {
     const presentationsCopy: OriginalVerifiablePresentation[] = JSON.parse(JSON.stringify(presentationsArray));
 
     const wrappedPresentations: WrappedVerifiablePresentation[] = presentationsCopy.map((p) =>
-      SSITypesBuilder.mapExternalVerifiablePresentationToWrappedVP(p, this.options?.hasher),
+      SSITypesBuilder.mapExternalVerifiablePresentationToWrappedVP(p),
     );
 
     let presentationSubmission = opts?.presentationSubmission;
@@ -189,10 +189,8 @@ export class PEX {
       restrictToDIDMethods?: string[];
     },
   ): EvaluationResults {
-    const wrappedVerifiableCredentials: WrappedVerifiableCredential[] = SSITypesBuilder.mapExternalVerifiableCredentialsToWrappedVcs(
-      verifiableCredentials,
-      this.options?.hasher,
-    );
+    const wrappedVerifiableCredentials: WrappedVerifiableCredential[] =
+      SSITypesBuilder.mapExternalVerifiableCredentialsToWrappedVcs(verifiableCredentials);
 
     // TODO:  So we have state in the form of this property which is set in the constructor, but we are overwriting it here. We need to retrhink how to instantiate PEX
     this._evaluationClientWrapper = new EvaluationClientWrapper();
@@ -234,11 +232,7 @@ export class PEX {
     const pd: IInternalPresentationDefinition = SSITypesBuilder.toInternalPresentationDefinition(presentationDefinition);
     // TODO:  So we have state in the form of this property which is set in the constructor, but we are overwriting it here. We need to retrhink how to instantiate PEX
     this._evaluationClientWrapper = new EvaluationClientWrapper();
-    return this._evaluationClientWrapper.selectFrom(
-      pd,
-      SSITypesBuilder.mapExternalVerifiableCredentialsToWrappedVcs(verifiableCredentialCopy, this.options?.hasher),
-      opts,
-    );
+    return this._evaluationClientWrapper.selectFrom(pd, SSITypesBuilder.mapExternalVerifiableCredentialsToWrappedVcs(verifiableCredentialCopy), opts);
   }
 
   public presentationSubmissionFrom(
@@ -255,11 +249,7 @@ export class PEX {
     },
   ): PresentationSubmission {
     const pd: IInternalPresentationDefinition = SSITypesBuilder.toInternalPresentationDefinition(presentationDefinition);
-    return this._evaluationClientWrapper.submissionFrom(
-      pd,
-      SSITypesBuilder.mapExternalVerifiableCredentialsToWrappedVcs(selectedCredentials, this.options?.hasher),
-      opts,
-    );
+    return this._evaluationClientWrapper.submissionFrom(pd, SSITypesBuilder.mapExternalVerifiableCredentialsToWrappedVcs(selectedCredentials), opts);
   }
 
   /**
@@ -294,7 +284,6 @@ export class PEX {
       ...opts,
       // We only pass in the submission in case it needs to be included in the presentation
       presentationSubmission: presentationSubmissionLocation === PresentationSubmissionLocation.PRESENTATION ? presentationSubmission : undefined,
-      hasher: this.options?.hasher,
     });
     this.updateSdJwtCredentials(presentations);
     return {
@@ -320,13 +309,8 @@ export class PEX {
       throw Error(`At least a verifiable credential needs to be passed in to create a presentation`);
     }
     const verifiableCredential = (Array.isArray(selectedCredentials) ? selectedCredentials : [selectedCredentials]) as W3CVerifiableCredential[];
-    if (verifiableCredential.some((c) => CredentialMapper.isSdJwtDecodedCredential(c) || CredentialMapper.isSdJwtEncoded(c))) {
-      if (!this.options?.hasher) {
-        throw new Error('Hasher must be provided when creating a presentation with an SD-JWT VC');
-      }
-    }
 
-    const wVCs = verifiableCredential.map((vc) => CredentialMapper.toWrappedVerifiableCredential(vc, { hasher: this.options?.hasher }));
+    const wVCs = verifiableCredential.map((vc) => CredentialMapper.toWrappedVerifiableCredential(vc));
     const holders = Array.from(new Set(wVCs.flatMap((wvc) => getSubjectIdsAsString(wvc.credential as ICredential))));
     const holder = opts?.holderDID ?? (holders.length === 1 ? holders[0] : undefined);
 
@@ -371,7 +355,7 @@ export class PEX {
         if (CredentialMapper.isSdJwtDecodedCredential(vc)) {
           result.push(vc as PartialSdJwtDecodedVerifiableCredential);
         } else if (CredentialMapper.isSdJwtEncoded(vc)) {
-          const decoded = CredentialMapper.decodeVerifiableCredential(vc, opts?.hasher);
+          const decoded = CredentialMapper.decodeVerifiableCredential(vc);
           result.push(decoded as PartialSdJwtDecodedVerifiableCredential);
         } else {
           // This should be jwt or json-ld
@@ -586,13 +570,10 @@ export class PEX {
       // Select type without kbJwt as isSdJwtDecodedCredential and won't accept the partial sdvc type
       if (CredentialMapper.isSdJwtDecodedCredential(presentation as SdJwtDecodedVerifiableCredential)) {
         const sdJwtCredential = presentation as SdJwtDecodedVerifiableCredential;
-        if (!this.options?.hasher) {
-          throw new Error('Hasher must be provided when creating a presentation with an SD-JWT VC');
-        }
 
         // extract sd_alg or default to sha-256
         const hashAlg = sdJwtCredential.signedPayload._sd_alg ?? 'sha-256';
-        const sdHash = calculateSdHash(sdJwtCredential.compactSdJwtVc, hashAlg, this.options.hasher);
+        const sdHash = calculateSdHash(sdJwtCredential.compactSdJwtVc, hashAlg);
 
         const kbJwt = {
           // alg MUST be set by the signer

lib/types/SSITypesBuilder.ts

@@ -6,7 +6,6 @@ import {
 } from '@sphereon/pex-models';
 import {
   CredentialMapper,
-  Hasher,
   JwtDecodedVerifiablePresentation,
   OriginalVerifiableCredential,
   OriginalVerifiablePresentation,
@@ -46,18 +45,17 @@ export class SSITypesBuilder {
 
   static mapExternalVerifiablePresentationToWrappedVP(
     presentation: OriginalVerifiablePresentation | JwtDecodedVerifiablePresentation,
-    hasher?: Hasher,
   ): WrappedVerifiablePresentation {
-    return CredentialMapper.toWrappedVerifiablePresentation(presentation, { hasher });
+    return CredentialMapper.toWrappedVerifiablePresentation(presentation);
   }
 
   static mapExternalVerifiableCredentialsToWrappedVcs(
     verifiableCredentials: OriginalVerifiableCredential | OriginalVerifiableCredential[],
-    hasher?: Hasher,
   ): WrappedVerifiableCredential[] {
-    return CredentialMapper.toWrappedVerifiableCredentials(Array.isArray(verifiableCredentials) ? verifiableCredentials : [verifiableCredentials], {
-      hasher,
-    });
+    return CredentialMapper.toWrappedVerifiableCredentials(
+      Array.isArray(verifiableCredentials) ? verifiableCredentials : [verifiableCredentials],
+      {},
+    );
   }
 
   static toInternalPresentationDefinition(presentationDefinition: IPresentationDefinition): IInternalPresentationDefinition {

lib/utils/sdJwt.ts

@@ -2,7 +2,7 @@ import { getSDAlgAndPayload, unpackObj } from '@sd-jwt/decode';
 import { createHashMappingForSerializedDisclosure, selectDisclosures } from '@sd-jwt/present';
 import { PresentationFrame } from '@sd-jwt/types';
 import {
-  Hasher,
+  defaultHasher,
   SdJwtDecodedDisclosure,
   SdJwtDecodedVerifiableCredential,
   SdJwtDecodedVerifiableCredentialPayload,
@@ -12,8 +12,8 @@ import * as u8a from 'uint8arrays';
 
 import { ObjectUtils } from './ObjectUtils';
 
-export function calculateSdHash(compactSdJwtVc: string, alg: string, hasher: Hasher): string {
-  const digest = hasher(compactSdJwtVc, alg);
+export function calculateSdHash(compactSdJwtVc: string, alg: string): string {
+  const digest = defaultHasher(compactSdJwtVc, alg);
   return u8a.toString(digest, 'base64url');
 }
 

package.json

@@ -49,8 +49,8 @@
     "@sd-jwt/decode": "^0.7.2",
     "@sd-jwt/present": "^0.7.2",
     "@sd-jwt/types": "^0.7.2",
-    "@sphereon/pex-models": "^2.3.1",
-    "@sphereon/ssi-types": "0.30.2-next.135",
+    "@sphereon/pex-models": "^2.3.2",
+    "@sphereon/ssi-types": "0.33.0",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "jwt-decode": "^3.1.2",