diff --git a/apps/ssi-abstraction/src/agent/revocation/TailsFileService.ts b/apps/ssi-abstraction/src/agent/revocation/TailsFileService.ts
index 56f0d436f3e7de029a5450faa7d099564f813607..81401315b4a13733fc3252544a2145dbcdf9d479 100644
--- a/apps/ssi-abstraction/src/agent/revocation/TailsFileService.ts
+++ b/apps/ssi-abstraction/src/agent/revocation/TailsFileService.ts
@@ -1,7 +1,7 @@
-import type { AnonCredsRevocationRegistryDefinition } from '@aries-framework/anoncreds';
-import type { AgentContext } from '@aries-framework/core';
+import type { AnonCredsRevocationRegistryDefinition } from '@credo-ts/anoncreds';
+import type { AgentContext } from '@credo-ts/core';
 
-import { BasicTailsFileService } from '@aries-framework/anoncreds/build/services/tails/BasicTailsFileService.js';
+import { BasicTailsFileService } from '@credo-ts/anoncreds';
 import FormData from 'form-data';
 import fs from 'fs';
 
diff --git a/apps/ssi-abstraction/src/agent/revocation/revocation.service.ts b/apps/ssi-abstraction/src/agent/revocation/revocation.service.ts
index e4a4bba48505ddb8c0eee279135c1ef5d219a27b..4b4c8312bccf8089d2232710d4a87e1098e774f5 100644
--- a/apps/ssi-abstraction/src/agent/revocation/revocation.service.ts
+++ b/apps/ssi-abstraction/src/agent/revocation/revocation.service.ts
@@ -92,9 +92,13 @@ export class RevocationService {
         );
       }
 
+      // TODO: set endorser options
       const result = await t.modules.anoncreds.updateRevocationStatusList({
-        revocationRegistryDefinitionId: metadata.revocationRegistryId,
-        revokedCredentialIndexes: [Number(metadata.credentialRevocationId)],
+        revocationStatusList: {
+          revocationRegistryDefinitionId: metadata.revocationRegistryId,
+          revokedCredentialIndexes: [Number(metadata.credentialRevocationId)],
+        },
+        options: {},
       });
 
       if (result.revocationStatusListState.state !== 'finished') {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index effefd8894d8528d2386170c79b926723200dd9a..93bc4abab406c98c62000d7cbcaed1d892f15513 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -19,10 +19,10 @@ importers:
         version: 10.3.0(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1)
       '@nestjs/core':
         specifier: ^10.3.0
-        version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/microservices@10.3.0)(@nestjs/platform-express@10.3.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
+        version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/microservices@10.3.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
       '@nestjs/microservices':
         specifier: ^10.3.0
-        version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(nats@2.19.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
+        version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
       '@typescript-eslint/eslint-plugin':
         specifier: ^6.12.0
         version: 6.19.0(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)(typescript@5.3.3)
@@ -435,37 +435,15 @@ importers:
 
   apps/shared:
     dependencies:
-<<<<<<< HEAD
       '@credo-ts/anoncreds':
         specifier: ^0.5.0-alpha.116
-        version: 0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.9)(expo@49.0.21)(react-native@0.73.2)
+        version: 0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.10)(expo@49.0.21)(react-native@0.73.2)
       '@credo-ts/core':
         specifier: ^0.5.0-alpha.116
         version: 0.5.0-alpha.116(expo@49.0.21)(react-native@0.73.2)
       '@credo-ts/tenants':
         specifier: ^0.5.0-alpha.116
         version: 0.5.0-alpha.116(expo@49.0.21)(react-native@0.73.2)
-=======
-      '@aries-framework/anoncreds':
-        specifier: 0.5.0-alpha.93
-        version: 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      '@aries-framework/core':
-        specifier: 0.5.0-alpha.93
-        version: 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      '@aries-framework/tenants':
-<<<<<<< HEAD
-<<<<<<< HEAD
-        specifier: ^0.5.0-alpha.87
-        version: 0.5.0-alpha.91(expo@49.0.21)(react-native@0.73.2)
->>>>>>> b235c33 (chore(ssi): update AFJ to latest alpha release)
-=======
-        specifier: 0.5.0-alpha.87
-        version: 0.5.0-alpha.87(expo@49.0.21)(react-native@0.73.2)
->>>>>>> 63efb70 (fix: resolved merge issues)
-=======
-        specifier: 0.5.0-alpha.93
-        version: 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
->>>>>>> 7db39fe (feat: added transaction endorsement)
       '@elastic/ecs-winston-format':
         specifier: ^1.5.0
         version: 1.5.2
@@ -548,10 +526,9 @@ importers:
 
   apps/ssi-abstraction:
     dependencies:
-<<<<<<< HEAD
       '@credo-ts/anoncreds':
         specifier: 0.5.0-alpha.116
-        version: 0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.9)(expo@49.0.21)(react-native@0.73.2)
+        version: 0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.10)(expo@49.0.21)(react-native@0.73.2)
       '@credo-ts/askar':
         specifier: 0.5.0-alpha.116
         version: 0.5.0-alpha.116(@hyperledger/aries-askar-shared@0.2.0-dev.6)(expo@49.0.21)(react-native@0.73.2)
@@ -560,63 +537,22 @@ importers:
         version: 0.5.0-alpha.116(expo@49.0.21)(react-native@0.73.2)
       '@credo-ts/indy-vdr':
         specifier: 0.5.0-alpha.116
-        version: 0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.9)(@hyperledger/indy-vdr-shared@0.2.0-dev.6)(expo@49.0.21)(react-native@0.73.2)
+        version: 0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.10)(@hyperledger/indy-vdr-shared@0.2.0-dev.6)(expo@49.0.21)(react-native@0.73.2)
       '@credo-ts/node':
         specifier: 0.5.0-alpha.116
         version: 0.5.0-alpha.116(expo@49.0.21)(react-native@0.73.2)
       '@credo-ts/tenants':
         specifier: ^0.5.0-alpha.116
         version: 0.5.0-alpha.116(expo@49.0.21)(react-native@0.73.2)
-=======
-      '@aries-framework/anoncreds':
-        specifier: 0.5.0-alpha.93
-        version: 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      '@aries-framework/anoncreds-rs':
-        specifier: 0.5.0-alpha.93
-        version: 0.5.0-alpha.93(@hyperledger/anoncreds-shared@0.2.0-dev.8)(expo@49.0.21)(react-native@0.73.2)
-      '@aries-framework/askar':
-        specifier: 0.5.0-alpha.93
-        version: 0.5.0-alpha.93(@hyperledger/aries-askar-shared@0.2.0-dev.5)(expo@49.0.21)(react-native@0.73.2)
-      '@aries-framework/core':
-        specifier: 0.5.0-alpha.93
-        version: 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      '@aries-framework/indy-vdr':
-        specifier: 0.5.0-alpha.93
-        version: 0.5.0-alpha.93(@hyperledger/indy-vdr-shared@0.2.0-dev.6)(expo@49.0.21)(react-native@0.73.2)
-      '@aries-framework/node':
-        specifier: 0.5.0-alpha.93
-        version: 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      '@aries-framework/tenants':
-<<<<<<< HEAD
-<<<<<<< HEAD
-        specifier: ^0.5.0-alpha.87
-        version: 0.5.0-alpha.91(expo@49.0.21)(react-native@0.73.2)
->>>>>>> b235c33 (chore(ssi): update AFJ to latest alpha release)
-=======
-        specifier: 0.5.0-alpha.87
-        version: 0.5.0-alpha.87(expo@49.0.21)(react-native@0.73.2)
->>>>>>> 63efb70 (fix: resolved merge issues)
-=======
-        specifier: 0.5.0-alpha.93
-        version: 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
->>>>>>> 7db39fe (feat: added transaction endorsement)
       '@elastic/ecs-winston-format':
         specifier: ^1.5.0
         version: 1.5.2
       '@hyperledger/anoncreds-nodejs':
-<<<<<<< HEAD
         specifier: ^0.2.0-dev.9
-        version: 0.2.0-dev.9
+        version: 0.2.0-dev.10
       '@hyperledger/aries-askar-nodejs':
         specifier: ^0.2.0-dev.6
         version: 0.2.0-dev.6
-=======
-        specifier: ^0.2.0-dev.7
-        version: 0.2.0-dev.8
-      '@hyperledger/aries-askar-nodejs':
-        specifier: ^0.2.0-dev.5
-        version: 0.2.0-dev.5
->>>>>>> b235c33 (chore(ssi): update AFJ to latest alpha release)
       '@hyperledger/indy-vdr-nodejs':
         specifier: ^0.2.0-dev.6
         version: 0.2.0-dev.6
@@ -631,7 +567,7 @@ importers:
         version: 3.1.1(@nestjs/common@10.3.0)(reflect-metadata@0.1.14)
       '@nestjs/core':
         specifier: ^10.3.0
-        version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/microservices@10.3.0)(@nestjs/platform-express@10.3.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
+        version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/microservices@10.3.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
       '@nestjs/microservices':
         specifier: ^10.3.0
         version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(nats@2.19.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
@@ -671,7 +607,7 @@ importers:
         version: 10.1.0(chokidar@3.5.3)(typescript@5.3.3)
       '@nestjs/testing':
         specifier: ^10.2.10
-        version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(@nestjs/microservices@10.3.0)(@nestjs/platform-express@10.3.0)
+        version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(@nestjs/microservices@10.3.0)
       '@types/express':
         specifier: ^4.17.21
         version: 4.17.21
@@ -812,164 +748,6 @@ packages:
       - chokidar
     dev: true
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-  /@astronautlabs/jsonpath@1.1.2:
-    resolution: {integrity: sha512-FqL/muoreH7iltYC1EB5Tvox5E8NSOOPGkgns4G+qxRKl6k5dxEVljUjB5NcKESzkqwnUqWjSZkL61XGYOuV+A==}
-    dependencies:
-      static-eval: 2.0.2
-=======
-  /@aries-framework/anoncreds-rs@0.5.0-alpha.87(@hyperledger/anoncreds-shared@0.2.0-dev.8)(expo@49.0.21)(react-native@0.73.2):
-    resolution: {integrity: sha512-5SOfD65roN9A9WTJ+93yBdB+OcgUMhaoF9f1EDvMnneB0u80Yy+YLxEDs9QVcDJghh5mu7LlxfjGU8GLaaV7Bw==}
-=======
-  /@aries-framework/anoncreds-rs@0.5.0-alpha.93(@hyperledger/anoncreds-shared@0.2.0-dev.8)(expo@49.0.21)(react-native@0.73.2):
-    resolution: {integrity: sha512-jiSIjdT3CsW98/5soWTzgKTZhCHIDzM8lQhFgaads4V+1L6a/3+ZMz0lQK7CZa1Pvd1v6it92Zd2ULMnqnMd+A==}
->>>>>>> 7db39fe (feat: added transaction endorsement)
-    peerDependencies:
-      '@hyperledger/anoncreds-shared': ^0.2.0-dev.5
-    dependencies:
-      '@aries-framework/anoncreds': 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      '@aries-framework/core': 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      '@hyperledger/anoncreds-shared': 0.2.0-dev.8
-      class-transformer: 0.5.1
-      class-validator: 0.14.0
-      rxjs: 7.8.1
-      tsyringe: 4.8.0
-    transitivePeerDependencies:
-      - domexception
-      - encoding
-      - expo
-      - react-native
-      - web-streams-polyfill
-    dev: false
-
-  /@aries-framework/anoncreds@0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2):
-    resolution: {integrity: sha512-xoDx9LpvxMD8Jci0AwlzEHJRdAat9XOF2niUOzKSbWy9WBUfgbY836mMEe05hsJXgmjGTXwfL83NCqznOdEOFg==}
-    dependencies:
-      '@aries-framework/core': 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      bn.js: 5.2.1
-      class-transformer: 0.5.1
-      class-validator: 0.14.0
-      reflect-metadata: 0.1.14
-    transitivePeerDependencies:
-      - domexception
-      - encoding
-      - expo
-      - react-native
-      - web-streams-polyfill
-    dev: false
-
-  /@aries-framework/askar@0.5.0-alpha.93(@hyperledger/aries-askar-shared@0.2.0-dev.5)(expo@49.0.21)(react-native@0.73.2):
-    resolution: {integrity: sha512-2oSIWQ+pV1zzCwBLhvsXBX1ZuM6TeH74XLbjcZmcuRbSkc1GQwTNAYg+zUS2RyfAXiWKzwHyqXLhVWjhjmUTnw==}
-    peerDependencies:
-      '@hyperledger/aries-askar-shared': ^0.2.0-dev.5
-    dependencies:
-      '@aries-framework/core': 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      '@hyperledger/aries-askar-shared': 0.2.0-dev.5
-      bn.js: 5.2.1
-      class-transformer: 0.5.1
-      class-validator: 0.14.0
-      rxjs: 7.8.1
-      tsyringe: 4.8.0
-    transitivePeerDependencies:
-      - domexception
-      - encoding
-      - expo
-      - react-native
-      - web-streams-polyfill
-    dev: false
-
-  /@aries-framework/core@0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2):
-    resolution: {integrity: sha512-mxF45NfUnBDW4/fQY2g5x5UxCk8GTAfuQb9v2zWOUY8y+qVd35QApkDBqJIvAl1D91X5+V6xRgTnW/Cluq32aA==}
-    dependencies:
-      '@digitalcredentials/jsonld': 5.2.2(expo@49.0.21)(react-native@0.73.2)
-      '@digitalcredentials/jsonld-signatures': 9.3.2(expo@49.0.21)(react-native@0.73.2)
-      '@digitalcredentials/vc': 1.1.2(expo@49.0.21)(react-native@0.73.2)
-      '@multiformats/base-x': 4.0.1
-      '@sphereon/pex': 2.2.2
-      '@sphereon/pex-models': 2.1.5
-      '@sphereon/ssi-types': 0.17.5
-      '@stablelib/ed25519': 1.0.3
-      '@stablelib/random': 1.0.2
-      '@stablelib/sha256': 1.0.1
-      '@types/ws': 8.5.10
-      abort-controller: 3.0.0
-      big-integer: 1.6.52
-      borc: 3.0.0
-      buffer: 6.0.3
-      class-transformer: 0.5.1
-      class-validator: 0.14.0
-      did-resolver: 4.1.0
-      jsonpath: 1.1.1
-      lru_map: 0.4.1
-      luxon: 3.4.4
-      make-error: 1.3.6
-      object-inspect: 1.13.1
-      query-string: 7.1.3
-      reflect-metadata: 0.1.14
-      rxjs: 7.8.1
-      tsyringe: 4.8.0
-      uuid: 9.0.1
-      varint: 6.0.0
-      web-did-resolver: 2.0.27
-    transitivePeerDependencies:
-      - domexception
-      - encoding
-      - expo
-      - react-native
-      - web-streams-polyfill
-    dev: false
-
-  /@aries-framework/indy-vdr@0.5.0-alpha.93(@hyperledger/indy-vdr-shared@0.2.0-dev.6)(expo@49.0.21)(react-native@0.73.2):
-    resolution: {integrity: sha512-xJMn1snLnA/rWvix837CkGc31ss5rcQw316dK+93YG1jh18KuqsMNBgGRGxrYdT8BeP6CwJisTz15KU7QmJIEA==}
-    peerDependencies:
-      '@hyperledger/indy-vdr-shared': ^0.2.0-dev.6
-    dependencies:
-      '@aries-framework/anoncreds': 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      '@aries-framework/core': 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      '@hyperledger/indy-vdr-shared': 0.2.0-dev.6
-    transitivePeerDependencies:
-      - domexception
-      - encoding
-      - expo
-      - react-native
-      - web-streams-polyfill
-    dev: false
-
-  /@aries-framework/node@0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2):
-    resolution: {integrity: sha512-Ieorxky6fmayKxAMb7b7JbsCTja9enhMdeLp5UEpuWVWA2I/IQFSyAGFgLs7scTn40dQ4Fe8MvhYYk6OIpDGtw==}
-    dependencies:
-      '@2060.io/ffi-napi': 4.0.8
-      '@2060.io/ref-napi': 3.0.6
-      '@aries-framework/core': 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      '@types/express': 4.17.21
-      express: 4.18.2
-      ws: 8.16.0
-    transitivePeerDependencies:
-      - bufferutil
-      - domexception
-      - encoding
-      - expo
-      - react-native
-      - supports-color
-      - utf-8-validate
-      - web-streams-polyfill
-    dev: false
-
-  /@aries-framework/tenants@0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2):
-    resolution: {integrity: sha512-xgfFqOhh5EUAtCmS6MKGjfCt02WZgYF4LtE1gRZYD3uq8W5BZHSSF11QcWieO6Wl4Hnnjuz7d+p+f0WRju8BVg==}
-    dependencies:
-      '@aries-framework/core': 0.5.0-alpha.93(expo@49.0.21)(react-native@0.73.2)
-      async-mutex: 0.4.0
-    transitivePeerDependencies:
-      - domexception
-      - encoding
-      - expo
-      - react-native
-      - web-streams-polyfill
->>>>>>> b235c33 (chore(ssi): update AFJ to latest alpha release)
-    dev: false
-
   /@astronautlabs/jsonpath@1.1.2:
     resolution: {integrity: sha512-FqL/muoreH7iltYC1EB5Tvox5E8NSOOPGkgns4G+qxRKl6k5dxEVljUjB5NcKESzkqwnUqWjSZkL61XGYOuV+A==}
     dependencies:
@@ -2696,13 +2474,13 @@ packages:
       chalk: 4.1.2
     dev: true
 
-  /@credo-ts/anoncreds@0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.9)(expo@49.0.21)(react-native@0.73.2):
+  /@credo-ts/anoncreds@0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.10)(expo@49.0.21)(react-native@0.73.2):
     resolution: {integrity: sha512-TiPU7JVanlYiYoEb/HPraELD+cFcKqpIPTfy5Nj1UXtXVh4z/LJTgXHV44EF5bWnNX+tWdX1+yeP8tod4HASAw==}
     peerDependencies:
       '@hyperledger/anoncreds-shared': ^0.2.0-dev.9
     dependencies:
       '@credo-ts/core': 0.5.0-alpha.116(expo@49.0.21)(react-native@0.73.2)
-      '@hyperledger/anoncreds-shared': 0.2.0-dev.9
+      '@hyperledger/anoncreds-shared': 0.2.0-dev.10
       bn.js: 5.2.1
       class-transformer: 0.5.1
       class-validator: 0.14.1
@@ -2780,12 +2558,12 @@ packages:
       - web-streams-polyfill
     dev: false
 
-  /@credo-ts/indy-vdr@0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.9)(@hyperledger/indy-vdr-shared@0.2.0-dev.6)(expo@49.0.21)(react-native@0.73.2):
+  /@credo-ts/indy-vdr@0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.10)(@hyperledger/indy-vdr-shared@0.2.0-dev.6)(expo@49.0.21)(react-native@0.73.2):
     resolution: {integrity: sha512-Ztsm2rQ5PErDzlS5eG6nC/Kvz7Cl3ecc5LM7aBYICwOxi/iFqjCusnoFVsPMos3kI0ePssoz54d7/drzyev8wA==}
     peerDependencies:
       '@hyperledger/indy-vdr-shared': ^0.2.0-dev.6
     dependencies:
-      '@credo-ts/anoncreds': 0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.9)(expo@49.0.21)(react-native@0.73.2)
+      '@credo-ts/anoncreds': 0.5.0-alpha.116(@hyperledger/anoncreds-shared@0.2.0-dev.10)(expo@49.0.21)(react-native@0.73.2)
       '@credo-ts/core': 0.5.0-alpha.116(expo@49.0.21)(react-native@0.73.2)
       '@hyperledger/indy-vdr-shared': 0.2.0-dev.6
     transitivePeerDependencies:
@@ -3721,22 +3499,13 @@ packages:
     resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
     dev: true
 
-<<<<<<< HEAD
-  /@hyperledger/anoncreds-nodejs@0.2.0-dev.9:
-    resolution: {integrity: sha512-XrpaYNDJTpxzGMKJP7icePKnu0jhkCKP8U7LAS7cNxt5fgkJzW4zb4TPINLNKs28RFYwxm9fOss8R3mfCVEiuA==}
-=======
-  /@hyperledger/anoncreds-nodejs@0.2.0-dev.8:
-    resolution: {integrity: sha512-pS8ox8daEv/natXBETAMVXtU+XWMb4RZBhIz1miWVk9nOis+XVfouBni1TrHCfhwdqBkEZYFaJ/i5gi2vDR5Bw==}
->>>>>>> b235c33 (chore(ssi): update AFJ to latest alpha release)
+  /@hyperledger/anoncreds-nodejs@0.2.0-dev.10:
+    resolution: {integrity: sha512-Dj5f1CFsWOQWcQCWEralMC/YvEFhIy+ZSlUBN8ZUTg81UW6Ik438BmHnqrbymdCjy9WMXPPVjSmvrubYI7KFew==}
     requiresBuild: true
     dependencies:
       '@2060.io/ffi-napi': 4.0.8
       '@2060.io/ref-napi': 3.0.6
-<<<<<<< HEAD
-      '@hyperledger/anoncreds-shared': 0.2.0-dev.9
-=======
-      '@hyperledger/anoncreds-shared': 0.2.0-dev.8
->>>>>>> b235c33 (chore(ssi): update AFJ to latest alpha release)
+      '@hyperledger/anoncreds-shared': 0.2.0-dev.10
       '@mapbox/node-pre-gyp': 1.0.11
       ref-array-di: 1.2.2
       ref-struct-di: 1.1.1
@@ -3745,31 +3514,18 @@ packages:
       - supports-color
     dev: false
 
-<<<<<<< HEAD
-  /@hyperledger/anoncreds-shared@0.2.0-dev.9:
-    resolution: {integrity: sha512-2cK6x2jq98JjKJQRYGmhyPWLB0aYBYrUDM1J/kSQP2RCRoHj1hHV6Ok/DlUmxk+wO1o+71gvb8CYvoGPMI6C4Q==}
+  /@hyperledger/anoncreds-shared@0.2.0-dev.10:
+    resolution: {integrity: sha512-jbbsgiYjjEceOgD9iVXCLMILgpyDZrhXfs/ZXOnfr8xk9ZPeB3Xp7ZqpyNSTPJkNaORM9eC/ni56A1dLbGeBIg==}
     dev: false
 
   /@hyperledger/aries-askar-nodejs@0.2.0-dev.6:
     resolution: {integrity: sha512-dnWcr31oOARRy0fhhw/CpfGhrxIg37UmZHJM0YB+fy30EmwXWHfZy8h1qy8D7uuyfD5FI1pXNDOlYgmMuLdJNQ==}
-=======
-  /@hyperledger/anoncreds-shared@0.2.0-dev.8:
-    resolution: {integrity: sha512-AYwXq7ciKyUoAnSrSqSJhqRRYvRTvy57EkuMY0b4yKW3IphCSWCoos9YHz0zG+r1ud7rwJmxPRUy69ElxJ5FNQ==}
-    dev: false
-
-  /@hyperledger/aries-askar-nodejs@0.2.0-dev.5:
-    resolution: {integrity: sha512-C/17MpOP5jZdIHEAUnkQ0DymiQAPFACiw1tmBFOVhHTF7PZDtSXzzp+orewaKsXcFL5Qc1FoEyves5ougftAbw==}
->>>>>>> b235c33 (chore(ssi): update AFJ to latest alpha release)
     engines: {node: '>= 18'}
     requiresBuild: true
     dependencies:
       '@2060.io/ffi-napi': 4.0.8
       '@2060.io/ref-napi': 3.0.6
-<<<<<<< HEAD
       '@hyperledger/aries-askar-shared': 0.2.0-dev.6
-=======
-      '@hyperledger/aries-askar-shared': 0.2.0-dev.5
->>>>>>> b235c33 (chore(ssi): update AFJ to latest alpha release)
       '@mapbox/node-pre-gyp': 1.0.11
       node-cache: 5.1.2
       ref-array-di: 1.2.2
@@ -3779,13 +3535,8 @@ packages:
       - supports-color
     dev: false
 
-<<<<<<< HEAD
   /@hyperledger/aries-askar-shared@0.2.0-dev.6:
     resolution: {integrity: sha512-gJa28QNR5yZI2DAnfb6/wafVaI2upcT1fmt0g+Qe68IY+JJXQHzijP+zuxR3EF8pQxFEJLBmlFDn3hPHr4Kpiw==}
-=======
-  /@hyperledger/aries-askar-shared@0.2.0-dev.5:
-    resolution: {integrity: sha512-H5yQEWDUL+G4rN85CyJe30dSeW7cSFHnFXaC1g9xkTXCom7eT4XxT8TpY5D/QBr3KWf26KECc/I1roZOTJQQJQ==}
->>>>>>> b235c33 (chore(ssi): update AFJ to latest alpha release)
     dependencies:
       buffer: 6.0.3
     dev: false
@@ -4341,6 +4092,37 @@ packages:
     transitivePeerDependencies:
       - encoding
 
+  /@nestjs/core@10.3.0(@nestjs/common@10.3.0)(@nestjs/microservices@10.3.0)(reflect-metadata@0.1.14)(rxjs@7.8.1):
+    resolution: {integrity: sha512-N06P5ncknW/Pm8bj964WvLIZn2gNhHliCBoAO1LeBvNImYkecqKcrmLbY49Fa1rmMfEM3MuBHeDys3edeuYAOA==}
+    requiresBuild: true
+    peerDependencies:
+      '@nestjs/common': ^10.0.0
+      '@nestjs/microservices': ^10.0.0
+      '@nestjs/platform-express': ^10.0.0
+      '@nestjs/websockets': ^10.0.0
+      reflect-metadata: ^0.1.12
+      rxjs: ^7.1.0
+    peerDependenciesMeta:
+      '@nestjs/microservices':
+        optional: true
+      '@nestjs/platform-express':
+        optional: true
+      '@nestjs/websockets':
+        optional: true
+    dependencies:
+      '@nestjs/common': 10.3.0(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1)
+      '@nestjs/microservices': 10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
+      '@nuxtjs/opencollective': 0.3.2
+      fast-safe-stringify: 2.1.1
+      iterare: 1.2.1
+      path-to-regexp: 3.2.0
+      reflect-metadata: 0.1.14
+      rxjs: 7.8.1
+      tslib: 2.6.2
+      uid: 2.0.2
+    transitivePeerDependencies:
+      - encoding
+
   /@nestjs/mapped-types@2.0.4(@nestjs/common@10.3.0)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14):
     resolution: {integrity: sha512-xl+gUSp0B+ln1VSNoUftlglk8dfpUes3DHGxKZ5knuBxS5g2H/8p9/DSBOYWUfO5f4u9s6ffBPZ71WO+tbe5SA==}
     peerDependencies:
@@ -4404,6 +4186,49 @@ packages:
       rxjs: 7.8.1
       tslib: 2.6.2
 
+  /@nestjs/microservices@10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(reflect-metadata@0.1.14)(rxjs@7.8.1):
+    resolution: {integrity: sha512-CZj27dEN4Rh6t9cRXv5EEg+HwkOUk02DDdS7x4eLcphnP4wgsLNDEo8vQ2gbQHFGpZhLUyeeynjNGkpV9T3+og==}
+    peerDependencies:
+      '@grpc/grpc-js': '*'
+      '@nestjs/common': ^10.0.0
+      '@nestjs/core': ^10.0.0
+      '@nestjs/websockets': ^10.0.0
+      amqp-connection-manager: '*'
+      amqplib: '*'
+      cache-manager: '*'
+      ioredis: '*'
+      kafkajs: '*'
+      mqtt: '*'
+      nats: '*'
+      reflect-metadata: ^0.1.12
+      rxjs: ^7.1.0
+    peerDependenciesMeta:
+      '@grpc/grpc-js':
+        optional: true
+      '@nestjs/websockets':
+        optional: true
+      amqp-connection-manager:
+        optional: true
+      amqplib:
+        optional: true
+      cache-manager:
+        optional: true
+      ioredis:
+        optional: true
+      kafkajs:
+        optional: true
+      mqtt:
+        optional: true
+      nats:
+        optional: true
+    dependencies:
+      '@nestjs/common': 10.3.0(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1)
+      '@nestjs/core': 10.3.0(@nestjs/common@10.3.0)(@nestjs/microservices@10.3.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
+      iterare: 1.2.1
+      reflect-metadata: 0.1.14
+      rxjs: 7.8.1
+      tslib: 2.6.2
+
   /@nestjs/platform-express@10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0):
     resolution: {integrity: sha512-E4hUW48bYv8OHbP9XQg6deefmXb0pDSSuE38SdhA0mJ37zGY7C5EqqBUdlQk4ttfD+OdnbIgJ1zOokT6dd2d7A==}
     peerDependencies:
@@ -4536,6 +4361,25 @@ packages:
       rxjs: 7.8.1
     dev: false
 
+  /@nestjs/testing@10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(@nestjs/microservices@10.3.0):
+    resolution: {integrity: sha512-8DM+bw1qASCvaEnoHUQhypCOf54+G5R21MeFBMvnSk5DtKaWVZuzDP2GjLeYCpTH19WeP6LrrjHv3rX2LKU02A==}
+    peerDependencies:
+      '@nestjs/common': ^10.0.0
+      '@nestjs/core': ^10.0.0
+      '@nestjs/microservices': ^10.0.0
+      '@nestjs/platform-express': ^10.0.0
+    peerDependenciesMeta:
+      '@nestjs/microservices':
+        optional: true
+      '@nestjs/platform-express':
+        optional: true
+    dependencies:
+      '@nestjs/common': 10.3.0(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1)
+      '@nestjs/core': 10.3.0(@nestjs/common@10.3.0)(@nestjs/microservices@10.3.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
+      '@nestjs/microservices': 10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(nats@2.19.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
+      tslib: 2.6.2
+    dev: true
+
   /@nestjs/testing@10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(@nestjs/microservices@10.3.0)(@nestjs/platform-express@10.3.0):
     resolution: {integrity: sha512-8DM+bw1qASCvaEnoHUQhypCOf54+G5R21MeFBMvnSk5DtKaWVZuzDP2GjLeYCpTH19WeP6LrrjHv3rX2LKU02A==}
     peerDependencies:
@@ -5199,7 +5043,6 @@ packages:
     resolution: {integrity: sha512-7THexvdYUK/Dh8olBB46ErT9q/RnecnMdb5r2iwZ6be0Dt4vQLAUN7QU80H0HZBok4jRTb8ydt12x0raBSTHOg==}
     dev: false
 
-<<<<<<< HEAD
   /@sphereon/pex@3.0.1:
     resolution: {integrity: sha512-rj+GhFfV5JLyo7dTIA3htWlrT+f6tayF9JRAGxdsIYBfYictLi9BirQ++JRBXsiq7T5zMnfermz4RGi3cvt13Q==}
     engines: {node: '>=18'}
@@ -5210,15 +5053,6 @@ packages:
       '@sd-jwt/utils': 0.2.0
       '@sphereon/pex-models': 2.1.5
       '@sphereon/ssi-types': 0.18.1
-=======
-  /@sphereon/pex@2.2.2:
-    resolution: {integrity: sha512-NkR8iDTC2PSnYsOHlG2M2iOpFTTbzszs2/pL3iK3Dlv9QYLqX7NtPAlmeSwaoVP1NB1ewcs6U1DtemQAD+90yQ==}
-    engines: {node: '>=16'}
-    dependencies:
-      '@astronautlabs/jsonpath': 1.1.2
-      '@sphereon/pex-models': 2.1.5
-      '@sphereon/ssi-types': 0.17.5
->>>>>>> b235c33 (chore(ssi): update AFJ to latest alpha release)
       ajv: 8.12.0
       ajv-formats: 2.1.1(ajv@8.12.0)
       jwt-decode: 3.1.2
@@ -5226,16 +5060,10 @@ packages:
       string.prototype.matchall: 4.0.10
     dev: false
 
-<<<<<<< HEAD
   /@sphereon/ssi-types@0.18.1:
     resolution: {integrity: sha512-uM0gb1woyc0R+p+qh8tVDi15ZWmpzo9BP0iBp/yRkJar7gAfgwox/yvtEToaH9jROKnDCwL3DDQCDeNucpMkwg==}
     dependencies:
       '@sd-jwt/decode': 0.2.0
-=======
-  /@sphereon/ssi-types@0.17.5:
-    resolution: {integrity: sha512-hoQOkeOtshvIzNAG+HTqcKxeGssLVfwX7oILHJgs6VMb1GhR6QlqjMAxflDxZ/8Aq2R0I6fEPWmf73zAXY2X2Q==}
-    dependencies:
->>>>>>> b235c33 (chore(ssi): update AFJ to latest alpha release)
       jwt-decode: 3.1.2
     dev: false
 
@@ -9030,7 +8858,7 @@ packages:
       semver: 7.5.4
       tapable: 2.2.1
       typescript: 5.3.3
-      webpack: 5.89.0
+      webpack: 5.89.0(@swc/core@1.3.103)
     dev: true
 
   /form-data@3.0.1: