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

package/build/MessageSender.js

@@ -8,13 +8,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageSender = void 0;
 exports.isDidCommTransportQueue = isDidCommTransportQueue;
 const core_1 = require("@credo-ts/core");
+const DidCommModuleConfig_1 = require("./DidCommModuleConfig");
 const EnvelopeService_1 = require("./EnvelopeService");
 const Events_1 = require("./Events");
 const TransportService_1 = require("./TransportService");
@@ -24,13 +22,11 @@ const errors_1 = require("./errors");
 const models_1 = require("./models");
 const DidCommDocumentService_1 = require("./services/DidCommDocumentService");
 let MessageSender = class MessageSender {
-    constructor(envelopeService, transportService, messagePickupRepository, logger, didResolverService, didCommDocumentService, eventEmitter) {
+    constructor(envelopeService, transportService, didCommModuleConfig, didCommDocumentService, eventEmitter) {
         this._outboundTransports = [];
         this.envelopeService = envelopeService;
         this.transportService = transportService;
-        this.messagePickupRepository = messagePickupRepository;
-        this.logger = logger;
-        this.didResolverService = didResolverService;
+        this.queueTransportRepository = didCommModuleConfig.queueTransportRepository;
         this.didCommDocumentService = didCommDocumentService;
         this.eventEmitter = eventEmitter;
         this._outboundTransports = [];
@@ -54,12 +50,12 @@ let MessageSender = class MessageSender {
         };
     }
     async sendMessageToSession(agentContext, session, message) {
-        this.logger.debug(`Packing message and sending it via existing session ${session.type}...`);
+        agentContext.config.logger.debug(`Packing message and sending it via existing session ${session.type}...`);
         if (!session.keys) {
             throw new core_1.CredoError(`There are no keys for the given ${session.type} transport session.`);
         }
         const encryptedMessage = await this.envelopeService.packMessage(agentContext, message, session.keys);
-        this.logger.debug('Sending message');
+        agentContext.config.logger.debug('Sending message');
         await session.send(agentContext, encryptedMessage);
     }
     async sendPackage(agentContext, { connection, encryptedMessage, recipientKey, options, }) {
@@ -73,7 +69,7 @@ let MessageSender = class MessageSender {
             }
             catch (error) {
                 errors.push(error);
-                this.logger.debug(`Sending packed message via session failed with error: ${error.message}.`, error);
+                agentContext.config.logger.debug(`Sending packed message via session failed with error: ${error.message}.`, error);
             }
         }
         // Retrieve DIDComm services
@@ -83,7 +79,7 @@ let MessageSender = class MessageSender {
         }
         // Loop trough all available services and try to send the message
         for await (const service of services) {
-            this.logger.debug('Sending outbound message to service:', { service });
+            agentContext.config.logger.debug('Sending outbound message to service:', { service });
             try {
                 const protocolScheme = core_1.utils.getProtocolScheme(service.serviceEndpoint);
                 for (const transport of this.outboundTransports) {
@@ -99,7 +95,7 @@ let MessageSender = class MessageSender {
                 return;
             }
             catch (error) {
-                this.logger.debug(`Sending outbound message to service with id ${service.id} failed with the following error:`, {
+                agentContext.config.logger.debug(`Sending outbound message to service with id ${service.id} failed with the following error:`, {
                     message: error.message,
                     error: error,
                 });
@@ -108,8 +104,8 @@ let MessageSender = class MessageSender {
         // We didn't succeed to send the message over open session, or directly to serviceEndpoint
         // If the other party shared a queue service endpoint in their did doc we queue the message
         if (queueService) {
-            this.logger.debug(`Queue packed message for connection ${connection.id} (${connection.theirLabel})`);
-            await this.messagePickupRepository.addMessage({
+            agentContext.config.logger.debug(`Queue packed message for connection ${connection.id} (${connection.theirLabel})`);
+            await this.queueTransportRepository.addMessage(agentContext, {
                 connectionId: connection.id,
                 recipientDids: [(0, core_1.verkeyToDidKey)(recipientKey)],
                 payload: encryptedMessage,
@@ -117,7 +113,7 @@ let MessageSender = class MessageSender {
             return;
         }
         // Message is undeliverable
-        this.logger.error(`Message is undeliverable to connection ${connection.id} (${connection.theirLabel})`, {
+        agentContext.config.logger.error(`Message is undeliverable to connection ${connection.id} (${connection.theirLabel})`, {
             message: encryptedMessage,
             errors,
             connection,
@@ -131,19 +127,19 @@ let MessageSender = class MessageSender {
             return this.sendMessageToService(outboundMessageContext);
         }
         if (!connection) {
-            this.logger.error('Outbound message has no associated connection');
+            agentContext.config.logger.error('Outbound message has no associated connection');
             this.emitMessageSentEvent(outboundMessageContext, models_1.OutboundMessageSendStatus.Undeliverable);
             throw new errors_1.MessageSendingError('Outbound message has no associated connection', {
                 outboundMessageContext,
             });
         }
-        this.logger.debug('Send outbound message', {
+        agentContext.config.logger.debug('Send outbound message', {
             message,
             connectionId: connection.id,
         });
         const session = this.findSessionForOutboundContext(outboundMessageContext);
         if (session) {
-            this.logger.debug(`Found session with return routing for message '${message.id}' (connection '${connection.id}'`);
+            agentContext.config.logger.debug(`Found session with return routing for message '${message.id}' (connection '${connection.id}'`);
             try {
                 await this.sendMessageToSession(agentContext, session, message);
                 this.emitMessageSentEvent(outboundMessageContext, models_1.OutboundMessageSendStatus.SentToSession);
@@ -151,7 +147,7 @@ let MessageSender = class MessageSender {
             }
             catch (error) {
                 errors.push(error);
-                this.logger.debug(`Sending an outbound message via session failed with error: ${error.message}.`, error);
+                agentContext.config.logger.debug(`Sending an outbound message via session failed with error: ${error.message}.`, error);
             }
         }
         // Retrieve DIDComm services
@@ -162,7 +158,7 @@ let MessageSender = class MessageSender {
             ({ services, queueService } = await this.retrieveServicesByConnection(agentContext, connection, options?.transportPriority, outOfBand));
         }
         catch (error) {
-            this.logger.error(`Unable to retrieve services for connection '${connection.id}. ${error.message}`);
+            agentContext.config.logger.error(`Unable to retrieve services for connection '${connection.id}. ${error.message}`);
             this.emitMessageSentEvent(outboundMessageContext, models_1.OutboundMessageSendStatus.Undeliverable);
             throw new errors_1.MessageSendingError(`Unable to retrieve services for connection '${connection.id}`, {
                 outboundMessageContext,
@@ -170,35 +166,37 @@ let MessageSender = class MessageSender {
             });
         }
         if (!connection.did) {
-            this.logger.error(`Unable to send message using connection '${connection.id}' that doesn't have a did`);
+            agentContext.config.logger.error(`Unable to send message using connection '${connection.id}' that doesn't have a did`);
             this.emitMessageSentEvent(outboundMessageContext, models_1.OutboundMessageSendStatus.Undeliverable);
             throw new errors_1.MessageSendingError(`Unable to send message using connection '${connection.id}' that doesn't have a did`, { outboundMessageContext });
         }
-        let ourDidDocument;
-        try {
-            ourDidDocument = await this.didResolverService.resolveDidDocument(agentContext, connection.did);
-        }
-        catch (error) {
-            this.logger.error(`Unable to resolve DID Document for '${connection.did}`);
+        const dids = agentContext.resolve(core_1.DidsApi);
+        const { didDocument, keys } = await dids.resolveCreatedDidDocumentWithKeys(connection.did).catch((error) => {
+            agentContext.config.logger.error(`Unable to send message using connection '${connection.id}', unable to resolve did`, {
+                error,
+            });
             this.emitMessageSentEvent(outboundMessageContext, models_1.OutboundMessageSendStatus.Undeliverable);
-            throw new errors_1.MessageSendingError(`Unable to resolve DID Document for '${connection.did}`, {
+            throw new errors_1.MessageSendingError(`Unable to send message using connection '${connection.id}'. Unble to resolve did`, { outboundMessageContext, cause: error });
+        });
+        const authentication = didDocument.authentication
+            ?.map((a) => {
+            const verificationMethod = typeof a === 'string' ? didDocument.dereferenceVerificationMethod(a) : a;
+            const publicJwk = (0, core_1.getPublicJwkFromVerificationMethod)(verificationMethod);
+            const kmsKeyId = keys?.find((key) => verificationMethod.id.endsWith(key.didDocumentRelativeKeyId))?.kmsKeyId;
+            // Set stored key id, or fallback to legacy key id
+            publicJwk.keyId = kmsKeyId ?? publicJwk.legacyKeyId;
+            return { verificationMethod, publicJwk, kmsKeyId };
+        })
+            .filter((v) => v.publicJwk.is(core_1.Kms.Ed25519PublicJwk));
+        // We take the first one with a kms key id. Otherwise we pick the first
+        const senderVerificationMethod = authentication?.find((a) => a.kmsKeyId !== undefined) ?? authentication?.[0];
+        if (!senderVerificationMethod) {
+            throw new errors_1.MessageSendingError(`Unable to determine sender key for did ${connection.did}, no available Ed25519 keys`, {
                 outboundMessageContext,
-                cause: error,
             });
         }
-        const ourAuthenticationKeys = getAuthenticationKeys(ourDidDocument);
-        // TODO We're selecting just the first authentication key. Is it ok?
-        // We can probably learn something from the didcomm-rust implementation, which looks at crypto compatibility to make sure the
-        // other party can decrypt the message. https://github.com/sicpa-dlab/didcomm-rust/blob/9a24b3b60f07a11822666dda46e5616a138af056/src/message/pack_encrypted/mod.rs#L33-L44
-        // This will become more relevant when we support different encrypt envelopes. One thing to take into account though is that currently we only store the recipientKeys
-        // as defined in the didcomm services, while it could be for example that the first authentication key is not defined in the recipientKeys, in which case we wouldn't
-        // even be interoperable between two Credo agents. So we should either pick the first key that is defined in the recipientKeys, or we should make sure to store all
-        // keys defined in the did document as tags so we can retrieve it, even if it's not defined in the recipientKeys. This, again, will become simpler once we use didcomm v2
-        // as the `from` field in a received message will identity the did used so we don't have to store all keys in tags to be able to find the connections associated with
-        // an incoming message.
-        const [firstOurAuthenticationKey] = ourAuthenticationKeys;
         // If the returnRoute is already set we won't override it. This allows to set the returnRoute manually if this is desired.
-        const shouldAddReturnRoute = message.transport?.returnRoute === undefined && !this.transportService.hasInboundEndpoint(ourDidDocument);
+        const shouldAddReturnRoute = message.transport?.returnRoute === undefined && !this.transportService.hasInboundEndpoint(didDocument);
         // Loop trough all available services and try to send the message
         for await (const service of services) {
             try {
@@ -207,7 +205,7 @@ let MessageSender = class MessageSender {
                     agentContext,
                     serviceParams: {
                         service,
-                        senderKey: firstOurAuthenticationKey,
+                        senderKey: senderVerificationMethod.publicJwk,
                         returnRoute: shouldAddReturnRoute,
                     },
                     connection,
@@ -217,7 +215,7 @@ let MessageSender = class MessageSender {
             }
             catch (error) {
                 errors.push(error);
-                this.logger.debug(`Sending outbound message to service with id ${service.id} failed with the following error:`, {
+                agentContext.config.logger.debug(`Sending outbound message to service with id ${service.id} failed with the following error:`, {
                     message: error.message,
                     error: error,
                 });
@@ -226,14 +224,14 @@ let MessageSender = class MessageSender {
         // We didn't succeed to send the message over open session, or directly to serviceEndpoint
         // If the other party shared a queue service endpoint in their did doc we queue the message
         if (queueService && message.allowQueueTransport) {
-            this.logger.debug(`Queue message for connection ${connection.id} (${connection.theirLabel})`);
+            agentContext.config.logger.debug(`Queue message for connection ${connection.id} (${connection.theirLabel})`);
             const keys = {
                 recipientKeys: queueService.recipientKeys,
                 routingKeys: queueService.routingKeys,
-                senderKey: firstOurAuthenticationKey,
+                senderKey: senderVerificationMethod.publicJwk,
             };
             const encryptedMessage = await this.envelopeService.packMessage(agentContext, message, keys);
-            await this.messagePickupRepository.addMessage({
+            await this.queueTransportRepository.addMessage(agentContext, {
                 connectionId: connection.id,
                 recipientDids: keys.recipientKeys.map((item) => new core_1.DidKey(item).did),
                 payload: encryptedMessage,
@@ -242,7 +240,7 @@ let MessageSender = class MessageSender {
             return;
         }
         // Message is undeliverable
-        this.logger.error(`Message is undeliverable to connection ${connection.id} (${connection.theirLabel})`, {
+        agentContext.config.logger.error(`Message is undeliverable to connection ${connection.id} (${connection.theirLabel})`, {
             message,
             errors,
             connection,
@@ -253,14 +251,14 @@ let MessageSender = class MessageSender {
     async sendMessageToService(outboundMessageContext) {
         const session = this.findSessionForOutboundContext(outboundMessageContext);
         if (session) {
-            this.logger.debug(`Found session with return routing for message '${outboundMessageContext.message.id}'`);
+            outboundMessageContext.agentContext.config.logger.debug(`Found session with return routing for message '${outboundMessageContext.message.id}'`);
             try {
                 await this.sendMessageToSession(outboundMessageContext.agentContext, session, outboundMessageContext.message);
                 this.emitMessageSentEvent(outboundMessageContext, models_1.OutboundMessageSendStatus.SentToSession);
                 return;
             }
             catch (error) {
-                this.logger.debug(`Sending an outbound message via session failed with error: ${error.message}.`, error);
+                outboundMessageContext.agentContext.config.logger.debug(`Sending an outbound message via session failed with error: ${error.message}.`, error);
             }
         }
         // If there is no session try sending to service instead
@@ -269,7 +267,7 @@ let MessageSender = class MessageSender {
             this.emitMessageSentEvent(outboundMessageContext, models_1.OutboundMessageSendStatus.SentToTransport);
         }
         catch (error) {
-            this.logger.error(`Message is undeliverable to service with id ${outboundMessageContext.serviceParams?.service.id}: ${error.message}`, {
+            outboundMessageContext.agentContext.config.logger.error(`Message is undeliverable to service with id ${outboundMessageContext.serviceParams?.service.id}: ${error.message}`, {
                 message: outboundMessageContext.message,
                 error,
             });
@@ -286,7 +284,7 @@ let MessageSender = class MessageSender {
         if (this.outboundTransports.length === 0) {
             throw new core_1.CredoError('Agent has no outbound transport!');
         }
-        this.logger.debug('Sending outbound message to service:', {
+        agentContext.config.logger.debug('Sending outbound message to service:', {
             messageId: message.id,
             service: { ...service, recipientKeys: 'omitted...', routingKeys: 'omitted...' },
         });
@@ -303,7 +301,7 @@ let MessageSender = class MessageSender {
             core_1.MessageValidator.validateSync(message);
         }
         catch (error) {
-            this.logger.error(`Aborting sending outbound message ${message.type} to ${service.serviceEndpoint}. Message validation failed`, {
+            agentContext.config.logger.error(`Aborting sending outbound message ${message.type} to ${service.serviceEndpoint}. Message validation failed`, {
                 errors: error,
                 message: message.toJSON(),
             });
@@ -315,7 +313,7 @@ let MessageSender = class MessageSender {
         for (const transport of this.outboundTransports) {
             const protocolScheme = core_1.utils.getProtocolScheme(service.serviceEndpoint);
             if (!protocolScheme) {
-                this.logger.warn('Service does not have a protocol scheme.');
+                agentContext.config.logger.warn('Service does not have a protocol scheme.');
             }
             else if (transport.supportedSchemes.includes(protocolScheme)) {
                 await transport.sendMessage(outboundPackage);
@@ -341,30 +339,30 @@ let MessageSender = class MessageSender {
         return session?.inboundMessage?.hasAnyReturnRoute() ? session : null;
     }
     async retrieveServicesByConnection(agentContext, connection, transportPriority, outOfBand) {
-        this.logger.debug(`Retrieving services for connection '${connection.id}' (${connection.theirLabel})`, {
+        agentContext.config.logger.debug(`Retrieving services for connection '${connection.id}' (${connection.theirLabel})`, {
             transportPriority,
             connection,
         });
         let didCommServices = [];
         if (connection.theirDid) {
-            this.logger.debug(`Resolving services for connection theirDid ${connection.theirDid}.`);
+            agentContext.config.logger.debug(`Resolving services for connection theirDid ${connection.theirDid}.`);
             didCommServices = await this.didCommDocumentService.resolveServicesFromDid(agentContext, connection.theirDid);
         }
         else if (outOfBand) {
-            this.logger.debug(`Resolving services from out-of-band record ${outOfBand.id}.`);
+            agentContext.config.logger.debug(`Resolving services from out-of-band record ${outOfBand.id}.`);
             if (connection.isRequester) {
                 for (const service of outOfBand.outOfBandInvitation.getServices()) {
                     // Resolve dids to DIDDocs to retrieve services
                     if (typeof service === 'string') {
-                        this.logger.debug(`Resolving services for did ${service}.`);
+                        agentContext.config.logger.debug(`Resolving services for did ${service}.`);
                         didCommServices.push(...(await this.didCommDocumentService.resolveServicesFromDid(agentContext, service)));
                     }
                     else {
                         // Out of band inline service contains keys encoded as did:key references
                         didCommServices.push({
                             id: service.id,
-                            recipientKeys: service.recipientKeys.map(core_1.didKeyToInstanceOfKey),
-                            routingKeys: service.routingKeys?.map(core_1.didKeyToInstanceOfKey) || [],
+                            recipientKeys: service.recipientKeys.map(core_1.didKeyToEd25519PublicJwk),
+                            routingKeys: service.routingKeys?.map(core_1.didKeyToEd25519PublicJwk) || [],
                             serviceEndpoint: service.serviceEndpoint,
                         });
                     }
@@ -389,7 +387,7 @@ let MessageSender = class MessageSender {
                 return transportPriority?.schemes.indexOf(aScheme) - transportPriority?.schemes.indexOf(bScheme);
             });
         }
-        this.logger.debug(`Retrieved ${services.length} services for message to connection '${connection.id}'(${connection.theirLabel})'`, { hasQueueService: queueService !== undefined });
+        agentContext.config.logger.debug(`Retrieved ${services.length} services for message to connection '${connection.id}'(${connection.theirLabel})'`, { hasQueueService: queueService !== undefined });
         return { services, queueService };
     }
     emitMessageSentEvent(outboundMessageContext, status) {
@@ -406,21 +404,13 @@ let MessageSender = class MessageSender {
 exports.MessageSender = MessageSender;
 exports.MessageSender = MessageSender = __decorate([
     (0, core_1.injectable)(),
-    __param(2, (0, core_1.inject)(core_1.InjectionSymbols.MessagePickupRepository)),
-    __param(3, (0, core_1.inject)(core_1.InjectionSymbols.Logger)),
     __metadata("design:paramtypes", [EnvelopeService_1.EnvelopeService,
-        TransportService_1.TransportService, Object, Object, core_1.DidResolverService,
+        TransportService_1.TransportService,
+        DidCommModuleConfig_1.DidCommModuleConfig,
         DidCommDocumentService_1.DidCommDocumentService,
         core_1.EventEmitter])
 ], MessageSender);
 function isDidCommTransportQueue(serviceEndpoint) {
     return serviceEndpoint === constants_1.DID_COMM_TRANSPORT_QUEUE;
 }
-function getAuthenticationKeys(didDocument) {
-    return (didDocument.authentication?.map((authentication) => {
-        const verificationMethod = typeof authentication === 'string' ? didDocument.dereferenceVerificationMethod(authentication) : authentication;
-        const key = (0, core_1.getKeyFromVerificationMethod)(verificationMethod);
-        return key;
-    }) ?? []);
-}
 //# sourceMappingURL=MessageSender.js.map

package/build/MessageSender.js.map

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

package/build/decorators/service/ServiceDecorator.js

@@ -29,15 +29,15 @@ class ServiceDecorator {
     get resolvedDidCommService() {
         return {
             id: core_1.utils.uuid(),
-            recipientKeys: this.recipientKeys.map(core_1.verkeyToInstanceOfKey),
-            routingKeys: this.routingKeys?.map(core_1.verkeyToInstanceOfKey) ?? [],
+            recipientKeys: this.recipientKeys.map(core_1.verkeyToPublicJwk),
+            routingKeys: this.routingKeys?.map(core_1.verkeyToPublicJwk) ?? [],
             serviceEndpoint: this.serviceEndpoint,
         };
     }
     static fromResolvedDidCommService(service) {
         return new ServiceDecorator({
-            recipientKeys: service.recipientKeys.map((k) => k.publicKeyBase58),
-            routingKeys: service.routingKeys.map((k) => k.publicKeyBase58),
+            recipientKeys: service.recipientKeys.map((k) => core_1.TypedArrayEncoder.toBase58(k.publicKey.publicKey)),
+            routingKeys: service.routingKeys.map((k) => core_1.TypedArrayEncoder.toBase58(k.publicKey.publicKey)),
             serviceEndpoint: service.serviceEndpoint,
         });
     }

package/build/decorators/service/ServiceDecorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceDecorator.js","sourceRoot":"","sources":["../../../src/decorators/service/ServiceDecorator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,yCAA6D;AAC7D,qDAA+D;AAQ/D;;;;;GAKG;AACH,MAAa,gBAAgB;IAC3B,YAAmB,OAAgC;QACjD,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;YAC1C,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;YACtC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAA;QAChD,CAAC;IACH,CAAC;IAcD,IAAW,sBAAsB;QAC/B,OAAO;YACL,EAAE,EAAE,YAAK,CAAC,IAAI,EAAE;YAChB,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,4BAAqB,CAAC;YAC5D,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,4BAAqB,CAAC,IAAI,EAAE;YAC/D,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,CAAA;IACH,CAAC;IAEM,MAAM,CAAC,0BAA0B,CAAC,OAA+B;QACtE,OAAO,IAAI,gBAAgB,CAAC;YAC1B,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;YAClE,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;YAC9D,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CAAA;IACJ,CAAC;CACF;AArCD,4CAqCC;AA1BQ;IAFN,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;uDACM;AAKxB;IAHN,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,4BAAU,GAAE;;qDACgB;AAGtB;IADN,IAAA,0BAAQ,GAAE;;yDACoB"}
+{"version":3,"file":"ServiceDecorator.js","sourceRoot":"","sources":["../../../src/decorators/service/ServiceDecorator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,yCAA4E;AAC5E,qDAA+D;AAQ/D;;;;;GAKG;AACH,MAAa,gBAAgB;IAC3B,YAAmB,OAAgC;QACjD,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;YAC1C,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;YACtC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAA;QAChD,CAAC;IACH,CAAC;IAcD,IAAW,sBAAsB;QAC/B,OAAO;YACL,EAAE,EAAE,YAAK,CAAC,IAAI,EAAE;YAChB,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,wBAAiB,CAAC;YACxD,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,wBAAiB,CAAC,IAAI,EAAE;YAC3D,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,CAAA;IACH,CAAC;IAEM,MAAM,CAAC,0BAA0B,CAAC,OAA+B;QACtE,OAAO,IAAI,gBAAgB,CAAC;YAC1B,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,wBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAClG,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,wBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAC9F,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CAAA;IACJ,CAAC;CACF;AArCD,4CAqCC;AA1BQ;IAFN,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;uDACM;AAKxB;IAHN,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,4BAAU,GAAE;;qDACgB;AAGtB;IADN,IAAA,0BAAQ,GAAE;;yDACoB"}

package/build/decorators/signature/SignatureDecoratorUtils.d.ts

@@ -1,4 +1,5 @@
-import type { Wallet } from '@credo-ts/core';
+import type { AgentContext } from '@credo-ts/core';
+import { Kms } from '@credo-ts/core';
 import { SignatureDecorator } from './SignatureDecorator';
 /**
  * Unpack and verify signed data before casting it to the supplied type.
@@ -8,14 +9,14 @@ import { SignatureDecorator } from './SignatureDecorator';
  *
  * @return Resulting data
  */
-export declare function unpackAndVerifySignatureDecorator(decorator: SignatureDecorator, wallet: Wallet): Promise<Record<string, unknown>>;
+export declare function unpackAndVerifySignatureDecorator(agentContext: AgentContext, decorator: SignatureDecorator): Promise<Record<string, unknown>>;
 /**
  * Sign data supplied and return a signature decorator.
  *
  * @param data the data to sign
  * @param wallet the wallet containing a key to use for signing
- * @param signerKey signers verkey
+ * @param signerKey signer key
  *
  * @returns Resulting signature decorator.
  */
-export declare function signData(data: unknown, wallet: Wallet, signerKey: string): Promise<SignatureDecorator>;
+export declare function signData(agentContext: AgentContext, data: unknown, signerKey: Kms.PublicJwk<Kms.Ed25519PublicJwk>): Promise<SignatureDecorator>;

package/build/decorators/signature/SignatureDecoratorUtils.js

@@ -12,18 +12,28 @@ const SignatureDecorator_1 = require("./SignatureDecorator");
  *
  * @return Resulting data
  */
-async function unpackAndVerifySignatureDecorator(decorator, wallet) {
+async function unpackAndVerifySignatureDecorator(agentContext, decorator) {
     const signerVerkey = decorator.signer;
-    const key = core_1.Key.fromPublicKeyBase58(signerVerkey, core_1.KeyType.Ed25519);
+    const kms = agentContext.dependencyManager.resolve(core_1.Kms.KeyManagementApi);
+    const publicJwk = core_1.Kms.PublicJwk.fromPublicKey({
+        kty: 'OKP',
+        crv: 'Ed25519',
+        publicKey: core_1.TypedArrayEncoder.fromBase58(signerVerkey),
+    });
     // first 8 bytes are for 64 bit integer from unix epoch
     const signedData = core_1.TypedArrayEncoder.fromBase64(decorator.signatureData);
     const signature = core_1.TypedArrayEncoder.fromBase64(decorator.signature);
-    // const isValid = await wallet.verify(signerVerkey, signedData, signature)
-    const isValid = await wallet.verify({ signature, data: signedData, key });
-    if (!isValid) {
+    const result = await kms.verify({
+        algorithm: 'EdDSA',
+        data: signedData,
+        key: {
+            publicJwk: publicJwk.toJson(),
+        },
+        signature,
+    });
+    if (!result.verified) {
         throw new core_1.CredoError('Signature is not valid');
     }
-    // TODO: return Connection instance instead of raw json
     return core_1.JsonEncoder.fromBuffer(signedData.slice(8));
 }
 /**
@@ -31,19 +41,19 @@ async function unpackAndVerifySignatureDecorator(decorator, wallet) {
  *
  * @param data the data to sign
  * @param wallet the wallet containing a key to use for signing
- * @param signerKey signers verkey
+ * @param signerKey signer key
  *
  * @returns Resulting signature decorator.
  */
-async function signData(data, wallet, signerKey) {
+async function signData(agentContext, data, signerKey) {
+    const kms = agentContext.dependencyManager.resolve(core_1.Kms.KeyManagementApi);
     const dataBuffer = core_1.Buffer.concat([core_1.utils.timestamp(), core_1.JsonEncoder.toBuffer(data)]);
-    const key = core_1.Key.fromPublicKeyBase58(signerKey, core_1.KeyType.Ed25519);
-    const signatureBuffer = await wallet.sign({ key, data: dataBuffer });
+    const result = await kms.sign({ data: dataBuffer, algorithm: 'EdDSA', keyId: signerKey.keyId });
     const signatureDecorator = new SignatureDecorator_1.SignatureDecorator({
         signatureType: 'https://didcomm.org/signature/1.0/ed25519Sha512_single',
-        signature: core_1.TypedArrayEncoder.toBase64URL(signatureBuffer),
+        signature: core_1.TypedArrayEncoder.toBase64URL(result.signature),
         signatureData: core_1.TypedArrayEncoder.toBase64URL(dataBuffer),
-        signer: signerKey,
+        signer: core_1.TypedArrayEncoder.toBase58(signerKey.publicKey.publicKey),
     });
     return signatureDecorator;
 }

package/build/decorators/signature/SignatureDecoratorUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignatureDecoratorUtils.js","sourceRoot":"","sources":["../../../src/decorators/signature/SignatureDecoratorUtils.ts"],"names":[],"mappings":";;AAcA,8EAoBC;AAWD,4BAcC;AAzDD,yCAAwG;AAExG,6DAAyD;AAEzD;;;;;;;GAOG;AACI,KAAK,UAAU,iCAAiC,CACrD,SAA6B,EAC7B,MAAc;IAEd,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAA;IACrC,MAAM,GAAG,GAAG,UAAG,CAAC,mBAAmB,CAAC,YAAY,EAAE,cAAO,CAAC,OAAO,CAAC,CAAA;IAElE,uDAAuD;IACvD,MAAM,UAAU,GAAG,wBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,CAAA;IACxE,MAAM,SAAS,GAAG,wBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IAEnE,2EAA2E;IAC3E,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAA;IAEzE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,iBAAU,CAAC,wBAAwB,CAAC,CAAA;IAChD,CAAC;IAED,uDAAuD;IACvD,OAAO,kBAAW,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACpD,CAAC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,QAAQ,CAAC,IAAa,EAAE,MAAc,EAAE,SAAiB;IAC7E,MAAM,UAAU,GAAG,aAAM,CAAC,MAAM,CAAC,CAAC,YAAK,CAAC,SAAS,EAAE,EAAE,kBAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjF,MAAM,GAAG,GAAG,UAAG,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAO,CAAC,OAAO,CAAC,CAAA;IAE/D,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;IAEpE,MAAM,kBAAkB,GAAG,IAAI,uCAAkB,CAAC;QAChD,aAAa,EAAE,wDAAwD;QACvE,SAAS,EAAE,wBAAiB,CAAC,WAAW,CAAC,eAAe,CAAC;QACzD,aAAa,EAAE,wBAAiB,CAAC,WAAW,CAAC,UAAU,CAAC;QACxD,MAAM,EAAE,SAAS;KAClB,CAAC,CAAA;IAEF,OAAO,kBAAkB,CAAA;AAC3B,CAAC"}
+{"version":3,"file":"SignatureDecoratorUtils.js","sourceRoot":"","sources":["../../../src/decorators/signature/SignatureDecoratorUtils.ts"],"names":[],"mappings":";;AAcA,8EA+BC;AAWD,4BAkBC;AAxED,yCAA+F;AAE/F,6DAAyD;AAEzD;;;;;;;GAOG;AACI,KAAK,UAAU,iCAAiC,CACrD,YAA0B,EAC1B,SAA6B;IAE7B,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAA;IACrC,MAAM,GAAG,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAG,CAAC,gBAAgB,CAAC,CAAA;IAExE,MAAM,SAAS,GAAG,UAAG,CAAC,SAAS,CAAC,aAAa,CAAC;QAC5C,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,SAAS;QACd,SAAS,EAAE,wBAAiB,CAAC,UAAU,CAAC,YAAY,CAAC;KACtD,CAAC,CAAA;IAEF,uDAAuD;IACvD,MAAM,UAAU,GAAG,wBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,CAAA;IACxE,MAAM,SAAS,GAAG,wBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IAEnE,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC;QAC9B,SAAS,EAAE,OAAO;QAClB,IAAI,EAAE,UAAU;QAChB,GAAG,EAAE;YACH,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE;SAC9B;QACD,SAAS;KACV,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,iBAAU,CAAC,wBAAwB,CAAC,CAAA;IAChD,CAAC;IAED,OAAO,kBAAW,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACpD,CAAC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,QAAQ,CAC5B,YAA0B,EAC1B,IAAa,EACb,SAA8C;IAE9C,MAAM,GAAG,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAG,CAAC,gBAAgB,CAAC,CAAA;IACxE,MAAM,UAAU,GAAG,aAAM,CAAC,MAAM,CAAC,CAAC,YAAK,CAAC,SAAS,EAAE,EAAE,kBAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAEjF,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC,CAAA;IAE/F,MAAM,kBAAkB,GAAG,IAAI,uCAAkB,CAAC;QAChD,aAAa,EAAE,wDAAwD;QACvE,SAAS,EAAE,wBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC;QAC1D,aAAa,EAAE,wBAAiB,CAAC,WAAW,CAAC,UAAU,CAAC;QACxD,MAAM,EAAE,wBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC;KAClE,CAAC,CAAA;IAEF,OAAO,kBAAkB,CAAA;AAC3B,CAAC"}