Merge pull request #3266 from WalletConnect/refactor/try-catch-on-pay…

…load refactor: wrap try/catch on payload processing
WalletConnect · Jul 27, 2023 · 06ca6bb · 06ca6bb
2 parents eac72b9 + 8b8d61f
commit 06ca6bb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/packages/core/src/controllers/pairing.ts b/packages/core/src/controllers/pairing.ts
@@ -247,13 +247,18 @@ export class Pairing implements IPairing {
       if (this.ignoredPayloadTypes.includes(this.core.crypto.getPayloadType(message))) return;
 
       const payload = await this.core.crypto.decode(topic, message);
-      if (isJsonRpcRequest(payload)) {
-        this.core.history.set(topic, payload);
-        this.onRelayEventRequest({ topic, payload });
-      } else if (isJsonRpcResponse(payload)) {
-        await this.core.history.resolve(payload);
-        await this.onRelayEventResponse({ topic, payload });
-        this.core.history.delete(topic, payload.id);
+
+      try {
+        if (isJsonRpcRequest(payload)) {
+          this.core.history.set(topic, payload);
+          this.onRelayEventRequest({ topic, payload });
+        } else if (isJsonRpcResponse(payload)) {
+          await this.core.history.resolve(payload);
+          await this.onRelayEventResponse({ topic, payload });
+          this.core.history.delete(topic, payload.id);
+        }
+      } catch (error) {
+        this.logger.error(error);
       }
     });
   }

diff --git a/packages/sign-client/src/controllers/engine.ts b/packages/sign-client/src/controllers/engine.ts
@@ -567,16 +567,19 @@ export class Engine extends IEngine {
         }
 
         const payload = await this.client.core.crypto.decode(topic, message);
-
-        if (isJsonRpcRequest(payload)) {
-          this.client.core.history.set(topic, payload);
-          this.onRelayEventRequest({ topic, payload });
-        } else if (isJsonRpcResponse(payload)) {
-          await this.client.core.history.resolve(payload);
-          await this.onRelayEventResponse({ topic, payload });
-          this.client.core.history.delete(topic, payload.id);
-        } else {
-          this.onRelayEventUnknownPayload({ topic, payload });
+        try {
+          if (isJsonRpcRequest(payload)) {
+            this.client.core.history.set(topic, payload);
+            this.onRelayEventRequest({ topic, payload });
+          } else if (isJsonRpcResponse(payload)) {
+            await this.client.core.history.resolve(payload);
+            await this.onRelayEventResponse({ topic, payload });
+            this.client.core.history.delete(topic, payload.id);
+          } else {
+            this.onRelayEventUnknownPayload({ topic, payload });
+          }
+        } catch (error) {
+          this.client.logger.error(error);
         }
       },
     );