fix: address pex fixes (openwallet-foundation#2104)

Signed-off-by: Timo Glastra <[email protected]>
berendsliedrecht · Nov 25, 2024 · 6642ea0 · 6642ea0
1 parent e128d55
commit 6642ea0
Show file tree

Hide file tree

Showing 11 changed files with 557 additions and 216 deletions.
diff --git a/packages/askar/package.json b/packages/askar/package.json
@@ -34,7 +34,7 @@
     "tsyringe": "^4.8.0"
   },
   "devDependencies": {
-    "@animo-id/expo-secure-environment": "^0.0.1-alpha.0",
+    "@animo-id/expo-secure-environment": "^0.1.0-alpha.11",
     "@hyperledger/aries-askar-nodejs": "^0.2.3",
     "@hyperledger/aries-askar-shared": "^0.2.3",
     "@types/bn.js": "^5.1.0",
@@ -46,7 +46,7 @@
   },
   "peerDependencies": {
     "@hyperledger/aries-askar-shared": "^0.2.3",
-    "@animo-id/expo-secure-environment": "^0.0.1-alpha.0"
+    "@animo-id/expo-secure-environment": "^0.1.0-alpha.11"
   },
   "peerDependenciesMeta": {
     "@animo-id/expo-secure-environment": {

diff --git a/packages/askar/src/wallet/AskarBaseWallet.ts b/packages/askar/src/wallet/AskarBaseWallet.ts
@@ -206,7 +206,7 @@ export abstract class AskarBaseWallet implements Wallet {
 
         // Generate a hardware-backed P-256 keypair
         secureEnvironment.generateKeypair(kid)
-        const publicKeyBytes = secureEnvironment.getPublicBytesForKeyId(kid)
+        const publicKeyBytes = await secureEnvironment.getPublicBytesForKeyId(kid)
         const publicKeyBase58 = TypedArrayEncoder.toBase58(publicKeyBytes)
 
         await this.storeSecureEnvironmentKeyById({

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -42,7 +42,7 @@
     "@sd-jwt/sd-jwt-vc": "^0.7.0",
     "@sd-jwt/types": "^0.7.0",
     "@sd-jwt/utils": "^0.7.0",
-    "@sphereon/pex": "5.0.0-unstable.25",
+    "@animo-id/pex": "4.1.1-alpha.0",
     "@sphereon/pex-models": "^2.3.1",
     "@sphereon/ssi-types": "0.30.2-next.135",
     "@stablelib/ed25519": "^1.0.2",
@@ -54,7 +54,7 @@
     "class-transformer": "0.5.1",
     "class-validator": "0.14.1",
     "did-resolver": "^4.1.0",
-    "jsonpath": "^1.1.1",
+    "@astronautlabs/jsonpath": "^1.1.2",
     "lru_map": "^0.4.1",
     "luxon": "^3.5.0",
     "make-error": "^1.3.6",
@@ -70,7 +70,6 @@
   },
   "devDependencies": {
     "@types/events": "^3.0.0",
-    "@types/jsonpath": "^0.2.4",
     "@types/luxon": "^3.2.0",
     "@types/object-inspect": "^1.8.0",
     "@types/uuid": "^9.0.1",

diff --git a/packages/core/src/modules/dif-presentation-exchange/DifPresentationExchangeService.ts b/packages/core/src/modules/dif-presentation-exchange/DifPresentationExchangeService.ts
@@ -14,16 +14,16 @@ import type { VerificationMethod } from '../dids'
 import type { SdJwtVcRecord } from '../sd-jwt-vc'
 import type { W3cCredentialRecord } from '../vc'
 import type { IAnonCredsDataIntegrityService } from '../vc/data-integrity/models/IAnonCredsDataIntegrityService'
-import type { PresentationSignCallBackParams, Validated, VerifiablePresentationResult } from '@sphereon/pex'
+import type { PresentationSignCallBackParams, Validated, VerifiablePresentationResult } from '@animo-id/pex'
 import type { InputDescriptorV2 } from '@sphereon/pex-models'
 import type {
   SdJwtDecodedVerifiableCredential,
   W3CVerifiablePresentation as SphereonW3cVerifiablePresentation,
   W3CVerifiablePresentation,
 } from '@sphereon/ssi-types'
 
-import { PEVersion, PEX, PresentationSubmissionLocation, Status } from '@sphereon/pex'
-import { PartialSdJwtDecodedVerifiableCredential } from '@sphereon/pex/dist/main/lib'
+import { PEVersion, PEX, PresentationSubmissionLocation, Status } from '@animo-id/pex'
+import { PartialSdJwtDecodedVerifiableCredential } from '@animo-id/pex/dist/main/lib'
 import { injectable } from 'tsyringe'
 
 import { Hasher, getJwkFromKey } from '../../crypto'