@credo-ts/didcomm 0.6.0-pr-2195-20250322170721 → 0.6.0-pr-2324-20250625125220

package/build/getOutboundMessageContext.js

@@ -45,6 +45,9 @@ async function getOutboundMessageContext(agentContext, { message, connectionReco
 }
 async function getConnectionlessOutboundMessageContext(agentContext, { message, lastReceivedMessage, lastSentMessage, associatedRecord, }) {
     agentContext.config.logger.debug(`Creating outbound message context for message ${message.id} using connection-less exchange`);
+    // FIXME: we should remove support for the flow where no out of band record is used.
+    // Users have had enough time to update to the OOB API which supports legacy connectionsless
+    // invitations as well
     const outOfBandRecord = await getOutOfBandRecordForMessage(agentContext, message);
     let { recipientService, ourService } = await getServicesForMessage(agentContext, {
         lastReceivedMessage,
@@ -80,7 +83,7 @@ async function getConnectionlessOutboundMessageContext(agentContext, { message,
  * Retrieves the out of band record associated with the message based on the thread id of the message.
  */
 async function getOutOfBandRecordForMessage(agentContext, message) {
-    agentContext.config.logger.debug(`Looking for out-of-band record for message ${message.id} with thread id ${message.threadId}`);
+    agentContext.config.logger.debug(`Looking for out-of-band record for message ${message.id} with thread id ${message.threadId} and type ${message.type}`);
     const outOfBandRepository = agentContext.dependencyManager.resolve(oob_1.OutOfBandRepository);
     const outOfBandRecord = await outOfBandRepository.findSingleByQuery(agentContext, {
         invitationRequestsThreadIds: [message.threadId],
@@ -102,7 +105,7 @@ async function getServicesForMessage(agentContext, { lastSentMessage, lastReceiv
     if (outOfBandRecord?.role === oob_1.OutOfBandRole.Sender) {
         // Extract ourService from the oob record if not on a previous message
         if (!ourService) {
-            ourService = await outOfBandService.getResolvedServiceForOutOfBandServices(agentContext, outOfBandRecord.outOfBandInvitation.getServices());
+            ourService = await outOfBandService.getResolvedServiceForOutOfBandServices(agentContext, outOfBandRecord.outOfBandInvitation.getServices(), outOfBandRecord.invitationInlineServiceKeys);
         }
         if (!recipientService) {
             throw new core_1.CredoError('Could not find a service to send the message to. Please make sure the connection has a service or provide a service to send the message to.');
@@ -120,6 +123,12 @@ async function getServicesForMessage(agentContext, { lastSentMessage, lastReceiv
         if (lastSentMessage && !ourService) {
             throw new core_1.CredoError('Could not find a service to send the message to. Please make sure the connection has a service or provide a service to send the message to.');
         }
+        // We need to extract the kms key id for the connectinless exchange
+        const oobRecordRecipientRouting = outOfBandRecord?.metadata.get(outOfBandRecordMetadataTypes_1.OutOfBandRecordMetadataKeys.RecipientRouting);
+        if (oobRecordRecipientRouting && ourService) {
+            ourService.recipientKeys[0].keyId =
+                oobRecordRecipientRouting.recipientKeyId ?? ourService.recipientKeys[0].legacyKeyId;
+        }
     }
     // we either miss ourService (even though a message was sent) or we miss recipientService
     // we check in separate if statements to provide a more specific error message
@@ -142,14 +151,16 @@ async function getServicesForMessage(agentContext, { lastSentMessage, lastReceiv
  * routing configuration from the out of band record if available.
  */
 async function createOurService(agentContext, { outOfBandRecord, message }) {
-    agentContext.config.logger.debug(`No previous sent message in thread for outbound message ${message.id}, setting up routing`);
+    agentContext.config.logger.debug(`No previous sent message in thread for outbound message ${message.id} with type ${message.type}, setting up routing`);
     let routing = undefined;
     // Extract routing from out of band record if possible
     const oobRecordRecipientRouting = outOfBandRecord?.metadata.get(outOfBandRecordMetadataTypes_1.OutOfBandRecordMetadataKeys.RecipientRouting);
     if (oobRecordRecipientRouting) {
+        const recipientPublicJwk = core_1.Kms.PublicJwk.fromFingerprint(oobRecordRecipientRouting.recipientKeyFingerprint);
+        recipientPublicJwk.keyId = oobRecordRecipientRouting.recipientKeyId ?? recipientPublicJwk.legacyKeyId;
         routing = {
-            recipientKey: core_1.Key.fromFingerprint(oobRecordRecipientRouting.recipientKeyFingerprint),
-            routingKeys: oobRecordRecipientRouting.routingKeyFingerprints.map((fingerprint) => core_1.Key.fromFingerprint(fingerprint)),
+            recipientKey: recipientPublicJwk,
+            routingKeys: oobRecordRecipientRouting.routingKeyFingerprints.map((fingerprint) => core_1.Kms.PublicJwk.fromFingerprint(fingerprint)),
             endpoints: oobRecordRecipientRouting.endpoints,
             mediatorId: oobRecordRecipientRouting.mediatorId,
         };
@@ -159,6 +170,20 @@ async function createOurService(agentContext, { outOfBandRecord, message }) {
         routing = await routingService.getRouting(agentContext, {
             mediatorId: outOfBandRecord?.mediatorId,
         });
+        // We need to store the routing so we can reference it in in the future.
+        if (outOfBandRecord) {
+            agentContext.config.logger.debug('Storing routing for out of band invitation.');
+            outOfBandRecord.metadata.set(outOfBandRecordMetadataTypes_1.OutOfBandRecordMetadataKeys.RecipientRouting, {
+                recipientKeyFingerprint: routing.recipientKey.fingerprint,
+                recipientKeyId: routing.recipientKey.keyId,
+                routingKeyFingerprints: routing.routingKeys.map((key) => key.fingerprint),
+                endpoints: routing.endpoints,
+                mediatorId: routing.mediatorId,
+            });
+            outOfBandRecord.setTags({ recipientRoutingKeyFingerprint: routing.recipientKey.fingerprint });
+            const outOfBandRepository = agentContext.resolve(oob_1.OutOfBandRepository);
+            await outOfBandRepository.update(agentContext, outOfBandRecord);
+        }
     }
     return {
         id: core_1.utils.uuid(),

package/build/getOutboundMessageContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"getOutboundMessageContext.js","sourceRoot":"","sources":["../src/getOutboundMessageContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getOutboundMessageContext.js","sourceRoot":"","sources":["../src/getOutboundMessageContext.ts"],"names":[],"mappings":"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"}

package/build/models/InboundMessageContext.d.ts

@@ -1,4 +1,4 @@
-import type { AgentContext, Key } from '@credo-ts/core';
+import type { AgentContext, Kms } from '@credo-ts/core';
 import type { AgentMessage } from '../AgentMessage';
 import type { MessageHandler } from '../handlers';
 import type { ConnectionRecord } from '../modules/connections/repository';
@@ -7,8 +7,8 @@ import type { OutboundMessageContext } from './OutboundMessageContext';
 export interface MessageContextParams {
     connection?: ConnectionRecord;
     sessionId?: string;
-    senderKey?: Key;
-    recipientKey?: Key;
+    senderKey?: Kms.PublicJwk<Kms.Ed25519PublicJwk>;
+    recipientKey?: Kms.PublicJwk<Kms.Ed25519PublicJwk>;
     agentContext: AgentContext;
     receivedAt?: Date;
     encryptedMessage?: EncryptedMessage;
@@ -16,8 +16,8 @@ export interface MessageContextParams {
 export declare class InboundMessageContext<T extends AgentMessage = AgentMessage> {
     connection?: ConnectionRecord;
     sessionId?: string;
-    senderKey?: Key;
-    recipientKey?: Key;
+    senderKey?: Kms.PublicJwk<Kms.Ed25519PublicJwk>;
+    recipientKey?: Kms.PublicJwk<Kms.Ed25519PublicJwk>;
     receivedAt: Date;
     readonly agentContext: AgentContext;
     message: T;

package/build/models/OutboundMessageContext.d.ts

@@ -1,10 +1,10 @@
-import type { AgentContext, BaseRecord, Key, ResolvedDidCommService } from '@credo-ts/core';
+import type { AgentContext, BaseRecord, Kms, ResolvedDidCommService } from '@credo-ts/core';
 import type { AgentMessage } from '../AgentMessage';
 import type { ConnectionRecord } from '../modules/connections/repository';
 import type { OutOfBandRecord } from '../modules/oob';
 import type { InboundMessageContext } from './InboundMessageContext';
 export interface ServiceMessageParams {
-    senderKey: Key;
+    senderKey: Kms.PublicJwk<Kms.Ed25519PublicJwk>;
     service: ResolvedDidCommService;
     returnRoute?: boolean;
 }

package/build/models/Routing.d.ts

@@ -1,7 +1,7 @@
-import type { Key } from '@credo-ts/core';
+import type { Kms } from '@credo-ts/core';
 export interface Routing {
     endpoints: string[];
-    recipientKey: Key;
-    routingKeys: Key[];
+    recipientKey: Kms.PublicJwk<Kms.Ed25519PublicJwk>;
+    routingKeys: Kms.PublicJwk<Kms.Ed25519PublicJwk>[];
     mediatorId?: string;
 }

package/build/modules/connections/ConnectionsApi.js

@@ -48,7 +48,6 @@ let ConnectionsApi = class ConnectionsApi {
         if (!routing && !ourDid) {
             routing = await this.routingService.getRouting(this.agentContext, { mediatorId: outOfBandRecord.mediatorId });
         }
-        // biome-ignore lint/suspicious/noImplicitAnyLet: <explanation>
         let result;
         if (protocol === models_2.HandshakeProtocol.DidExchange) {
             result = await this.didExchangeProtocol.createRequest(this.agentContext, outOfBandRecord, {
@@ -113,7 +112,6 @@ let ConnectionsApi = class ConnectionsApi {
         const routing = outOfBandRecord.reusable || outOfBandRecord.outOfBandInvitation.getInlineServices().length === 0
             ? await this.routingService.getRouting(this.agentContext)
             : undefined;
-        // biome-ignore lint/suspicious/noImplicitAnyLet: <explanation>
         let outboundMessageContext;
         if (connectionRecord.protocol === models_2.HandshakeProtocol.DidExchange) {
             const message = await this.didExchangeProtocol.createResponse(this.agentContext, connectionRecord, outOfBandRecord, routing);
@@ -147,7 +145,6 @@ let ConnectionsApi = class ConnectionsApi {
      */
     async acceptResponse(connectionId) {
         const connectionRecord = await this.connectionService.getById(this.agentContext, connectionId);
-        // biome-ignore lint/suspicious/noImplicitAnyLet: <explanation>
         let outboundMessageContext;
         if (connectionRecord.protocol === models_2.HandshakeProtocol.DidExchange) {
             if (!connectionRecord.outOfBandId) {
@@ -357,7 +354,9 @@ let ConnectionsApi = class ConnectionsApi {
             const { didDocument } = await this.didResolverService.resolve(this.agentContext, connection.did);
             if (didDocument) {
                 await this.routingService.removeRouting(this.agentContext, {
-                    recipientKeys: didDocument.recipientKeys,
+                    recipientKeys: didDocument
+                        .getRecipientKeysWithVerificationMethod({ mapX25519ToEd25519: true })
+                        .map(({ publicJwk }) => publicJwk),
                     mediatorId: connection.mediatorId,
                 });
             }
@@ -383,7 +382,9 @@ let ConnectionsApi = class ConnectionsApi {
             const mediatorRecord = await (0, helpers_1.getMediationRecordForDidDocument)(this.agentContext, did.didDocument);
             if (mediatorRecord) {
                 await this.routingService.removeRouting(this.agentContext, {
-                    recipientKeys: did.didDocument.recipientKeys,
+                    recipientKeys: did.didDocument
+                        .getRecipientKeysWithVerificationMethod({ mapX25519ToEd25519: true })
+                        .map(({ publicJwk }) => publicJwk),
                     mediatorId: mediatorRecord.id,
                 });
             }

package/build/modules/connections/ConnectionsApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionsApi.js","sourceRoot":"","sources":["../../../src/modules/connections/ConnectionsApi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ConnectionsApi.js","sourceRoot":"","sources":["../../../src/modules/connections/ConnectionsApi.ts"],"names":[],"mappings":"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"}

package/build/modules/connections/DidExchangeProtocol.d.ts

@@ -4,6 +4,7 @@ import type { OutOfBandRecord } from '../oob/repository';
 import type { ConnectionRecord } from './repository';
 import { DidRepository, JwsService, Logger } from '@credo-ts/core';
 import { InboundMessageContext } from '../../models';
+import { DidCommDocumentService } from '../../services';
 import { DidExchangeCompleteMessage, DidExchangeRequestMessage, DidExchangeResponseMessage } from './messages';
 import { ConnectionService } from './services';
 interface DidExchangeRequestParams {
@@ -17,10 +18,11 @@ interface DidExchangeRequestParams {
 }
 export declare class DidExchangeProtocol {
     private connectionService;
+    private didcommDocumentService;
     private jwsService;
     private didRepository;
     private logger;
-    constructor(connectionService: ConnectionService, didRepository: DidRepository, jwsService: JwsService, logger: Logger);
+    constructor(connectionService: ConnectionService, didRepository: DidRepository, jwsService: JwsService, didcommDocumentService: DidCommDocumentService, logger: Logger);
     createRequest(agentContext: AgentContext, outOfBandRecord: OutOfBandRecord, params: DidExchangeRequestParams): Promise<{
         message: DidExchangeRequestMessage;
         connectionRecord: ConnectionRecord;

package/build/modules/connections/DidExchangeProtocol.js

@@ -18,18 +18,20 @@ const Attachment_1 = require("../../decorators/attachment/Attachment");
 const OutOfBandRole_1 = require("../oob/domain/OutOfBandRole");
 const OutOfBandState_1 = require("../oob/domain/OutOfBandState");
 const helpers_1 = require("../routing/services/helpers");
+const services_1 = require("../../services");
 const ConnectionsModuleConfig_1 = require("./ConnectionsModuleConfig");
 const DidExchangeStateMachine_1 = require("./DidExchangeStateMachine");
 const errors_1 = require("./errors");
 const messages_1 = require("./messages");
 const models_1 = require("./models");
-const services_1 = require("./services");
+const services_2 = require("./services");
 const helpers_2 = require("./services/helpers");
 let DidExchangeProtocol = class DidExchangeProtocol {
-    constructor(connectionService, didRepository, jwsService, logger) {
+    constructor(connectionService, didRepository, jwsService, didcommDocumentService, logger) {
         this.connectionService = connectionService;
         this.didRepository = didRepository;
         this.jwsService = jwsService;
+        this.didcommDocumentService = didcommDocumentService;
         this.logger = logger;
     }
     async createRequest(agentContext, outOfBandRecord, params) {
@@ -45,27 +47,39 @@ let DidExchangeProtocol = class DidExchangeProtocol {
         const [invitationDid] = outOfBandInvitation.invitationDids;
         // Create message
         const label = params.label ?? agentContext.config.label;
-        // biome-ignore lint/suspicious/noImplicitAnyLet: <explanation>
         let didDocument;
-        // biome-ignore lint/suspicious/noImplicitAnyLet: <explanation>
+        let keys;
         let mediatorId;
         // If our did is specified, make sure we have all key material for it
         if (did) {
-            didDocument = await (0, helpers_2.getDidDocumentForCreatedDid)(agentContext, did);
+            const dids = agentContext.resolve(core_1.DidsApi);
+            const resolved = await dids.resolveCreatedDidDocumentWithKeys(did);
+            didDocument = resolved.didDocument;
+            keys = resolved.keys;
             mediatorId = (await (0, helpers_1.getMediationRecordForDidDocument)(agentContext, didDocument))?.id;
-            // Otherwise, create a did:peer based on the provided routing
         }
+        // Otherwise, create a did:peer based on the provided routing
         else {
             if (!routing)
                 throw new core_1.CredoError(`'routing' must be defined if 'ourDid' is not specified`);
-            didDocument = await (0, helpers_2.createPeerDidFromServices)(agentContext, (0, helpers_2.routingToServices)(routing), config.peerNumAlgoForDidExchangeRequests);
+            const resolved = await (0, helpers_2.createPeerDidFromServices)(agentContext, (0, helpers_2.routingToServices)(routing), config.peerNumAlgoForDidExchangeRequests);
+            didDocument = resolved.didDocument;
+            keys = resolved.keys;
             mediatorId = routing.mediatorId;
         }
         const parentThreadId = outOfBandRecord.outOfBandInvitation.id;
         const message = new messages_1.DidExchangeRequestMessage({ label, parentThreadId, did: didDocument.id, goal, goalCode });
+        const signingKeys = didDocument
+            .getRecipientKeysWithVerificationMethod({ mapX25519ToEd25519: true })
+            .map(({ publicJwk, verificationMethod }) => {
+            // Bind the kmsKeyIds
+            const kmsKeyId = keys?.find(({ didDocumentRelativeKeyId }) => verificationMethod.id.endsWith(didDocumentRelativeKeyId))?.kmsKeyId;
+            publicJwk.keyId = kmsKeyId ?? publicJwk.legacyKeyId;
+            return publicJwk;
+        });
         // Create sign attachment containing didDoc
         if ((0, core_1.isValidPeerDid)(didDocument.id) && (0, core_1.getNumAlgoFromPeerDid)(didDocument.id) === core_1.PeerDidNumAlgo.GenesisDoc) {
-            const didDocAttach = await this.createSignedAttachment(agentContext, didDocument.toJSON(), didDocument.recipientKeys.map((key) => key.publicKeyBase58));
+            const didDocAttach = await this.createSignedAttachment(agentContext, didDocument.toJSON(), signingKeys);
             message.didDoc = didDocAttach;
         }
         const connectionRecord = await this.connectionService.createConnection(agentContext, {
@@ -164,18 +178,16 @@ let DidExchangeProtocol = class DidExchangeProtocol {
         if (!theirDid) {
             throw new core_1.CredoError('Missing theirDid on connection record.');
         }
+        // Extract keys from the out of band record metadata
+        const inlineResolvedServices = outOfBandRecord.outOfBandInvitation
+            .getInlineServices()
+            .map((service) => (0, helpers_2.getResolvedDidcommServiceWithSigningKeyId)(service, outOfBandRecord.invitationInlineServiceKeys));
         let services = [];
         if (routing) {
             services = (0, helpers_2.routingToServices)(routing);
         }
-        else if (outOfBandRecord.outOfBandInvitation.getInlineServices().length > 0) {
-            const inlineServices = outOfBandRecord.outOfBandInvitation.getInlineServices();
-            services = inlineServices.map((service) => ({
-                id: service.id,
-                serviceEndpoint: service.serviceEndpoint,
-                recipientKeys: service.recipientKeys.map(core_1.didKeyToInstanceOfKey),
-                routingKeys: service.routingKeys?.map(core_1.didKeyToInstanceOfKey) ?? [],
-            }));
+        else if (inlineResolvedServices.length > 0) {
+            services = inlineResolvedServices;
         }
         else {
             // We don't support using a did from the OOB invitation services currently, in this case we always pass routing to this method
@@ -185,23 +197,28 @@ let DidExchangeProtocol = class DidExchangeProtocol {
         const numAlgo = (0, core_1.isValidPeerDid)(theirDid)
             ? (0, core_1.getNumAlgoFromPeerDid)(theirDid)
             : config.peerNumAlgoForDidExchangeRequests;
-        const didDocument = await (0, helpers_2.createPeerDidFromServices)(agentContext, services, numAlgo);
+        const { didDocument } = await (0, helpers_2.createPeerDidFromServices)(agentContext, services, numAlgo);
         const message = new messages_1.DidExchangeResponseMessage({ did: didDocument.id, threadId });
         // DID Rotate attachment should be signed with invitation keys
-        const invitationRecipientKeys = outOfBandRecord.outOfBandInvitation
-            .getInlineServices()
-            .map((s) => s.recipientKeys)
-            .reduce((acc, curr) => acc.concat(curr), []);
+        const invitationRecipientKeys = inlineResolvedServices.flatMap((s) => s.recipientKeys);
         // Consider also pure-DID services, used when DID Exchange is started with an implicit invitation or a public DID
         for (const did of outOfBandRecord.outOfBandInvitation.getDidServices()) {
-            invitationRecipientKeys.push(...(await (0, helpers_2.getDidDocumentForCreatedDid)(agentContext, (0, core_1.parseDid)(did).did)).recipientKeys.map((key) => key.publicKeyBase58));
+            const dids = agentContext.resolve(core_1.DidsApi);
+            const resolved = await dids.resolveCreatedDidDocumentWithKeys((0, core_1.parseDid)(did).did);
+            invitationRecipientKeys.push(...resolved.didDocument
+                .getRecipientKeysWithVerificationMethod({ mapX25519ToEd25519: true })
+                .map(({ publicJwk, verificationMethod }) => {
+                const kmsKeyId = resolved.keys?.find(({ didDocumentRelativeKeyId }) => verificationMethod.id.endsWith(didDocumentRelativeKeyId))?.kmsKeyId;
+                publicJwk.keyId = kmsKeyId ?? publicJwk.legacyKeyId;
+                return publicJwk;
+            }));
         }
         if (numAlgo === core_1.PeerDidNumAlgo.GenesisDoc) {
-            message.didDoc = await this.createSignedAttachment(agentContext, didDocument.toJSON(), Array.from(new Set(invitationRecipientKeys.map(core_1.didKeyToVerkey))));
+            message.didDoc = await this.createSignedAttachment(agentContext, didDocument.toJSON(), invitationRecipientKeys);
         }
         else {
             // We assume any other case is a resolvable did (e.g. did:peer:2 or did:peer:4)
-            message.didRotate = await this.createSignedAttachment(agentContext, didDocument.id, Array.from(new Set(invitationRecipientKeys.map(core_1.didKeyToVerkey))));
+            message.didRotate = await this.createSignedAttachment(agentContext, didDocument.id, invitationRecipientKeys);
         }
         connectionRecord.did = didDocument.id;
         await this.updateState(agentContext, messages_1.DidExchangeResponseMessage.type, connectionRecord);
@@ -226,9 +243,13 @@ let DidExchangeProtocol = class DidExchangeProtocol {
             });
         }
         // Get DID Document either from message (if it is a did:peer) or resolve it externally
-        const didDocument = await this.resolveDidDocument(agentContext, message, outOfBandRecord
-            .getTags()
-            .recipientKeyFingerprints.map((fingerprint) => core_1.Key.fromFingerprint(fingerprint).publicKeyBase58));
+        const didDocument = await this.resolveDidDocument(agentContext, message, outOfBandRecord.getTags().recipientKeyFingerprints.map((fingerprint) => {
+            const publicJwk = core_1.Kms.PublicJwk.fromFingerprint(fingerprint);
+            if (!publicJwk.is(core_1.Kms.Ed25519PublicJwk)) {
+                throw new core_1.CredoError('Expected fingerprint to be of type Ed25519');
+            }
+            return publicJwk;
+        }));
         if ((0, core_1.isValidPeerDid)(didDocument.id)) {
             const didRecord = await this.didRepository.storeReceivedDid(messageContext.agentContext, {
                 did: didDocument.id,
@@ -303,27 +324,26 @@ let DidExchangeProtocol = class DidExchangeProtocol {
         const nextState = DidExchangeStateMachine_1.DidExchangeStateMachine.nextState(messageType, connectionRecord);
         return this.connectionService.updateState(agentContext, connectionRecord, nextState);
     }
-    async createSignedAttachment(agentContext, data, verkeys) {
-        this.logger.debug(`Creating signed attachment with keys ${JSON.stringify(verkeys)}`);
+    async createSignedAttachment(agentContext, data, signingKeys) {
+        this.logger.debug('Creating signed attachment');
         const signedAttach = new Attachment_1.Attachment({
             mimeType: typeof data === 'string' ? undefined : 'application/json',
             data: new Attachment_1.AttachmentData({
                 base64: typeof data === 'string' ? core_1.TypedArrayEncoder.toBase64URL(core_1.Buffer.from(data)) : core_1.JsonEncoder.toBase64(data),
             }),
         });
-        await Promise.all(verkeys.map(async (verkey) => {
-            const key = core_1.Key.fromPublicKeyBase58(verkey, core_1.KeyType.Ed25519);
-            const kid = new core_1.DidKey(key).did;
+        await Promise.all(signingKeys.map(async (signingKey) => {
+            const kid = new core_1.DidKey(signingKey).did;
             const payload = typeof data === 'string' ? core_1.TypedArrayEncoder.fromString(data) : core_1.JsonEncoder.toBuffer(data);
             const jws = await this.jwsService.createJws(agentContext, {
                 payload,
-                key,
+                keyId: signingKey.keyId,
                 header: {
                     kid,
                 },
                 protectedHeaderOptions: {
-                    alg: core_1.JwaSignatureAlgorithm.EdDSA,
-                    jwk: (0, core_1.getJwkFromKey)(key),
+                    alg: core_1.Kms.KnownJwaSignatureAlgorithms.EdDSA,
+                    jwk: signingKey,
                 },
             });
             signedAttach.addJws(jws);
@@ -338,17 +358,17 @@ let DidExchangeProtocol = class DidExchangeProtocol {
      * @param invitationKeys array containing keys from connection invitation that could be used for signing of DID document
      * @returns verified DID document content from message attachment
      */
-    async resolveDidDocument(agentContext, message, invitationKeysBase58 = []) {
+    async resolveDidDocument(agentContext, message, invitationKeys = []) {
         // The only supported case where we expect to receive a did-document attachment is did:peer algo 1
         return (0, core_1.isDid)(message.did, 'peer') && (0, core_1.getNumAlgoFromPeerDid)(message.did) === core_1.PeerDidNumAlgo.GenesisDoc
-            ? this.extractAttachedDidDocument(agentContext, message, invitationKeysBase58)
-            : this.extractResolvableDidDocument(agentContext, message, invitationKeysBase58);
+            ? this.extractAttachedDidDocument(agentContext, message, invitationKeys)
+            : this.extractResolvableDidDocument(agentContext, message, invitationKeys);
     }
     /**
      * Extracts DID document from message (resolving it externally if required) and verifies did-rotate attachment signature
      * if applicable
      */
-    async extractResolvableDidDocument(agentContext, message, invitationKeysBase58) {
+    async extractResolvableDidDocument(agentContext, message, invitationKeys) {
         // Validate did-rotate attachment in case of DID Exchange response
         if (message instanceof messages_1.DidExchangeResponseMessage) {
             const didRotateAttachment = message.didRotate;
@@ -372,21 +392,33 @@ let DidExchangeProtocol = class DidExchangeProtocol {
             if (signedDid !== message.did) {
                 throw new core_1.CredoError(`DID Rotate attachment's did ${message.did} does not correspond to message did ${message.did}`);
             }
-            const { isValid, signerKeys } = await this.jwsService.verifyJws(agentContext, {
+            const { isValid, jwsSigners } = await this.jwsService.verifyJws(agentContext, {
                 jws: {
                     ...jws,
                     payload: base64UrlPayload,
                 },
-                jwkResolver: ({ jws: { header } }) => {
+                allowedJwsSignerMethods: ['did'],
+                resolveJwsSigner: ({ jws: { header } }) => {
                     if (typeof header.kid !== 'string' || !(0, core_1.isDid)(header.kid, 'key')) {
                         throw new core_1.CredoError('JWS header kid must be a did:key DID.');
                     }
                     const didKey = core_1.DidKey.fromDid(header.kid);
-                    return (0, core_1.getJwkFromKey)(didKey.key);
+                    return {
+                        method: 'did',
+                        didUrl: `${didKey.did}#${didKey.publicJwk.fingerprint}`,
+                        jwk: didKey.publicJwk,
+                    };
                 },
             });
-            if (!isValid || !signerKeys.every((key) => invitationKeysBase58?.includes(key.publicKeyBase58))) {
-                throw new errors_1.DidExchangeProblemReportError(`DID Rotate signature is invalid. isValid: ${isValid} signerKeys: ${JSON.stringify(signerKeys)} invitationKeys:${JSON.stringify(invitationKeysBase58)}`, {
+            const jwsSignerKeys = jwsSigners.map((signer) => signer.jwk);
+            if (!jwsSignerKeys.every((key) => key.is(core_1.Kms.Ed25519PublicJwk))) {
+                throw new errors_1.DidExchangeProblemReportError('Expected DID Rotate signature to be signed with Ed25519 key.', {
+                    problemCode: errors_1.DidExchangeProblemReportReason.ResponseNotAccepted,
+                });
+            }
+            if (!isValid ||
+                !jwsSignerKeys.every((key) => invitationKeys?.some((invitationKey) => invitationKey.equals(key)))) {
+                throw new errors_1.DidExchangeProblemReportError(`DID Rotate signature is invalid. isValid: ${isValid} signerKeys: ${JSON.stringify(jwsSignerKeys.map((key) => key.fingerprint))} invitationKeys:${JSON.stringify(invitationKeys?.map((key) => key.fingerprint))}`, {
                     problemCode: errors_1.DidExchangeProblemReportReason.ResponseNotAccepted,
                 });
             }
@@ -411,7 +443,7 @@ let DidExchangeProtocol = class DidExchangeProtocol {
      * @param invitationKeys array containing keys from connection invitation that could be used for signing of DID document
      * @returns verified DID document content from message attachment
      */
-    async extractAttachedDidDocument(agentContext, message, invitationKeysBase58 = []) {
+    async extractAttachedDidDocument(agentContext, message, invitationKeys = []) {
         if (!message.didDoc) {
             const problemCode = message instanceof messages_1.DidExchangeRequestMessage
                 ? errors_1.DidExchangeProblemReportReason.RequestNotAccepted
@@ -431,32 +463,37 @@ let DidExchangeProtocol = class DidExchangeProtocol {
         }
         // JWS payload must be base64url encoded
         const base64UrlPayload = (0, core_1.base64ToBase64URL)(didDocumentAttachment.data.base64);
-        const { isValid, signerKeys } = await this.jwsService.verifyJws(agentContext, {
+        const { isValid, jwsSigners } = await this.jwsService.verifyJws(agentContext, {
             jws: {
                 ...jws,
                 payload: base64UrlPayload,
             },
-            jwkResolver: ({ jws: { header } }) => {
+            allowedJwsSignerMethods: ['did'],
+            resolveJwsSigner: ({ jws: { header } }) => {
                 if (typeof header.kid !== 'string' || !(0, core_1.isDid)(header.kid, 'key')) {
                     throw new core_1.CredoError('JWS header kid must be a did:key DID.');
                 }
                 const didKey = core_1.DidKey.fromDid(header.kid);
-                return (0, core_1.getJwkFromKey)(didKey.key);
+                return {
+                    method: 'did',
+                    didUrl: `${didKey.did}#${didKey.publicJwk.fingerprint}`,
+                    jwk: didKey.publicJwk,
+                };
             },
         });
         const json = core_1.JsonEncoder.fromBase64(didDocumentAttachment.data.base64);
         const didDocument = core_1.JsonTransformer.fromJSON(json, core_1.DidDocument);
-        const didDocumentKeysBase58 = didDocument.authentication
+        const didDocumentKeys = didDocument.authentication
             ?.map((authentication) => {
             const verificationMethod = typeof authentication === 'string'
                 ? didDocument.dereferenceVerificationMethod(authentication)
                 : authentication;
-            const key = (0, core_1.getKeyFromVerificationMethod)(verificationMethod);
-            return key.publicKeyBase58;
+            const publicJwk = (0, core_1.getPublicJwkFromVerificationMethod)(verificationMethod);
+            return publicJwk;
         })
-            .concat(invitationKeysBase58);
-        this.logger.trace('JWS verification result', { isValid, signerKeys, didDocumentKeysBase58 });
-        if (!isValid || !signerKeys.every((key) => didDocumentKeysBase58?.includes(key.publicKeyBase58))) {
+            .concat(invitationKeys);
+        this.logger.trace('JWS verification result', { isValid, jwsSigners });
+        if (!isValid || !jwsSigners.every((jwsSigner) => didDocumentKeys?.some((key) => key.equals(jwsSigner.jwk)))) {
             const problemCode = message instanceof messages_1.DidExchangeRequestMessage
                 ? errors_1.DidExchangeProblemReportReason.RequestNotAccepted
                 : errors_1.DidExchangeProblemReportReason.ResponseNotAccepted;
@@ -468,9 +505,10 @@ let DidExchangeProtocol = class DidExchangeProtocol {
 exports.DidExchangeProtocol = DidExchangeProtocol;
 exports.DidExchangeProtocol = DidExchangeProtocol = __decorate([
     (0, core_1.injectable)(),
-    __param(3, (0, core_1.inject)(core_1.InjectionSymbols.Logger)),
-    __metadata("design:paramtypes", [services_1.ConnectionService,
+    __param(4, (0, core_1.inject)(core_1.InjectionSymbols.Logger)),
+    __metadata("design:paramtypes", [services_2.ConnectionService,
         core_1.DidRepository,
-        core_1.JwsService, Object])
+        core_1.JwsService,
+        services_1.DidCommDocumentService, Object])
 ], DidExchangeProtocol);
 //# sourceMappingURL=DidExchangeProtocol.js.map