optional (#1666)

Author: fan-zhang-sv

packages/wallet-sdk/src/core/message/RPCMessage.ts

@@ -4,7 +4,7 @@ import { Message, MessageID } from './Message.js';
 
 interface RPCMessage extends Message {
   id: MessageID;
-  correlationId: string;
+  correlationId: string | undefined;
   sender: string; // hex encoded public key of the sender
   content: unknown;
   timestamp: Date;

packages/wallet-sdk/src/core/telemetry/events/provider.ts

@@ -18,7 +18,7 @@ export const logRequestStarted = ({
   correlationId,
 }: {
   method: string;
-  correlationId: string;
+  correlationId: string | undefined;
 }) => {
   logEvent(
     'provider.request.started',
@@ -39,7 +39,7 @@ export const logRequestError = ({
   errorMessage,
 }: {
   method: string;
-  correlationId: string;
+  correlationId: string | undefined;
   signerType: SignerType | undefined;
   errorMessage: string;
 }) => {
@@ -64,7 +64,7 @@ export const logRequestResponded = ({
 }: {
   method: string;
   signerType: SignerType | undefined;
-  correlationId: string;
+  correlationId: string | undefined;
 }) => {
   logEvent(
     'provider.request.responded',

packages/wallet-sdk/src/core/telemetry/events/scw-signer.ts

@@ -5,7 +5,7 @@ export const logHandshakeStarted = ({
   correlationId,
 }: {
   method: string;
-  correlationId: string;
+  correlationId: string | undefined;
 }) => {
   logEvent(
     'scw_signer.handshake.started',
@@ -25,7 +25,7 @@ export const logHandshakeError = ({
   errorMessage,
 }: {
   method: string;
-  correlationId: string;
+  correlationId: string | undefined;
   errorMessage: string;
 }) => {
   logEvent(
@@ -46,7 +46,7 @@ export const logHandshakeCompleted = ({
   correlationId,
 }: {
   method: string;
-  correlationId: string;
+  correlationId: string | undefined;
 }) => {
   logEvent(
     'scw_signer.handshake.completed',
@@ -65,7 +65,7 @@ export const logRequestStarted = ({
   correlationId,
 }: {
   method: string;
-  correlationId: string;
+  correlationId: string | undefined;
 }) => {
   logEvent(
     'scw_signer.request.started',
@@ -85,7 +85,7 @@ export const logRequestError = ({
   errorMessage,
 }: {
   method: string;
-  correlationId: string;
+  correlationId: string | undefined;
   errorMessage: string;
 }) => {
   logEvent(
@@ -106,7 +106,7 @@ export const logRequestCompleted = ({
   correlationId,
 }: {
   method: string;
-  correlationId: string;
+  correlationId: string | undefined;
 }) => {
   logEvent(
     'scw_signer.request.completed',

packages/wallet-sdk/src/sign/scw/SCWSigner.ts

@@ -94,7 +94,7 @@ export class SCWSigner implements Signer {
         method: args.method,
         params: args.params ?? [],
       },
-    });
+    }, correlationId);
     const response: RPCResponseMessage =
       await this.communicator.postRequestAndWaitForResponse(handshakeMessage);
 
@@ -441,18 +441,21 @@ export class SCWSigner implements Signer {
       },
       sharedSecret
     );
-    const message = await this.createRequestMessage({ encrypted });
+    const correlationId = correlationIds.get(request);
+    const message = await this.createRequestMessage({ encrypted }, correlationId);
 
     return this.communicator.postRequestAndWaitForResponse(message);
   }
 
   private async createRequestMessage(
-    content: RPCRequestMessage['content']
+    content: RPCRequestMessage['content'],
+    correlationId: string | undefined
   ): Promise<RPCRequestMessage> {
     const publicKey = await exportKeyToHexString('public', await this.keyManager.getOwnPublicKey());
+
     return {
       id: crypto.randomUUID(),
-      correlationId: correlationIds.get(content),
+      correlationId,
       sender: publicKey,
       content,
       timestamp: new Date(),

packages/wallet-sdk/src/store/correlation-ids/store.ts

@@ -1,4 +1,3 @@
-import { standardErrors } from ':core/error/errors.js';
 import { createStore } from 'zustand/vanilla';
 
 type CorrelationIdsState = {
@@ -12,7 +11,6 @@ const correlationIdsStore = createStore<CorrelationIdsState>(() => ({
 export const correlationIds = {
   get: (key: object) => {
     const correlationId = correlationIdsStore.getState().correlationIds.get(key);
-    if (!correlationId) throw standardErrors.rpc.internal('Correlation ID not found');
     return correlationId;
   },
   set: (key: object, correlationId: string) => {