@rango-dev/wallets-core 0.40.1-next.0 → 0.40.1-next.10

package/src/namespaces/common/mod.ts

@@ -16,3 +16,5 @@ export type {
   Accounts,
   AccountsWithActiveChain,
 } from '../../types/accounts.js';
+
+export type { Namespace } from './types.js';

package/src/namespaces/common/types.ts

@@ -1,3 +1,19 @@
+/*
+ * These are supported namespaces in Rango that we want to officially support.
+ * This should be private and don't make it public since core can support more namespaces and should be extendable.
+ */
+type RangoNamespace =
+  | 'EVM'
+  | 'Solana'
+  | 'Cosmos'
+  | 'UTXO'
+  | 'Starknet'
+  | 'Tron'
+  | 'Ton';
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type Namespace = RangoNamespace | (string & {});
+
 export interface CommonActions {
   init: () => void;
 }

package/src/namespaces/evm/actions.ts

@@ -57,8 +57,9 @@ export function changeAccountSubscriber(
 ): [Subscriber<EvmActions>, SubscriberCleanUp<EvmActions>] {
   let eventCallback: EIP1193EventMap['accountsChanged'];
 
+  // 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) => {
+    (context, err) => {
       const evmInstance = instance();
 
       if (!evmInstance) {
@@ -70,8 +71,18 @@ export function changeAccountSubscriber(
       const [, setState] = context.state();
 
       eventCallback = async (accounts) => {
-        const chainId = await evmInstance.request({ method: 'eth_chainId' });
+        /*
+         * In Phantom, when user is switching to an account which is not connected to dApp yet, it returns a null.
+         * So null means we don't have access to account and we need to disconnect and let the user connect the account.
+         *
+         * This assumption may not work for other wallets, if that the case, we need to consider a new approach.
+         */
+        if (!accounts || accounts.length === 0) {
+          context.action('disconnect');
+          return;
+        }
 
+        const chainId = await evmInstance.request({ method: 'eth_chainId' });
         const formatAccounts = accounts.map((account) =>
           AccountId.format({
             address: account,
@@ -85,13 +96,53 @@ export function changeAccountSubscriber(
         setState('accounts', formatAccounts);
       };
       evmInstance.on('accountsChanged', eventCallback);
+
+      if (err instanceof Error) {
+        throw err;
+      }
     },
-    () => {
+    (_, err) => {
       const evmInstance = instance();
 
       if (eventCallback && evmInstance) {
         evmInstance.removeListener('accountsChanged', eventCallback);
       }
+
+      if (err instanceof Error) {
+        throw err;
+      }
+    },
+  ];
+}
+
+export function changeChainSubscriber(
+  instance: () => ProviderAPI
+): [Subscriber<EvmActions>, SubscriberCleanUp<EvmActions>] {
+  let eventCallback: EIP1193EventMap['chainChanged'];
+
+  return [
+    (context) => {
+      const evmInstance = instance();
+
+      if (!evmInstance) {
+        throw new Error(
+          'Trying to subscribe to your EVM wallet, but seems its instance is not available.'
+        );
+      }
+
+      const [, setState] = context.state();
+
+      eventCallback = async (chainId: string) => {
+        setState('network', chainId);
+      };
+      evmInstance.on('chainChanged', eventCallback);
+    },
+    () => {
+      const evmInstance = instance();
+
+      if (eventCallback && evmInstance) {
+        evmInstance.removeListener('chainChanged', eventCallback);
+      }
     },
   ];
 }