Merge pull request #4105 from WalletConnect/fix/session-settle-race-cond

fix: saves `session` object before sending `sessionSettle` request

packages/sign-client/src/controllers/engine.ts

@@ -267,12 +267,6 @@ export class Engine extends IEngine {
       ...(sessionProperties && { sessionProperties }),
     };
     await this.client.core.relayer.subscribe(sessionTopic);
-    await this.sendRequest({
-      topic: sessionTopic,
-      method: "wc_sessionSettle",
-      params: sessionSettle,
-      throwOnFailedPublish: true,
-    });
     const session = {
       ...sessionSettle,
       topic: sessionTopic,
@@ -286,6 +280,21 @@ export class Engine extends IEngine {
       controller: selfPublicKey,
     };
     await this.client.session.set(sessionTopic, session);
+    try {
+      await this.sendRequest({
+        topic: sessionTopic,
+        method: "wc_sessionSettle",
+        params: sessionSettle,
+        throwOnFailedPublish: true,
+      });
+    } catch (error) {
+      this.client.logger.error(error);
+      // if the publish fails, delete the session and throw an error
+      this.client.session.delete(sessionTopic, getSdkError("USER_DISCONNECTED"));
+      await this.client.core.relayer.unsubscribe(sessionTopic);
+      throw error;
+    }
+
     await this.setExpiry(sessionTopic, calcExpiry(SESSION_EXPIRY));
     return {
       topic: sessionTopic,