fix: credential controller

package.json

@@ -50,8 +50,8 @@
     "@credo-ts/push-notifications": "^0.7.1",
     "@credo-ts/question-answer": "0.6.2",
     "@credo-ts/tenants": "0.6.2",
-    "@hyperledger/anoncreds-nodejs": "0.3.1",
-    "@hyperledger/indy-vdr-nodejs": "0.2.2",
+    "@hyperledger/anoncreds-nodejs": "^0.3.4",
+    "@hyperledger/indy-vdr-nodejs": "^0.2.3",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-logs-otlp-http": "^0.202.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.202.0",

patches/@credo-ts+core+0.6.0+001+fix: change version string type.patch → patches/@credo-ts+core+0.6.2+001+fix: change version string type-import esm-export interface.patch

@@ -1,3 +1,44 @@
+diff --git a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/jsonldUtil.d.mts b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/jsonldUtil.d.mts
+index 5a311c1..4d640d0 100644
+--- a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/jsonldUtil.d.mts
++++ b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/jsonldUtil.d.mts
+@@ -14,7 +14,7 @@ interface Proof extends JsonObject {
+   verificationMethod: string | VerificationMethod;
+   [key: string]: JsonValue;
+ }
+-interface DocumentLoaderResult {
++export interface DocumentLoaderResult {
+   contextUrl?: string | null;
+   documentUrl: string;
+   document: Record<string, unknown>;
+diff --git a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.mjs b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.mjs
+index 49ee03f..aa7e43a 100644
+--- a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.mjs
++++ b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.mjs
+@@ -2,7 +2,7 @@
+
+ //#region src/modules/vc/data-integrity/libraries/nativeDocumentLoader.ts
+ async function getNativeDocumentLoader() {
+-	const loader = await import("@digitalcredentials/jsonld/lib/documentLoaders/node");
++	const loader = await import("@digitalcredentials/jsonld/lib/documentLoaders/node.js");
+ 	if (!loader) throw new Error("Could not load node document loader. Module did not contain a loader function");
+ 	if (typeof loader === "function") return loader;
+ 	if (typeof loader === "object" && typeof loader.default === "function") return loader.default;
+diff --git a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.native.mjs b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.native.mjs
+index 6a8ca37..0287e99 100644
+--- a/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.native.mjs
++++ b/node_modules/@credo-ts/core/build/modules/vc/data-integrity/libraries/nativeDocumentLoader.native.mjs
+@@ -1,8 +1,9 @@
+
+
++
+ //#region src/modules/vc/data-integrity/libraries/nativeDocumentLoader.native.ts
+ async function getNativeDocumentLoader() {
+-	const loader = await import("@digitalcredentials/jsonld/lib/documentLoaders/xhr");
++	const loader = await import("@digitalcredentials/jsonld/lib/documentLoaders/xhr.js");
+ 	if (!loader) throw new Error("Could not load node document loader. Module did not contain a loader function");
+ 	if (typeof loader === "function") return loader;
+ 	if (typeof loader === "object" && typeof loader.default === "function") return loader.default;
 diff --git a/node_modules/@credo-ts/core/build/utils/version.d.mts b/node_modules/@credo-ts/core/build/utils/version.d.mts
 index a71659d..8ed88e2 100644
 --- a/node_modules/@credo-ts/core/build/utils/version.d.mts

patches/@digitalcredentials+jsonld-signatures+12.0.1.patch

@@ -0,0 +1,22 @@
+diff --git a/node_modules/@digitalcredentials/jsonld-signatures/lib/suites/LinkedDataSignature.js b/node_modules/@digitalcredentials/jsonld-signatures/lib/suites/LinkedDataSignature.js
+index 3aec367..4bb5517 100644
+--- a/node_modules/@digitalcredentials/jsonld-signatures/lib/suites/LinkedDataSignature.js
++++ b/node_modules/@digitalcredentials/jsonld-signatures/lib/suites/LinkedDataSignature.js
+@@ -204,7 +204,7 @@ module.exports = class LinkedDataSignature extends LinkedDataProof {
+       documentLoader,
+       // throw errors if any values would be dropped due to missing
+       // definitions or relative URLs
+-      safe: true,
++      safe: false,
+       skipExpansion,
+       useNative: this.useNativeCanonize,
+       ...this.canonizeOptions
+@@ -301,7 +301,7 @@ module.exports = class LinkedDataSignature extends LinkedDataProof {
+       '@context': constants.SECURITY_CONTEXT_URL,
+       '@embed': '@always',
+       id: verificationMethod
+-    }, {documentLoader, compactToRelative: false, safe: true});
++    }, {documentLoader, compactToRelative: false, safe: false});
+     if(!framed) {
+       throw new Error(`Verification method ${verificationMethod} not found.`);
+     }

src/cliAgent.ts

@@ -2,6 +2,7 @@
 // Refer from: https://github.com/credebl/mobile-sdk/blob/main/packages/ssi/src/wallet/wallet.ts
 import '@openwallet-foundation/askar-nodejs'
 import '@hyperledger/indy-vdr-nodejs'
+import '@hyperledger/anoncreds-nodejs'
 import type { AskarModuleConfigStoreOptions } from '@credo-ts/askar'
 import type { InitConfig } from '@credo-ts/core'
 import type { IndyVdrPoolConfig } from '@credo-ts/indy-vdr'
@@ -150,6 +151,7 @@
   autoAcceptProofs: DidCommAutoAcceptProof,
   walletScheme: AskarMultiWalletDatabaseScheme,
   storeOptions: AskarModuleConfigStoreOptions,
+  endpoints: string[],
 ) => {
   const legacyIndyCredentialFormat = new LegacyIndyDidCommCredentialFormatService()
   const legacyIndyProofFormat = new LegacyIndyDidCommProofFormatService()
@@ -197,6 +199,7 @@
       mediationRecipient: true,
       messagePickup: true,
       mediator: false,
+      endpoints: endpoints || [],
 
       basicMessages: true,
       connections: {
@@ -298,6 +301,7 @@
   autoAcceptProofs: DidCommAutoAcceptProof,
   walletScheme: AskarMultiWalletDatabaseScheme,
   walletConfig: AskarModuleConfigStoreOptions,
+  endpoints: string[],
 ) => {
   const modules = getModules(
     networkConfig,
@@ -311,6 +315,7 @@
     autoAcceptProofs,
     walletScheme,
     walletConfig,
+    endpoints,
   )
   return {
     tenants: new TenantsModule<typeof modules>({
@@ -341,6 +346,7 @@
 
 export async function runRestAgent(restConfig: AriesRestConfig) {
   const {
+    endpoints,
     schemaFileServerURL,
     logLevel,
     inboundTransports = [],
@@ -431,19 +437,20 @@
   let modules
 
   if (afjConfig.tenancy) {
     modules = await getWithTenantModules(
       networkConfig,
       didRegistryContractAddress || '',
       fileServerToken || '',
       fileServerUrl || '',
       rpcUrl || '',
       schemaManagerContractAddress || '',
       autoAcceptConnections || true,
       autoAcceptCredentials || DidCommAutoAcceptCredential.Always,
       autoAcceptProofs || DidCommAutoAcceptProof.ContentApproved,
       walletScheme || AskarMultiWalletDatabaseScheme.ProfilePerWallet,
       walletConfig,
+      endpoints || [],
     )
   } else {
     modules = getModules(
       networkConfig,
@@ -457,6 +464,7 @@
       autoAcceptProofs || DidCommAutoAcceptProof.ContentApproved,
       walletScheme || AskarMultiWalletDatabaseScheme.ProfilePerWallet,
       walletConfig,
+      endpoints || [],
     )
   }
 

src/controllers/anoncreds/cred-def/CredentialDefinitionController.ts

@@ -113,8 +113,10 @@ export class CredentialDefinitionController extends Controller {
         await request.agent.modules.anoncreds.registerCredentialDefinition(credentialDefinitionPayload)
 
       if (registerCredentialDefinitionResult.credentialDefinitionState.state === CredentialEnum.Failed) {
-          const failureReason = registerCredentialDefinitionResult.credentialDefinitionState?.reason ?? 'Failed to register credential definition on ledger'
-          throw new InternalServerError(failureReason)
+        const failureReason =
+          registerCredentialDefinitionResult.credentialDefinitionState?.reason ??
+          'Failed to register credential definition on ledger'
+        throw new InternalServerError(failureReason)
       }
 
       if (registerCredentialDefinitionResult.credentialDefinitionState.state === CredentialEnum.Wait) {

src/controllers/did/DidController.ts

@@ -510,6 +510,7 @@
     return { did: did, didDocument: didDocument }
   }
 
+  // TODO: Right now we are using seed as privateKey for did creation. Fix this is API payload
   public async handleWeb(agent: AgentType, didOptions: DidCreate) {
     let didDocument: DidDocument
     if (!didOptions.domain) {
@@ -532,44 +533,24 @@
     const did = `did:${didOptions.method}:${domain}`
     const keyId = `${did}#key-1`
 
-    // TODO: Remove comments afterwards
-    // const key = await agent.kms.createKey({
-    //   keyType: didOptions.keyType,
-    //   // Commenting for now, as per the multi-tenant endpoint
-    //   // privateKey: TypedArrayEncoder.fromString(didOptions.seed),
-    //   seed: TypedArrayEncoder.fromString(didOptions.seed),
-    // })
-
-    //   const ed25519Key = await agent.kms.createKey({
-    //       type: {
-    //           crv: 'Ed25519',
-    //           kty: 'OKP',
-    //       }
-    //   })
-    //   const publicJwk = Kms.PublicJwk.fromPublicJwk(ed25519Key.publicJwk)
-    //   const { privateJwk } = transformPrivateKeyToPrivateJwk({
-    //       type: {
-    //           crv: 'Ed25519',
-    //           kty: 'OKP',
-    //       },
-    //       privateKey: TypedArrayEncoder.fromString(didOptions.seed),
-    //   })
+    let key
+    let publicJwk
 
     if (didOptions.keyType === KeyAlgorithm.Ed25519) {
-      const { privateJwk } = transformSeedToPrivateJwk({
+      const { privateJwk } = transformPrivateKeyToPrivateJwk({
         type: {
           crv: 'Ed25519',
           kty: 'OKP',
         },
-        seed: TypedArrayEncoder.fromString(didOptions.seed),
+        privateKey: TypedArrayEncoder.fromString(didOptions.seed),
       })
 
-      const key = await agent.kms.importKey({ privateJwk })
+      key = await agent.kms.importKey({ privateJwk })
 
-      const publicJwk = Kms.PublicJwk.fromPublicJwk(key.publicJwk)
+      publicJwk = Kms.PublicJwk.fromPublicJwk(key.publicJwk)
       didDocument = new DidDocumentBuilder(did)
         .addContext('https://w3id.org/security/suites/ed25519-2018/v1')
-        .addVerificationMethod(getEd25519VerificationKey2018({ id: keyId, controller: did, publicJwk }))
+        .addVerificationMethod(getEd25519VerificationKey2018({ id: keyId, publicJwk, controller: did }))
         .addAuthentication(keyId)
         .addAssertionMethod(keyId)
         .build()
@@ -584,6 +565,12 @@
       did,
       overwrite: true,
       didDocument,
+      keys: [
+        {
+          didDocumentRelativeKeyId: `#key-1`,
+          kmsKeyId: key.keyId,
+        },
+      ],
     })
     return { did, didDocument }
   }