refactor: improved some types

Author: RyukTheCoder

wallets/core/src/namespaces/evm/types.ts

@@ -10,7 +10,7 @@ export interface EvmActions
     CommonActions {
   connect: (
     chain?: Chain | ChainId,
-    derivationPath?: string
+    options?: ConnectOptions
   ) => Promise<AccountsWithActiveChain>;
   canEagerConnect: () => Promise<boolean>;
 }
@@ -22,4 +22,5 @@ export type Chain = AddEthereumChainParameter;
 
 export type ConnectOptions = {
   switchOrAddNetwork?: (instance: ProviderAPI, chain: ChainId | Chain) => void;
+  derivationPath?: string;
 };

wallets/core/src/namespaces/solana/types.ts

@@ -7,7 +7,7 @@ import type {
 export interface SolanaActions
   extends AutoImplementedActionsByRecommended,
     CommonActions {
-  connect: (network?: unknown, derivationPath?: string) => Promise<Accounts>;
+  connect: (network?: unknown, options?: ConnectOptions) => Promise<Accounts>;
   canEagerConnect: () => Promise<boolean>;
 }
 
@@ -20,3 +20,7 @@ export interface SolanaActions
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type ProviderAPI = Record<string, any>;
+
+export type ConnectOptions = {
+  derivationPath?: string;
+};

wallets/provider-ledger/src/namespaces/evm.ts

@@ -10,7 +10,6 @@ import {
   CAIP_NAMESPACE,
 } from '@rango-dev/wallets-core/namespaces/evm';
 import { CAIP } from '@rango-dev/wallets-core/utils';
-import { ETHEREUM_CHAIN_ID } from '@rango-dev/wallets-shared';
 
 import { WALLET_ID } from '../constants.js';
 import { setDerivationPath } from '../state.js';
@@ -21,12 +20,12 @@ import {
 
 const connect = builders
   .connect()
-  .action(async function (_context, chain, derivationPath) {
-    if (!derivationPath) {
+  .action(async function (_context, _chain, options) {
+    if (!options?.derivationPath) {
       throw new Error('Derivation Path can not be empty.');
     }
 
-    setDerivationPath(derivationPath);
+    setDerivationPath(options.derivationPath);
 
     const result = await getEthereumAccounts();
 
@@ -36,14 +35,14 @@ const connect = builders
           address: account,
           chainId: {
             namespace: CAIP_NAMESPACE,
-            reference: ETHEREUM_CHAIN_ID,
+            reference: result.chainId,
           },
         }) as CaipAccount
     );
 
     return {
       accounts: formatAccounts,
-      network: ETHEREUM_CHAIN_ID,
+      network: result.chainId,
     };
   })
   .or(standardizeAndThrowLedgerError)

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

@@ -6,7 +6,6 @@ import { builders as commonBuilders } from '@rango-dev/wallets-core/namespaces/c
 import {
   builders,
   CAIP_NAMESPACE,
-  CAIP_SOLANA_CHAIN_ID,
 } from '@rango-dev/wallets-core/namespaces/solana';
 import { CAIP } from '@rango-dev/wallets-core/utils';
 
@@ -16,12 +15,12 @@ import { getSolanaAccounts, standardizeAndThrowLedgerError } from '../utils.js';
 
 const connect = builders
   .connect()
-  .action(async function (_context, _chain, derivationPath) {
-    if (!derivationPath) {
+  .action(async function (_context, _chain, options) {
+    if (!options?.derivationPath) {
       throw new Error('Derivation Path can not be empty.');
     }
 
-    setDerivationPath(derivationPath);
+    setDerivationPath(options.derivationPath);
 
     const result = await getSolanaAccounts();
 
@@ -31,7 +30,7 @@ const connect = builders
           address: account,
           chainId: {
             namespace: CAIP_NAMESPACE,
-            reference: CAIP_SOLANA_CHAIN_ID,
+            reference: result.chainId,
           },
         }) as CaipAccount
     );

wallets/provider-ledger/src/utils.ts

@@ -2,6 +2,7 @@ import type Transport from '@ledgerhq/hw-transport';
 
 import { getAltStatusMessage } from '@ledgerhq/errors';
 import { LegacyNetworks } from '@rango-dev/wallets-core/legacy';
+import { CAIP_SOLANA_CHAIN_ID } from '@rango-dev/wallets-core/namespaces/solana';
 import {
   ETHEREUM_CHAIN_ID,
   type ProviderConnectResult,
@@ -100,7 +101,7 @@ export async function getSolanaAccounts(): Promise<ProviderConnectResult> {
 
     return {
       accounts: accounts,
-      chainId: LegacyNetworks.SOLANA,
+      chainId: CAIP_SOLANA_CHAIN_ID,
       derivationPath,
     };
   } catch (error: unknown) {

wallets/react/src/hub/useHubAdapter.ts

@@ -188,7 +188,9 @@ export function useHubAdapter(params: UseAdapterParams): ProviderContext {
            */
           const connectNamespaceProcess = async () =>
             namespace
-              .connect(network, namespaceInput.derivationPath)
+              .connect(network, {
+                derivationPath: namespaceInput.derivationPath,
+              })
               .then<ConnectResult>(transformHubResultToLegacyResult)
               .then((connectResult) => {
                 return {