fix: better typings

Author: arlert-armin

wallets/provider-metamask/src/legacy/index.ts

@@ -20,7 +20,7 @@ import {
 import { evmBlockchains } from 'rango-types';
 
 import signer from '../signer.js';
-import { metamask as metamask_instance, type Provider } from '../utils.js';
+import { metamask as metamask_instance } from '../utils.js';
 
 const WALLET = WalletTypes.META_MASK;
 
@@ -49,7 +49,8 @@ export const subscribe: Subscribe = subscribeToEvm;
 export const switchNetwork: SwitchNetwork = switchNetworkForEvm;
 
 export const canSwitchNetworkTo: CanSwitchNetwork = canSwitchNetworkToEvm;
-
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type Provider = any;
 export const getSigners: (provider: Provider) => Promise<SignerFactory> =
   signer;
 

wallets/provider-metamask/src/signer.ts

@@ -1,4 +1,4 @@
-import type { Provider } from './utils.js';
+import type { Provider } from './types.js';
 import type { SignerFactory } from 'rango-types';
 
 import { LegacyNetworks as Networks } from '@rango-dev/wallets-core/legacy';

wallets/provider-metamask/src/types.ts

@@ -1,3 +1,5 @@
+import type { LegacyNetworks } from '@rango-dev/wallets-core/legacy';
+import type { ProviderAPI as EvmProviderApi } from '@rango-dev/wallets-core/namespaces/evm';
 import type { WalletWithFeatures as StandardWalletWithFeatures } from '@wallet-standard/base';
 
 import {
@@ -15,3 +17,38 @@ export type WalletStandardSolanaInstance = StandardWalletWithFeatures<
     SolanaSignTransactionFeature &
     SolanaSignMessageFeature
 >;
+export type MetamaskEvmProviderApi = EvmProviderApi & {
+  isMetaMask?: boolean;
+  isBraveWallet?: boolean;
+  _events?: boolean;
+  _state?: boolean;
+  isApexWallet?: boolean;
+  isAvalanche?: boolean;
+  isBitKeep?: boolean;
+  isBlockWallet?: boolean;
+  isCoin98?: boolean;
+  isFordefi?: boolean;
+  __XDEFI?: boolean;
+  isMathWallet?: boolean;
+  isOkxWallet?: boolean;
+  isOKExWallet?: boolean;
+  isOneInchIOSWallet?: boolean;
+  isOneInchAndroidWallet?: boolean;
+  isOpera?: boolean;
+  isPortal?: boolean;
+  isRabby?: boolean;
+  isDefiant?: boolean;
+  isTokenPocket?: boolean;
+  isTokenary?: boolean;
+  isZeal?: boolean;
+  isZerion?: boolean;
+  isSafePal?: boolean;
+};
+export type ProviderObject = {
+  [LegacyNetworks.ETHEREUM]: MetamaskEvmProviderApi;
+  [LegacyNetworks.SOLANA]: WalletStandardSolanaInstance;
+};
+export type Provider = Map<
+  keyof ProviderObject,
+  ProviderObject[keyof ProviderObject]
+>;

wallets/provider-metamask/src/utils.ts

@@ -1,4 +1,8 @@
-import type { WalletStandardSolanaInstance } from './types.js';
+import type {
+  MetamaskEvmProviderApi,
+  Provider,
+  WalletStandardSolanaInstance,
+} from './types.js';
 import type { ProviderAPI as EvmProviderApi } from '@rango-dev/wallets-core/namespaces/evm';
 
 import { LegacyNetworks } from '@rango-dev/wallets-core/legacy';
@@ -9,9 +13,6 @@ import {
   WALLET_STANDARD_NAME,
 } from './constants.js';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type Provider = Record<string, any>;
-
 export function metamask(): Provider | null {
   const { ethereum } = window;
   const solana = getSolanaWalletInstance();
@@ -30,7 +31,7 @@ export function metamask(): Provider | null {
 
   return instances;
 }
-function isEthereumMetamaskProvider(ethereum: Provider): boolean {
+function isEthereumMetamaskProvider(ethereum: MetamaskEvmProviderApi): boolean {
   if (!ethereum?.isMetaMask) {
     return false;
   }
@@ -95,9 +96,6 @@ function isEthereumMetamaskProvider(ethereum: Provider): boolean {
   if (ethereum.isZerion) {
     return false;
   }
-  if (ethereum.isPhantom) {
-    return false;
-  }
   if (ethereum.isSafePal) {
     return false;
   }