chore: add custom action for changeAccountSubscriber

Author: nikaaru

wallets/core/package.json

@@ -30,6 +30,10 @@
     "./namespaces/solana": {
       "types": "./dist/namespaces/solana/mod.d.ts",
       "default": "./dist/namespaces/solana/mod.js"
+    },
+    "./hub": {
+      "types": "./dist/hub/mod.d.ts",
+      "default": "./dist/hub/mod.js"
     }
   },
   "files": [
@@ -38,7 +42,7 @@
     "legacy"
   ],
   "scripts": {
-    "build": "node ../../scripts/build/command.mjs --path wallets/core --inputs src/mod.ts,src/utils/mod.ts,src/legacy/mod.ts,src/namespaces/evm/mod.ts,src/namespaces/solana/mod.ts,src/namespaces/common/mod.ts",
+    "build": "node ../../scripts/build/command.mjs --path wallets/core --inputs src/mod.ts,src/utils/mod.ts,src/legacy/mod.ts,src/namespaces/evm/mod.ts,src/namespaces/solana/mod.ts,src/namespaces/common/mod.ts,src/hub/mod.ts",
     "ts-check": "tsc --declaration --emitDeclarationOnly -p ./tsconfig.json",
     "clean": "rimraf dist",
     "format": "prettier --write '{.,src}/**/*.{ts,tsx}'",

wallets/core/src/hub/mod.ts

@@ -1,5 +1,5 @@
 export { Namespace } from './namespaces/mod.js';
-
+export type { Subscriber, SubscriberCleanUp } from './namespaces/mod.js';
 export { Provider } from './provider/mod.js';
 export type { CommonNamespaces, CommonNamespaceKeys } from './provider/mod.js';
 

wallets/core/src/hub/namespaces/mod.ts

@@ -1,5 +1,6 @@
 export type {
   Subscriber,
+  SubscriberCleanUp,
   State,
   RegisteredActions as ActionsMap,
   Context,

wallets/provider-clover/src/actions/solana.ts

@@ -0,0 +1,65 @@
+import type {
+  Subscriber,
+  SubscriberCleanUp,
+} from '@rango-dev/wallets-core/hub';
+
+import {
+  CAIP_NAMESPACE,
+  CAIP_SOLANA_CHAIN_ID,
+  type SolanaActions,
+} from '@rango-dev/wallets-core/namespaces/solana';
+import { AccountId } from 'caip';
+
+import { evmClover, solanaClover } from '../utils.js';
+
+export function changeAccountSubscriberAction(): [
+  Subscriber<SolanaActions>,
+  SubscriberCleanUp<SolanaActions>
+] {
+  let eventCallback: () => void;
+
+  // subscriber can be passed to `or`, it will get the error and should rethrow error to pass the error to next `or` or throw error.
+  return [
+    (context, err) => {
+      const solanaInstance = solanaClover();
+      const evmInstance = evmClover();
+      if (!solanaInstance) {
+        throw new Error(
+          'Trying to subscribe to your Solana wallet, but seems its instance is not available.'
+        );
+      }
+
+      const [, setState] = context.state();
+
+      eventCallback = async () => {
+        const solanaInstance = solanaClover();
+        const solanaAccount = await solanaInstance.getAccount();
+
+        setState('accounts', [
+          AccountId.format({
+            address: solanaAccount,
+            chainId: {
+              namespace: CAIP_NAMESPACE,
+              reference: CAIP_SOLANA_CHAIN_ID,
+            },
+          }),
+        ]);
+      };
+      evmInstance.on('accountsChanged', eventCallback);
+
+      if (err instanceof Error) {
+        throw err;
+      }
+    },
+    (_context, err) => {
+      const evmInstance = evmClover();
+      if (eventCallback && evmInstance) {
+        evmInstance.removeListener('accountsChanged', eventCallback);
+      }
+
+      if (err instanceof Error) {
+        throw err;
+      }
+    },
+  ];
+}

wallets/provider-clover/src/constants.ts

@@ -3,7 +3,7 @@ import { type ProviderInfo } from '@rango-dev/wallets-core';
 export const WALLET_ID = 'clover';
 
 export const info: ProviderInfo = {
-  name: 'Clover',
+  name: 'CLV',
   icon: 'https://raw.githubusercontent.com/rango-exchange/assets/main/wallets/clover/icon.svg',
   extensions: {
     chrome:

wallets/provider-clover/src/namespaces/solana.ts

@@ -11,9 +11,13 @@ import {
 } from '@rango-dev/wallets-core/namespaces/solana';
 import { CAIP } from '@rango-dev/wallets-core/utils';
 
+import { changeAccountSubscriberAction } from '../actions/solana.js';
 import { WALLET_ID } from '../constants.js';
 import { solanaClover } from '../utils.js';
 
+const [changeAccountSubscriber, changeAccountCleanup] =
+  changeAccountSubscriberAction();
+
 const connect = builders
   .connect()
   .action(async function () {
@@ -37,9 +41,14 @@ const connect = builders
 
     return formatAccounts;
   })
+  .before(changeAccountSubscriber)
+  .or(changeAccountCleanup)
   .build();
 
-const disconnect = commonBuilders.disconnect<SolanaActions>().build();
+const disconnect = commonBuilders
+  .disconnect<SolanaActions>()
+  .after(changeAccountCleanup)
+  .build();
 
 const solana = new NamespaceBuilder<SolanaActions>('Solana', WALLET_ID)
   .action(connect)