fix(aries-connector): upgrade aries to credo

.yarnrc.yml

@@ -3,7 +3,6 @@ compressionLevel: mixed
 enableGlobalCache: false
 
 nmHoistingLimits: workspaces
-
 nodeLinker: pnpm
 
 npmScopes:

packages/cactus-plugin-ledger-connector-aries/package.json

@@ -55,19 +55,21 @@
     "webpack:dev:web": "webpack --env=dev --target=web --config ../../webpack.config.js"
   },
   "dependencies": {
-    "@aries-framework/anoncreds": "0.5.0-alpha.97",
-    "@aries-framework/anoncreds-rs": "0.5.0-alpha.97",
-    "@aries-framework/askar": "0.5.0-alpha.97",
-    "@aries-framework/core": "0.5.0-alpha.97",
-    "@aries-framework/indy-vdr": "0.5.0-alpha.97",
-    "@aries-framework/node": "0.5.0-alpha.97",
+    "@credo-ts/anoncreds": "0.6.2",
+    "@credo-ts/askar": "0.6.2",
+    "@credo-ts/core": "0.6.2",
+    "@credo-ts/didcomm": "0.6.2",
+    "@credo-ts/indy-vdr": "0.6.2",
+    "@credo-ts/node": "0.6.2",
     "@hyperledger/anoncreds-nodejs": "0.3.4",
+    "@hyperledger/anoncreds-shared": "0.3.4",
     "@hyperledger/aries-askar-nodejs": "0.2.3",
-    "@hyperledger/aries-askar-shared": "0.2.3",
     "@hyperledger/cactus-common": "2.1.0",
     "@hyperledger/cactus-core": "2.1.0",
     "@hyperledger/cactus-core-api": "2.1.0",
     "@hyperledger/indy-vdr-nodejs": "0.2.3",
+    "@hyperledger/indy-vdr-shared": "0.2.3",
+    "@openwallet-foundation/askar-nodejs": "0.6.0",
     "axios": "1.8.4",
     "rxjs": "7.8.1",
     "socket.io-client-fixed-types": "4.5.4"

packages/cactus-plugin-ledger-connector-aries/src/main/typescript/api-client/aries-api-client.ts

@@ -1,7 +1,7 @@
 import { Observable, ReplaySubject } from "rxjs";
 import { finalize } from "rxjs/operators";
 import { io } from "socket.io-client-fixed-types";
-import { ProofState } from "@aries-framework/core";
+import { DidCommProofState } from "@credo-ts/didcomm";
 
 import {
   Logger,
@@ -376,7 +376,7 @@ export class AriesApiClient extends DefaultApi {
             e.proofRecord.state,
           );
 
-          if (state === ProofState.Abandoned || state === ProofState.Declined) {
+          if (state === DidCommProofState.Abandoned || state === DidCommProofState.Declined) {
             cleanup();
             reject(
               new Error(
@@ -385,7 +385,7 @@ export class AriesApiClient extends DefaultApi {
             );
           }
 
-          if (state === ProofState.Done) {
+          if (state === DidCommProofState.Done) {
             cleanup();
             this.log.info(`Proof ${id} was accepted by the peer`);
             resolve(e.proofRecord);

packages/cactus-plugin-ledger-connector-aries/src/main/typescript/aries-types.ts

@@ -2,55 +2,46 @@
  * Helper functions used mostly to convert from Open API endpoint inputs to Aries compatible structures.
  */
 
 import {
   Agent,
-  ConnectionsModule,
   DidsModule,
-  CredentialsModule,
-  V2CredentialProtocol,
-  ProofsModule,
-  AutoAcceptProof,
-  V2ProofProtocol,
-  AutoAcceptCredential,
   Query,
-  ConnectionRecord,
-  DidExchangeState,
-  DidExchangeRole,
-} from "@aries-framework/core";
-import type { AskarModule } from "@aries-framework/askar";
-import type { IndyVdrModule } from "@aries-framework/indy-vdr";
+} from "@credo-ts/core";
+import {
+  DidCommModule,
+  DidCommConnectionsModule,
+  DidCommProofsModule,
+  DidCommCredentialV2Protocol,
+  DidCommProofV2Protocol,
+  DidCommAutoAcceptCredential,
+  DidCommAutoAcceptProof,
+  DidCommConnectionRecord,
+  DidCommDidExchangeState,
+  DidCommDidExchangeRole,
+  DidCommCredentialsModule,
+
+} from "@credo-ts/didcomm";
+import type { AskarModule } from "@credo-ts/askar";
+import type { IndyVdrModule } from "@credo-ts/indy-vdr";
 import type {
-  AnonCredsCredentialFormatService,
+  AnonCredsDidCommCredentialFormatService,
   AnonCredsModule,
-  AnonCredsProofFormatService,
+  AnonCredsDidCommProofFormatService,
   AnonCredsRequestedAttribute,
-} from "@aries-framework/anoncreds";
-import type { AnonCredsRsModule } from "@aries-framework/anoncreds-rs";
+} from "@credo-ts/anoncreds";
 
 import {
   AgentConnectionsFilterV1,
   CactiAcceptPolicyV1,
   CactiProofRequestAttributeV1,
+  PluginLedgerConnectorAries,
 } from "./public-api";
 
 /**
  * Aries JS Agent with Anoncreds/Indy/Askar modules configured.
  * This is exact Agent type returned by factories used by this connector for now.
  */
-export type AnoncredAgent = Agent<{
-  readonly connections: ConnectionsModule;
-  readonly credentials: CredentialsModule<
-    V2CredentialProtocol<AnonCredsCredentialFormatService[]>[]
-  >;
-  readonly proofs: ProofsModule<
-    V2ProofProtocol<AnonCredsProofFormatService[]>[]
-  >;
-  readonly anoncreds: AnonCredsModule;
-  readonly anoncredsRs: AnonCredsRsModule;
-  readonly indyVdr: IndyVdrModule;
-  readonly dids: DidsModule;
-  readonly askar: AskarModule;
-}>;
+export type AnoncredAgent = Agent<ReturnType<PluginLedgerConnectorAries["getAskarAnonCredsIndyModules"]>>;
 
 /**
  * Convert Cacti OpenAPI input to Aries compatible `AutoAcceptProof`
@@ -60,14 +51,14 @@
  */
 export function cactiAcceptPolicyToAutoAcceptProof(
   policy: CactiAcceptPolicyV1,
-): AutoAcceptProof {
+): DidCommAutoAcceptProof {
   switch (policy) {
     case CactiAcceptPolicyV1.Always:
-      return AutoAcceptProof.Always;
+      return DidCommAutoAcceptProof.Always;
     case CactiAcceptPolicyV1.ContentApproved:
-      return AutoAcceptProof.ContentApproved;
+      return DidCommAutoAcceptProof.ContentApproved;
     case CactiAcceptPolicyV1.Never:
-      return AutoAcceptProof.Never;
+      return DidCommAutoAcceptProof.Never;
     default:
       const _unknownPolicy: never = policy;
       throw new Error(`Unknown CactiAcceptPolicyV1: ${_unknownPolicy}`);
@@ -82,14 +73,14 @@
  */
 export function cactiAcceptPolicyToAutoAcceptCredential(
   policy: CactiAcceptPolicyV1,
-): AutoAcceptCredential {
+): DidCommAutoAcceptCredential {
   switch (policy) {
     case CactiAcceptPolicyV1.Always:
-      return AutoAcceptCredential.Always;
+      return DidCommAutoAcceptCredential.Always;
     case CactiAcceptPolicyV1.ContentApproved:
-      return AutoAcceptCredential.ContentApproved;
+      return DidCommAutoAcceptCredential.ContentApproved;
     case CactiAcceptPolicyV1.Never:
-      return AutoAcceptCredential.Never;
+      return DidCommAutoAcceptCredential.Never;
     default:
       const _unknownPolicy: never = policy;
       throw new Error(`Unknown CactiAcceptPolicyV1: ${_unknownPolicy}`);
@@ -127,11 +118,11 @@
  */
 export function cactiAgentConnectionsFilterToQuery(
   filter: AgentConnectionsFilterV1,
-): Query<ConnectionRecord> {
+): Query<DidCommConnectionRecord> {
   return {
     ...filter,
-    state: validateEnumValue(DidExchangeState, filter.state),
-    role: validateEnumValue(DidExchangeRole, filter.role),
+    state: validateEnumValue(DidCommDidExchangeState, filter.state),
+    role: validateEnumValue(DidCommDidExchangeRole, filter.role),
   };
 }