@rango-dev/wallets-core 0.43.1-next.1 → 0.43.1-next.10

package/src/builders/namespace.ts

@@ -19,6 +19,17 @@ export const allowedMethods = [
   'or_else',
   'store',
 ] as const;
+/**
+ * List of value types that are considered safe to return directly when
+ * accessing properties on a proxied `Namespace`.
+ *
+ * This is useful for allowing public values like `version` to be accessed.
+ * If a property's value is of one of these types (e.g.,`'string'`, `'number'`),
+ * it will be returned as-is.
+ *
+ * @const {Array<'string' | 'number'>} allowedPublicValues
+ */
+const allowedPublicValues = ['string', 'number'];
 
 export class NamespaceBuilder<T extends Actions<T>> {
   #id: string;
@@ -192,6 +203,26 @@ export class NamespaceBuilder<T extends Actions<T>> {
     this.#addHooksFromActionBuilders(namespace);
 
     const api = new Proxy(namespace, {
+      has: (_, property) => {
+        if (typeof property !== 'string') {
+          throw new Error(
+            'You can use string as your property on Namespace instance.'
+          );
+        }
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore-next-line
+        if (allowedMethods.includes(property)) {
+          return true;
+        }
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore-next-line
+        if (allowedPublicValues.includes(typeof namespace[property])) {
+          return true;
+        }
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore-next-line
+        return namespace.has(property);
+      },
       get: (_, property) => {
         if (typeof property !== 'string') {
           throw new Error(
@@ -207,12 +238,10 @@ export class NamespaceBuilder<T extends Actions<T>> {
         ) {
           return targetValue.bind(namespace);
         }
-
         /*
          * This is useful accessing values like `version`, If we don't do this, we should whitelist
          * All the values as well, So it can be confusing for someone that only wants to add a public value to `Namespace`
          */
-        const allowedPublicValues = ['string', 'number'];
         if (allowedPublicValues.includes(typeof targetValue)) {
           return targetValue;
         }

package/src/hub/hub.ts

@@ -80,6 +80,18 @@ export class Hub {
     this.#providers.set(id, provider);
     return this;
   }
+  remove(id: string) {
+    const providerToRemove = this.#providers.get(id);
+
+    if (!providerToRemove) {
+      throw new Error(`Provider not found: No provider exists with ID "${id}"`);
+    }
+
+    this.#options.store?.getState().providers.removeProvider(id);
+    this.#providers.delete(id);
+
+    return this;
+  }
 
   get(providerId: string): Provider | undefined {
     return this.#providers.get(providerId);
@@ -96,6 +108,7 @@ export class Hub {
     output.forEach((result) => {
       const namespaces: NamespaceState[] = [];
       result.namespaces.forEach((b) => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const [getNamespaceState] = b as ReturnType<Namespace<any>['state']>;
 
         namespaces.push(getNamespaceState());

package/src/hub/namespaces/namespace.test.ts

@@ -133,6 +133,27 @@ describe('check initializing Namespace', () => {
     expect(currentState('connecting')).toBe(true);
   });
 
+  test('has method returns true when namespace contains the specified action', () => {
+    const connectAction = vi.fn((context) => {
+      const [, setState] = context.state();
+      setState('connected', true);
+    });
+
+    const actionsMap = new Map([['connect', connectAction]]);
+
+    const store = createStore();
+    const namespace = new Namespace<TestNamespaceActions>(
+      NAMESPACE,
+      PROVIDER_ID,
+      {
+        actions: actionsMap,
+        store,
+      }
+    );
+
+    expect(namespace.has('connect')).toBe(true);
+    expect(namespace.has('disconnect')).toBe(false);
+  });
   test("throw an error if store doesn't set", () => {
     const ns = new Namespace<TestNamespaceActions>(NAMESPACE, PROVIDER_ID, {
       actions: new Map(),

package/src/hub/namespaces/namespace.ts

@@ -278,7 +278,9 @@ class Namespace<T extends Actions<T>> {
 
     return this;
   }
-
+  public has<K extends keyof T>(actionName: K): boolean {
+    return !!this.#actions.get(actionName);
+  }
   /**
    *
    * Registered actions will be called using `run`. it will run an action and all the operators or hooks that assigned.

package/src/hub/provider/provider.test.ts

@@ -16,6 +16,7 @@ describe('check providers', () => {
     evm: NamespaceBuilder<EvmActions>;
     solana: NamespaceBuilder<SolanaActions>;
   };
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let namespacesMap: Map<any, any>;
   let store: Store;
 
@@ -39,6 +40,7 @@ describe('check providers', () => {
     return () => {
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore-next-line
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       (store = undefined), (namespaces = undefined);
     };
   });
@@ -52,7 +54,6 @@ describe('check providers', () => {
 
     expect(allNamespaces.size).toBe(2);
   });
-
   test("throw an error if store hasn't set and try to access .state() and .info()", () => {
     const provider = new Provider('garbage', namespacesMap, {
       info: garbageWalletInfo,

package/src/hub/provider/provider.ts

@@ -296,10 +296,12 @@ export class Provider {
 
     this.#namespaces.forEach((namespace) => {
       if (hookName === 'after') {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         namespace.after(actionName as any, cb, {
           context,
         });
       } else if (hookName === 'before') {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         namespace.before(actionName as any, cb, {
           context,
         });

package/src/hub/store/providers.ts

@@ -1,5 +1,6 @@
 import type { Namespace } from '../../namespaces/common/types.js';
 import type { State as InternalProviderState } from '../provider/mod.js';
+import type { BlockchainMeta } from 'rango-types';
 import type { StateCreator } from 'zustand';
 
 import { produce } from 'immer';
@@ -9,13 +10,47 @@ import { guessProviderStateSelector, type State } from './mod.js';
 
 type Browsers = 'firefox' | 'chrome' | 'edge' | 'brave' | 'homepage';
 type Property<N extends string, V> = { name: N; value: V };
-type DetachedInstances = Property<'detached', Namespace[]>;
+
+type NamespacesProperty = Property<
+  'namespaces',
+  {
+    selection: 'single' | 'multiple';
+    data: {
+      label: string;
+      id: string;
+      value: Namespace;
+      unsupported?: boolean;
+      getSupportedChains: (chains: BlockchainMeta[]) => BlockchainMeta[];
+    }[];
+  }
+>;
+type DerivationPathProperty = Property<
+  'derivationPath',
+  {
+    data: {
+      id: string;
+      label: string;
+      namespace: Namespace;
+      generateDerivationPath: (index: string) => string;
+    }[];
+  }
+>;
+type DetailsProperty = Property<
+  'details',
+  {
+    mobileWallet?: boolean;
+    showOnMobile?: boolean;
+    isContractWallet?: boolean;
+  }
+>;
 
 export type ProviderInfo = {
   name: string;
   icon: string;
   extensions: Partial<Record<Browsers, string>>;
-  properties?: DetachedInstances[];
+  properties?: Array<
+    NamespacesProperty | DerivationPathProperty | DetailsProperty
+  >;
 };
 
 export interface ProviderConfig {
@@ -38,6 +73,7 @@ type ProviderState = {
 };
 interface ProviderActions {
   addProvider: (id: string, config: ProviderConfig) => void;
+  removeProvider: (id: string) => void;
   updateStatus: <K extends keyof ProviderData>(
     id: string,
     key: K,
@@ -82,6 +118,13 @@ const providersStore: ProvidersStateCreator = (set, get) => ({
       })
     );
   },
+  removeProvider: (id) => {
+    set(
+      produce((state: State) => {
+        delete state.providers.list[id];
+      })
+    );
+  },
   updateStatus: (id, key, value) => {
     const provider = get().providers.list[id];
     if (!provider) {

package/src/hub/store/selectors.ts

@@ -28,7 +28,7 @@ export function guessProviderStateSelector(
   );
 
   // Returning provider state value directly.
-  const installed = state.providers.list[providerId].data.installed;
+  const installed = !!state.providers.list[providerId]?.data.installed;
 
   /*
    * If any namespaces returns `true`, we consider the whole provider for this field to be `true`.

package/src/hub/store/store.test.ts

@@ -29,4 +29,24 @@ describe('checking store', () => {
     expect(getState().providers.list[id]).toBeDefined();
     expect(Object.keys(getState().providers.list).length).toBe(1);
   });
+  test('provider can be removed from store', () => {
+    const id = 'sol-or-something';
+    const info = {
+      info: {
+        name: 'sol grabage wallet',
+        icon: 'http://somewhere.world',
+        extensions: {
+          homepage: 'http://somewhere.world',
+        },
+      },
+    };
+
+    const { getState } = hubStore;
+    getState().providers.addProvider(id, info);
+    expect(getState().providers.list[id]).toBeDefined();
+    expect(Object.keys(getState().providers.list).length).toBe(1);
+    getState().providers.removeProvider(id);
+    expect(getState().providers.list[id]).toBeUndefined();
+    expect(Object.keys(getState().providers.list).length).toBe(0);
+  });
 });

package/src/legacy/types.ts

@@ -1,6 +1,5 @@
 import type { State as WalletState } from './wallet.js';
 import type { Namespace } from '../namespaces/common/mod.js';
-import type { Chain } from '../namespaces/common/types.js';
 import type { BlockchainMeta, SignerFactory } from 'rango-types';
 
 export enum Networks {
@@ -95,7 +94,7 @@ export type NamespaceMeta = {
   id: string;
   value: Namespace;
   unsupported?: boolean;
-  chains: Chain[];
+  getSupportedChains: (chains: BlockchainMeta[]) => BlockchainMeta[];
 };
 
 interface NeedsNamespace {

package/src/namespaces/common/mod.ts

@@ -18,4 +18,4 @@ export type {
   AccountsWithActiveChain,
 } from '../../types/accounts.js';
 
-export type { Namespace, Chain } from './types.js';
+export type { Namespace } from './types.js';

package/src/namespaces/common/types.ts

@@ -21,8 +21,3 @@ export interface CommonActions {
 export interface AutoImplementedActionsByRecommended {
   disconnect: () => void;
 }
-
-export type Chain = {
-  name: string;
-  logo: string;
-};

package/src/namespaces/evm/mod.ts

@@ -4,7 +4,6 @@ export * as and from './and.js';
 export * as before from './before.js';
 export * as utils from './utils.js';
 export * as builders from './builders.js';
-export * as chains from './chains.js';
 
 export type { EvmActions, ProviderAPI } from './types.js';
 export { CAIP_NAMESPACE, CAIP_ETHEREUM_CHAIN_ID } from './constants.js';

package/src/namespaces/solana/actions.ts

@@ -1,13 +1,15 @@
 import type { ProviderAPI, SolanaActions } from './types.js';
-import type { Subscriber } from '../../hub/namespaces/mod.js';
+import type { Context, Subscriber } from '../../hub/namespaces/mod.js';
 import type { SubscriberCleanUp } from '../../hub/namespaces/types.js';
-import type { AnyFunction } from '../../types/actions.js';
+import type { CaipAccount } from '../../types/accounts.js';
+import type { AnyFunction, FunctionWithContext } from '../../types/actions.js';
 
 import { AccountId } from 'caip';
 
 import { recommended as commonRecommended } from '../common/actions.js';
 
 import { CAIP_NAMESPACE, CAIP_SOLANA_CHAIN_ID } from './constants.js';
+import { getAccounts } from './utils.js';
 
 export const recommended = [...commonRecommended];
 
@@ -64,3 +66,28 @@ export function changeAccountSubscriber(
     },
   ];
 }
+export function connect(
+  instance: () => ProviderAPI
+): FunctionWithContext<SolanaActions['connect'], Context> {
+  return async () => {
+    const solanaInstance = instance();
+    const result = await getAccounts(solanaInstance);
+
+    if (Array.isArray(result)) {
+      throw new Error(
+        'Expecting solana response to be a single value, not an array.'
+      );
+    }
+
+    return result.accounts.map(
+      (account) =>
+        AccountId.format({
+          address: account,
+          chainId: {
+            namespace: CAIP_NAMESPACE,
+            reference: CAIP_SOLANA_CHAIN_ID,
+          },
+        }) as CaipAccount
+    );
+  };
+}

package/src/namespaces/solana/mod.ts

@@ -3,7 +3,6 @@ export * as after from './after.js';
 export * as and from './and.js';
 export * as before from './before.js';
 export * as builders from './builders.js';
-export * as chains from './chains.js';
 
 export type { ProviderAPI, SolanaActions } from './types.js';
 export { CAIP_NAMESPACE, CAIP_SOLANA_CHAIN_ID } from './constants.js';

package/src/namespaces/solana/utils.ts

@@ -0,0 +1,12 @@
+import type { ProviderAPI } from './types.js';
+
+import { LegacyNetworks } from '../../legacy/mod.js';
+
+export async function getAccounts(provider: ProviderAPI) {
+  const solanaResponse = await provider.connect();
+  const account = solanaResponse.publicKey.toString();
+  return {
+    accounts: [account],
+    chainId: LegacyNetworks.SOLANA,
+  };
+}

package/src/namespaces/sui/actions.ts

@@ -1,6 +1,9 @@
 import type { SuiActions } from './types.js';
 import type { Subscriber } from '../../hub/namespaces/mod.js';
-import type { SubscriberCleanUp } from '../../hub/namespaces/types.js';
+import type {
+  CanEagerConnect,
+  SubscriberCleanUp,
+} from '../../hub/namespaces/types.js';
 import type { StandardEventsChangeProperties } from '@mysten/wallet-standard';
 
 import { AccountId } from 'caip';
@@ -60,3 +63,25 @@ export function changeAccountSubscriber(
     },
   ];
 }
+interface CanEagerConnectParams {
+  name: string;
+}
+export function canEagerConnect(
+  params: CanEagerConnectParams
+): CanEagerConnect<SuiActions> {
+  return async () => {
+    const wallet = getInstanceOrThrow(params.name);
+
+    try {
+      const connectResult = await wallet.features['standard:connect'].connect({
+        silent: true,
+      });
+      if (connectResult.accounts.length) {
+        return true;
+      }
+      return false;
+    } catch {
+      return false;
+    }
+  };
+}

package/src/namespaces/sui/builders.ts

@@ -39,3 +39,6 @@ export const connect = (params: ConnectParams) =>
     .and(connectAndUpdateStateForSingleNetwork)
     .before(intoConnecting)
     .after(intoConnectionFinished);
+
+export const canEagerConnect = () =>
+  new ActionBuilder<SuiActions, 'canEagerConnect'>('canEagerConnect');

package/src/namespaces/sui/mod.ts

@@ -2,7 +2,6 @@ export type { ProviderAPI, SuiActions } from './types.js';
 
 export * as actions from './actions.js';
 export * as builders from './builders.js';
-export * as chains from './chains.js';
-export { getInstanceOrThrow } from './utils.js';
+export { getInstanceOrThrow, getInstance } from './utils.js';
 
 export { CAIP_NAMESPACE, CAIP_SUI_CHAIN_ID } from './constants.js';

package/src/namespaces/sui/utils.ts

@@ -15,7 +15,7 @@ type SuiWalletStandard = WalletWithFeatures<
 /**
  * @param name each wallet has a name in WalletStandard. you should pass that value
  */
-export function getInstanceOrThrow(name: string): SuiWalletStandard {
+export function getInstance(name: string): SuiWalletStandard | undefined {
   const wallet = getWallets()
     .get()
     .find(
@@ -23,11 +23,20 @@ export function getInstanceOrThrow(name: string): SuiWalletStandard {
         wallet.name === name && wallet.chains.includes(SUI_MAINNET_CHAIN)
     );
 
+  return wallet as SuiWalletStandard;
+}
+
+/**
+ * @param name each wallet has a name in WalletStandard. you should pass that value
+ */
+export function getInstanceOrThrow(name: string): SuiWalletStandard {
+  const wallet = getInstance(name);
+
   if (!wallet) {
     throw new Error(
       "We couldn't find the Sui instance on your wallet. It may be fixed by refreshing the page."
     );
   }
 
-  return wallet as SuiWalletStandard;
+  return wallet;
 }

package/src/namespaces/utxo/mod.ts

@@ -3,7 +3,6 @@ export * as after from './after.js';
 export * as and from './and.js';
 export * as before from './before.js';
 export * as builders from './builders.js';
-export * as chains from './chains.js';
 
 export type { ProviderAPI, UtxoActions } from './types.js';
 export { CAIP_NAMESPACE, CAIP_BITCOIN_CHAIN_ID } from './constants.js';

package/dist/namespaces/evm/chains.d.ts

@@ -1,5 +0,0 @@
-import type { Chain } from '../common/types.js';
-export declare const ethereum: Chain;
-export declare const polygon: Chain;
-export declare const base: Chain;
-//# sourceMappingURL=chains.d.ts.map

package/dist/namespaces/evm/chains.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"chains.d.ts","sourceRoot":"","sources":["../../../src/namespaces/evm/chains.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEhD,eAAO,MAAM,QAAQ,EAAE,KAGtB,CAAC;AACF,eAAO,MAAM,OAAO,EAAE,KAGrB,CAAC;AACF,eAAO,MAAM,IAAI,EAAE,KAGlB,CAAC"}

package/dist/namespaces/solana/chains.d.ts

@@ -1,3 +0,0 @@
-import type { Chain } from '../common/types.js';
-export declare const solana: Chain;
-//# sourceMappingURL=chains.d.ts.map

package/dist/namespaces/solana/chains.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"chains.d.ts","sourceRoot":"","sources":["../../../src/namespaces/solana/chains.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEhD,eAAO,MAAM,MAAM,EAAE,KAGpB,CAAC"}

package/dist/namespaces/sui/chains.d.ts

@@ -1,3 +0,0 @@
-import type { Chain } from '../common/types.js';
-export declare const sui: Chain;
-//# sourceMappingURL=chains.d.ts.map

package/dist/namespaces/sui/chains.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"chains.d.ts","sourceRoot":"","sources":["../../../src/namespaces/sui/chains.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEhD,eAAO,MAAM,GAAG,EAAE,KAGjB,CAAC"}

package/dist/namespaces/utxo/chains.d.ts

@@ -1,3 +0,0 @@
-import type { Chain } from '../common/types.js';
-export declare const bitcoin: Chain;
-//# sourceMappingURL=chains.d.ts.map

package/dist/namespaces/utxo/chains.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"chains.d.ts","sourceRoot":"","sources":["../../../src/namespaces/utxo/chains.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEhD,eAAO,MAAM,OAAO,EAAE,KAGrB,CAAC"}

package/src/namespaces/evm/chains.ts

@@ -1,14 +0,0 @@
-import type { Chain } from '../common/types.js';
-
-export const ethereum: Chain = {
-  name: 'ETH',
-  logo: 'https://raw.githubusercontent.com/rango-exchange/assets/main/blockchains/ETH/icon.svg',
-};
-export const polygon: Chain = {
-  name: 'POLYGON',
-  logo: 'https://raw.githubusercontent.com/rango-exchange/assets/main/blockchains/POLYGON/icon.svg',
-};
-export const base: Chain = {
-  name: 'BASE',
-  logo: 'https://raw.githubusercontent.com/rango-exchange/assets/main/blockchains/BASE/icon.svg',
-};

package/src/namespaces/solana/chains.ts

@@ -1,6 +0,0 @@
-import type { Chain } from '../common/types.js';
-
-export const solana: Chain = {
-  name: 'SOLANA',
-  logo: 'https://raw.githubusercontent.com/rango-exchange/assets/main/blockchains/SOLANA/icon.svg',
-};

package/src/namespaces/sui/chains.ts

@@ -1,6 +0,0 @@
-import type { Chain } from '../common/types.js';
-
-export const sui: Chain = {
-  name: 'SUI',
-  logo: 'https://raw.githubusercontent.com/rango-exchange/assets/main/blockchains/SUI/icon.svg',
-};

package/src/namespaces/utxo/chains.ts

@@ -1,6 +0,0 @@
-import type { Chain } from '../common/types.js';
-
-export const bitcoin: Chain = {
-  name: 'BTC',
-  logo: 'https://raw.githubusercontent.com/rango-exchange/assets/main/blockchains/BTC/icon.svg',
-};