chore: be more vigilante against inconsistent state (#94)

* chore: be more vigilante against inconsistent state

* chore: add comments regarding explaining cleanup process

* chore: run prettier

* chore: remove duplicate log

* Update packages/notify-client/src/controllers/engine.ts

Co-authored-by: Ben Kremer <ben@walletconnect.com>

* chore(release): 0.16.3

---------

Co-authored-by: Ben Kremer <ben@walletconnect.com>

Author: devceline

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@walletconnect/notify-client",
   "description": "WalletConnect Notify Client",
-  "version": "0.16.2",
+  "version": "0.16.3",
   "author": "WalletConnect, Inc. <walletconnect.com>",
   "homepage": "https://github.com/walletconnect/notify-client-js/",
   "license": "Apache-2.0",

packages/notify-client/package.json

@@ -135,53 +135,64 @@ export class NotifyEngine extends INotifyEngine {
 
   public unregister: INotifyEngine["unregister"] = async ({ account }) => {
     try {
-      // Get information about watching subscriptions of account
-      const watchedAccount = this.client.watchedAccounts.get(account);
+      if (!(await this.client.identityKeys.hasIdentity({ account }))) {
+        return;
+      }
 
-      // If account was watched
-      if (watchedAccount) {
-        this.client.logger.info(
-          `[Notify] unregister > account ${watchedAccount.account} was previously watched. Unsubscribing from watch topics`
-        );
-        // and subscribed to a notify server watch topic
-        if (
-          await this.client.core.relayer.subscriber.isSubscribed(
-            watchedAccount.resTopic
-          )
-        ) {
-          // unsubscribe from watch topic
-          await this.client.core.relayer.unsubscribe(watchedAccount.resTopic);
-        }
+      // If user has watched their subscriptions before, stop watching.
+      // We can not assume that every registered user has a watchedAccount
+      // due to the fact that the stores for watchedAccounts and identityKeys
+      // are entirely separate.
+      if (this.client.watchedAccounts.keys.includes(account)) {
+        const watchedAccount = this.client.watchedAccounts.get(account);
 
-        // If account was the last to be watched
-        if (watchedAccount.lastWatched) {
+        // If account was watched: stop watching it.
+        if (watchedAccount) {
           this.client.logger.info(
-            `[Notify] unregister > account ${watchedAccount.account} was last to be watched. Unmarking as last watched`
+            `[Notify] unregister > account ${watchedAccount.account} was previously watched. Unsubscribing from watch topics`
           );
-          // Remove last watched flag, to prevent watching on next init.
-          await this.client.watchedAccounts.update(watchedAccount.account, {
-            lastWatched: false,
-          });
+          // and subscribed to a notify server watch topic
+          if (
+            await this.client.core.relayer.subscriber.isSubscribed(
+              watchedAccount.resTopic
+            )
+          ) {
+            // unsubscribe from watch topic
+            await this.client.core.relayer.unsubscribe(watchedAccount.resTopic);
+          }
+
+          // If account was the last to be watched
+          if (watchedAccount.lastWatched) {
+            // Remove last watched flag, to prevent watching on next init.
+            await this.client.watchedAccounts.update(watchedAccount.account, {
+              lastWatched: false,
+            });
+            this.client.logger.info(
+              `[Notify] unregister > account ${watchedAccount.account} was last to be watched. Unmarking as last watched`
+            );
+          }
         }
       }
 
-      this.client.logger.info(
-        `[Notify] unregister > account ${watchedAccount.account} was last to be watched. Unmarking as last watched`
-      );
-
       // Unsubscribe from subscription topics
       for (const sub of Object.values(
         this.getActiveSubscriptions({ account })
       )) {
         await this.client.core.relayer.unsubscribe(sub.topic);
       }
 
-      this.client.logger.info(
-        `[Notify] unregister > account ${watchedAccount.account} was last to be watched. Unmarking as last watched`
-      );
       // unregister from identity server
       await this.client.identityKeys.unregisterIdentity({ account });
 
+      // If user has registration data, clear it to prevent false
+      // data regarding staleness of identity
+      if (this.client.registrationData.keys.includes(account)) {
+        this.client.registrationData.delete(account, {
+          code: -1,
+          message: "Wallet was unregistered",
+        });
+      }
+
       this.client.logger.info(
         `Engine.unregister > Successfully unregistered account ${account}`
       );