@dynamic-labs/multi-wallet 0.17.0-RC.5 → 0.17.0-RC.7

package/src/utils/walletConnect.js

@@ -1,26 +1,27 @@
+import { __rest } from 'tslib';
 import { useWalletBook } from '@dynamic-labs/wallet-book';
 import WalletConnect from '../wallets/walletConnect/walletConnect.js';
 import WalletConnectV2 from '../wallets/walletConnect/walletConnectV2.js';
 
-const fetchWalletConnectWallets = (evmNetworks, isV2Enabled) => Object.values(useWalletBook().wallets)
-    .filter((wallet) => wallet.walletConnect)
-    .map((wallet) => {
-    var _a;
-    const { shortName } = wallet;
-    const name = shortName || wallet.name;
-    let connector;
-    // justification: we filtered out null/undefined above
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    if (isV2Enabled && ((_a = wallet.walletConnect.sdks) === null || _a === void 0 ? void 0 : _a.includes('sign_v2'))) {
-        connector = new WalletConnectV2({
-            evmNetworks,
-            walletName: name,
-        });
-    }
-    else {
-        connector = new WalletConnect({ evmNetworks, walletName: name });
-    }
-    return connector;
-});
+const fetchWalletConnectWallets = (_a) => {
+    var { isV2Enabled } = _a, props = __rest(_a, ["isV2Enabled"]);
+    return Object.values(useWalletBook().wallets)
+        .filter((wallet) => wallet.walletConnect)
+        .map((wallet) => {
+        var _a;
+        const { shortName } = wallet;
+        const name = shortName || wallet.name;
+        let connector;
+        // justification: we filtered out null/undefined above
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        if (isV2Enabled && ((_a = wallet.walletConnect.sdks) === null || _a === void 0 ? void 0 : _a.includes('sign_v2'))) {
+            connector = new WalletConnectV2(Object.assign(Object.assign({}, props), { walletName: name }));
+        }
+        else {
+            connector = new WalletConnect(Object.assign(Object.assign({}, props), { walletName: name }));
+        }
+        return connector;
+    });
+};
 
 export { fetchWalletConnectWallets };

package/src/wallets/clients/coinbase/types.d.ts

@@ -1,9 +1,9 @@
 import { CoinbaseWalletProvider } from '@coinbase/wallet-sdk';
-import { EvmNetwork } from '../../ethereum/evm-network';
+import { GenericNetwork } from '@dynamic-labs/types';
 export type GetCoinbaseProviderOpts = {
     appLogoUrl?: string;
     appName?: string;
-    evmNetworks?: EvmNetwork[];
+    evmNetworks?: GenericNetwork[];
 };
 export type CoinbaseProviderHandlerOpts = {
     onDisconnect(): Promise<void>;

package/src/wallets/clients/walletConnect/walletConnect.cjs

@@ -101,19 +101,14 @@ const getDeepLink = (uri, metadata, { removeWCUri = false, } = {}) => {
 };
 const createSession = (client) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     return new Promise((resolve, reject) => {
-        try {
-            client.on('connect', (error, payload) => tslib.__awaiter(void 0, void 0, void 0, function* () {
-                if (error)
-                    throw error;
-                resolve(payload);
-            }));
-            client.on('disconnect', (error, payload) => {
-                throw error || payload.params[0].message;
-            });
-        }
-        catch (e) {
-            reject(e);
-        }
+        client.on('connect', (error, payload) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+            if (error)
+                throw error;
+            resolve(payload);
+        }));
+        client.on('disconnect', (error, payload) => {
+            reject(error || payload.params[0].message);
+        });
     });
 });
 const useDeepLink = (metadata, wcClient, opts) => {

package/src/wallets/clients/walletConnect/walletConnect.js

@@ -93,19 +93,14 @@ const getDeepLink = (uri, metadata, { removeWCUri = false, } = {}) => {
 };
 const createSession = (client) => __awaiter(void 0, void 0, void 0, function* () {
     return new Promise((resolve, reject) => {
-        try {
-            client.on('connect', (error, payload) => __awaiter(void 0, void 0, void 0, function* () {
-                if (error)
-                    throw error;
-                resolve(payload);
-            }));
-            client.on('disconnect', (error, payload) => {
-                throw error || payload.params[0].message;
-            });
-        }
-        catch (e) {
-            reject(e);
-        }
+        client.on('connect', (error, payload) => __awaiter(void 0, void 0, void 0, function* () {
+            if (error)
+                throw error;
+            resolve(payload);
+        }));
+        client.on('disconnect', (error, payload) => {
+            reject(error || payload.params[0].message);
+        });
     });
 });
 const useDeepLink = (metadata, wcClient, opts) => {

package/src/wallets/cosmos/KeplrWalletConnect.cjs

@@ -3,6 +3,7 @@
 var tslib = require('tslib');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletBook = require('@dynamic-labs/wallet-book');
+var utils = require('@dynamic-labs/utils');
 var walletConnect = require('../clients/walletConnect/walletConnect.cjs');
 var isMobile = require('../../utils/isMobile.cjs');
 var logger = require('../../utils/logger.cjs');
@@ -11,7 +12,6 @@ var wcClient = require('./wcClient.cjs');
 const DYNAMIC_KEPLR_NETWORK_ID = 'dynamic_keplr_wc_network_id';
 class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
     constructor({ evmNetworks }) {
-        var _a;
         super();
         this.name = 'Keplr';
         this.isWalletConnect = true;
@@ -29,22 +29,23 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
         };
         this.supportedChains = ['COSMOS'];
         this.connectedChain = 'COSMOS';
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = utils.parseEvmNetworks(evmNetworks);
         const persistedNetworkId = localStorage.getItem(DYNAMIC_KEPLR_NETWORK_ID);
         if (persistedNetworkId) {
             this.selectedNetworkId = Number(persistedNetworkId);
         }
         else {
-            this.selectedNetworkId = ((_a = evmNetworks[0]) === null || _a === void 0 ? void 0 : _a.chainId) || 401;
+            this.selectedNetworkId =
+                (evmNetworks[0] && utils.parseChainId(evmNetworks[0].chainId)) || 401;
         }
     }
     get evmNetwork() {
         var _a;
-        return (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => network.chainId === this.selectedNetworkId);
+        return (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => utils.parseChainId(network.chainId) === this.selectedNetworkId);
     }
     get selectedNetwork() {
         var _a;
-        return (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => network.networkId === this.selectedNetworkId);
+        return (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => utils.parseChainId(network.networkId) === this.selectedNetworkId);
     }
     get lcdUrl() {
         var _a;
@@ -58,7 +59,7 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
         if (!this.selectedNetwork) {
             return 'osmosis-1';
         }
-        return this.chainIdMap[this.selectedNetwork.chainId];
+        return this.chainIdMap[utils.parseChainId(this.selectedNetwork.chainId)];
     }
     getProvider() {
         if (!this._keplrInstance) {

package/src/wallets/cosmos/KeplrWalletConnect.d.ts

@@ -1,12 +1,12 @@
 import Client from '@walletconnect/client';
 import { OfflineAminoSigner } from '@keplr-wallet/types';
 import { Chain, FetchPublicAddressOpts, WalletConnectorBase, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
-import { EvmNetwork } from '../ethereum/evm-network';
+import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
 import { SwitchNetworkOps } from '../ethereum/EthWalletConnector';
 import { KeplrWalletConnectV1 } from './wcClient';
 declare class KeplrWalletConnect extends WalletConnectorBase {
     constructor({ evmNetworks }: {
-        evmNetworks: EvmNetwork[];
+        evmNetworks: GenericNetwork[];
     });
     name: string;
     isWalletConnect: boolean;
@@ -22,7 +22,7 @@ declare class KeplrWalletConnect extends WalletConnectorBase {
     connectedChain: Chain;
     _keplrInstance: KeplrWalletConnectV1 | undefined;
     get evmNetwork(): EvmNetwork | undefined;
-    get selectedNetwork(): EvmNetwork | undefined;
+    get selectedNetwork(): GenericNetwork | undefined;
     get lcdUrl(): string | undefined;
     get denom(): string | undefined;
     get chainId(): string;

package/src/wallets/cosmos/KeplrWalletConnect.js

@@ -1,6 +1,7 @@
 import { __awaiter } from 'tslib';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { parseEvmNetworks, parseChainId } from '@dynamic-labs/utils';
 import { initClient, fetchWalletConnectCosmosPublicAddress, killWalletConnectSession, getDeepLink, setupWalletConnectEventListeners, teardownWalletConnectEventListeners } from '../clients/walletConnect/walletConnect.js';
 import { isMobile, isIOS } from '../../utils/isMobile.js';
 import { logger } from '../../utils/logger.js';
@@ -9,7 +10,6 @@ import { KeplrWalletConnectV1 } from './wcClient.js';
 const DYNAMIC_KEPLR_NETWORK_ID = 'dynamic_keplr_wc_network_id';
 class KeplrWalletConnect extends WalletConnectorBase {
     constructor({ evmNetworks }) {
-        var _a;
         super();
         this.name = 'Keplr';
         this.isWalletConnect = true;
@@ -27,22 +27,23 @@ class KeplrWalletConnect extends WalletConnectorBase {
         };
         this.supportedChains = ['COSMOS'];
         this.connectedChain = 'COSMOS';
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = parseEvmNetworks(evmNetworks);
         const persistedNetworkId = localStorage.getItem(DYNAMIC_KEPLR_NETWORK_ID);
         if (persistedNetworkId) {
             this.selectedNetworkId = Number(persistedNetworkId);
         }
         else {
-            this.selectedNetworkId = ((_a = evmNetworks[0]) === null || _a === void 0 ? void 0 : _a.chainId) || 401;
+            this.selectedNetworkId =
+                (evmNetworks[0] && parseChainId(evmNetworks[0].chainId)) || 401;
         }
     }
     get evmNetwork() {
         var _a;
-        return (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => network.chainId === this.selectedNetworkId);
+        return (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => parseChainId(network.chainId) === this.selectedNetworkId);
     }
     get selectedNetwork() {
         var _a;
-        return (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => network.networkId === this.selectedNetworkId);
+        return (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => parseChainId(network.networkId) === this.selectedNetworkId);
     }
     get lcdUrl() {
         var _a;
@@ -56,7 +57,7 @@ class KeplrWalletConnect extends WalletConnectorBase {
         if (!this.selectedNetwork) {
             return 'osmosis-1';
         }
-        return this.chainIdMap[this.selectedNetwork.chainId];
+        return this.chainIdMap[parseChainId(this.selectedNetwork.chainId)];
     }
     getProvider() {
         if (!this._keplrInstance) {

package/src/wallets/cosmos/KeplrWalletConnector.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
 var logger = require('../../utils/logger.cjs');
 
 const DYNAMIC_KEPLR_NETWORK_ID = 'dynamic_keplr_network_id';
@@ -11,7 +12,7 @@ class KeplrWalletConnector extends walletConnectorCore.WalletConnectorBase {
     constructor({ evmNetworks }) {
         super();
         this.switchNetworkOnlyFromWallet = true;
-        this.selectedNetworkId = 401;
+        this._selectedNetworkId = 401;
         this.name = 'Keplr';
         this.connectedChain = 'COSMOS';
         this.supportedChains = ['COSMOS'];
@@ -20,13 +21,19 @@ class KeplrWalletConnector extends walletConnectorCore.WalletConnectorBase {
             402: 'axelar-dojo-1',
             403: 'osmosis-1',
         };
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = utils.parseEvmNetworks(evmNetworks);
         this._handleAccountChange = this._handleAccountChange.bind(this);
         const persistedNetworkId = localStorage.getItem(DYNAMIC_KEPLR_NETWORK_ID);
         if (persistedNetworkId) {
             this.selectedNetworkId = Number(persistedNetworkId);
         }
     }
+    get selectedNetworkId() {
+        return this._selectedNetworkId;
+    }
+    set selectedNetworkId(networkId) {
+        this._selectedNetworkId = utils.parseChainId(networkId);
+    }
     getWeb3Provider() {
         return this.keplr;
     }

package/src/wallets/cosmos/KeplrWalletConnector.d.ts

@@ -1,7 +1,7 @@
 import { Keplr as KeplrWallet } from '@keplr-wallet/types';
 import { Chain, WalletConnectorBase, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
 import { SwitchNetworkOps } from '../ethereum/EthWalletConnector';
-import { EvmNetwork } from '../ethereum/evm-network';
 export interface IFetchBalanceResponse {
     balances: IFetchBalanceBalance[];
     pagination: IFetchBalancePagination;
@@ -17,14 +17,16 @@ export interface IFetchBalancePagination {
 export declare class KeplrWalletConnector extends WalletConnectorBase {
     evmNetworks: EvmNetwork[];
     switchNetworkOnlyFromWallet: boolean;
-    selectedNetworkId: number;
+    private _selectedNetworkId;
     name: string;
     connectedChain: Chain;
     supportedChains: Chain[];
     chainIdMap: Record<number, string>;
     constructor({ evmNetworks }: {
-        evmNetworks: EvmNetwork[];
+        evmNetworks: GenericNetwork[];
     });
+    get selectedNetworkId(): number;
+    set selectedNetworkId(networkId: number);
     getWeb3Provider(): KeplrWallet;
     getDeepLink(): string | undefined;
     get selectedNetwork(): EvmNetwork | undefined;

package/src/wallets/cosmos/KeplrWalletConnector.js

@@ -1,5 +1,6 @@
 import { __awaiter } from 'tslib';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { parseEvmNetworks, parseChainId } from '@dynamic-labs/utils';
 import { logger } from '../../utils/logger.js';
 
 const DYNAMIC_KEPLR_NETWORK_ID = 'dynamic_keplr_network_id';
@@ -7,7 +8,7 @@ class KeplrWalletConnector extends WalletConnectorBase {
     constructor({ evmNetworks }) {
         super();
         this.switchNetworkOnlyFromWallet = true;
-        this.selectedNetworkId = 401;
+        this._selectedNetworkId = 401;
         this.name = 'Keplr';
         this.connectedChain = 'COSMOS';
         this.supportedChains = ['COSMOS'];
@@ -16,13 +17,19 @@ class KeplrWalletConnector extends WalletConnectorBase {
             402: 'axelar-dojo-1',
             403: 'osmosis-1',
         };
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = parseEvmNetworks(evmNetworks);
         this._handleAccountChange = this._handleAccountChange.bind(this);
         const persistedNetworkId = localStorage.getItem(DYNAMIC_KEPLR_NETWORK_ID);
         if (persistedNetworkId) {
             this.selectedNetworkId = Number(persistedNetworkId);
         }
     }
+    get selectedNetworkId() {
+        return this._selectedNetworkId;
+    }
+    set selectedNetworkId(networkId) {
+        this._selectedNetworkId = parseChainId(networkId);
+    }
     getWeb3Provider() {
         return this.keplr;
     }

package/src/wallets/cosmos/getKeplrConnector.d.ts

@@ -1,6 +1,6 @@
-import { EvmNetwork } from '../ethereum/evm-network';
+import { GenericNetwork } from '@dynamic-labs/types';
 import { KeplrWalletConnector } from './KeplrWalletConnector';
 import KeplrWalletConnect from './KeplrWalletConnect';
 export declare const getKeplerConnector: ({ evmNetworks, }: {
-    evmNetworks: EvmNetwork[];
+    evmNetworks: GenericNetwork[];
 }) => KeplrWalletConnector | KeplrWalletConnect;

package/src/wallets/ethereum/BloctoEvm.cjs

@@ -12,12 +12,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var BloctoSDK__default = /*#__PURE__*/_interopDefaultLegacy(BloctoSDK);
 
 class BloctoEvm extends EthWalletConnector.EthWalletConnector {
-    constructor({ evmNetworks }) {
+    constructor(props) {
         var _a, _b;
-        // Taken from : https://docs.blocto.app/blocto-sdk/javascript-sdk/evm-sdk/provider
-        const BLOCTO_SUPPORTED_CHAIN_IDS = [1, 4, 56, 97, 137, 80001, 43114, 43113];
-        const bloctoSupportedNetworks = evmNetworks.filter((n) => BLOCTO_SUPPORTED_CHAIN_IDS.includes(n.chainId));
-        super({ evmNetworks: bloctoSupportedNetworks });
+        super(props);
         this.LOCAL_STORAGE_KEY = 'dynamic_blocto_evm_chain_id';
         this.name = 'bloctoevm';
         this.canConnectViaCustodialService = true;
@@ -25,10 +22,13 @@ class BloctoEvm extends EthWalletConnector.EthWalletConnector {
         this.supportedChains = ['EVM', 'ETH'];
         this.ethProviderHelper = new ethProviderHelper.EthProviderHelper();
         this.supportsNetworkSwitching = () => false;
+        // Taken from : https://docs.blocto.app/blocto-sdk/javascript-sdk/evm-sdk/provider
+        const BLOCTO_SUPPORTED_CHAIN_IDS = [1, 4, 56, 97, 137, 80001, 43114, 43113];
+        this.evmNetworks = this.evmNetworks.filter((n) => BLOCTO_SUPPORTED_CHAIN_IDS.includes(n.chainId));
         this.chainId =
             Number(localStorage.getItem(this.LOCAL_STORAGE_KEY)) ||
-                ((_a = bloctoSupportedNetworks.find((n) => n.chainId === 137)) === null || _a === void 0 ? void 0 : _a.chainId) ||
-                ((_b = bloctoSupportedNetworks[0]) === null || _b === void 0 ? void 0 : _b.chainId);
+                ((_a = this.evmNetworks.find((n) => n.chainId === 137)) === null || _a === void 0 ? void 0 : _a.chainId) ||
+                ((_b = this.evmNetworks[0]) === null || _b === void 0 ? void 0 : _b.chainId);
     }
     getClient() {
         if (!this.client) {

package/src/wallets/ethereum/BloctoEvm.d.ts

@@ -1,7 +1,6 @@
 import { ethers } from 'ethers';
 import { Chain } from '@dynamic-labs/wallet-connector-core';
-import { EvmNetwork } from './evm-network';
-import { EthWalletConnector } from './EthWalletConnector';
+import { EthWalletConnector, EthWalletConnectorOpts } from './EthWalletConnector';
 import { EthProviderHelper } from './ethProviderHelper';
 declare class BloctoEvm extends EthWalletConnector {
     LOCAL_STORAGE_KEY: string;
@@ -13,9 +12,7 @@ declare class BloctoEvm extends EthWalletConnector {
     chainId: number;
     ethProviderHelper: EthProviderHelper;
     supportsNetworkSwitching: () => boolean;
-    constructor({ evmNetworks }: {
-        evmNetworks: EvmNetwork[];
-    });
+    constructor(props: EthWalletConnectorOpts);
     private getClient;
     getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     fetchPublicAddress(): Promise<string | undefined>;

package/src/wallets/ethereum/BloctoEvm.js

@@ -6,12 +6,9 @@ import { EthWalletConnector } from './EthWalletConnector.js';
 import { EthProviderHelper } from './ethProviderHelper.js';
 
 class BloctoEvm extends EthWalletConnector {
-    constructor({ evmNetworks }) {
+    constructor(props) {
         var _a, _b;
-        // Taken from : https://docs.blocto.app/blocto-sdk/javascript-sdk/evm-sdk/provider
-        const BLOCTO_SUPPORTED_CHAIN_IDS = [1, 4, 56, 97, 137, 80001, 43114, 43113];
-        const bloctoSupportedNetworks = evmNetworks.filter((n) => BLOCTO_SUPPORTED_CHAIN_IDS.includes(n.chainId));
-        super({ evmNetworks: bloctoSupportedNetworks });
+        super(props);
         this.LOCAL_STORAGE_KEY = 'dynamic_blocto_evm_chain_id';
         this.name = 'bloctoevm';
         this.canConnectViaCustodialService = true;
@@ -19,10 +16,13 @@ class BloctoEvm extends EthWalletConnector {
         this.supportedChains = ['EVM', 'ETH'];
         this.ethProviderHelper = new EthProviderHelper();
         this.supportsNetworkSwitching = () => false;
+        // Taken from : https://docs.blocto.app/blocto-sdk/javascript-sdk/evm-sdk/provider
+        const BLOCTO_SUPPORTED_CHAIN_IDS = [1, 4, 56, 97, 137, 80001, 43114, 43113];
+        this.evmNetworks = this.evmNetworks.filter((n) => BLOCTO_SUPPORTED_CHAIN_IDS.includes(n.chainId));
         this.chainId =
             Number(localStorage.getItem(this.LOCAL_STORAGE_KEY)) ||
-                ((_a = bloctoSupportedNetworks.find((n) => n.chainId === 137)) === null || _a === void 0 ? void 0 : _a.chainId) ||
-                ((_b = bloctoSupportedNetworks[0]) === null || _b === void 0 ? void 0 : _b.chainId);
+                ((_a = this.evmNetworks.find((n) => n.chainId === 137)) === null || _a === void 0 ? void 0 : _a.chainId) ||
+                ((_b = this.evmNetworks[0]) === null || _b === void 0 ? void 0 : _b.chainId);
     }
     getClient() {
         if (!this.client) {

package/src/wallets/ethereum/EthWalletConnector.cjs

@@ -5,15 +5,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var ethers = require('ethers');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
+var rpcProviders = require('@dynamic-labs/rpc-providers');
 var errors = require('../../errors.cjs');
-var rpcProviders = require('../../rpcProviders.cjs');
 var evmNetwork = require('./evm-network.cjs');
 
 class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
     getRpcProvider() {
-        var _a, _b;
+        var _a, _b, _c;
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            const networkId = yield this.getNetwork();
+            const networkId = (_a = (yield this.getNetwork())) !== null && _a !== void 0 ? _a : 1;
             if (this.evmNetworks.length === 0) {
                 return undefined;
             }
@@ -23,13 +24,11 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 solana: [],
                 starknet: undefined,
             };
-            if (!networkId) {
-                return (_a = rpcProviders.getEvmDefaultRpcProvider(configurations)) === null || _a === void 0 ? void 0 : _a.provider;
-            }
-            return (_b = rpcProviders.getEvmRpcProviderByChainId(configurations, networkId)) === null || _b === void 0 ? void 0 : _b.provider;
+            return (_c = (_b = this.chainRpcProviders) === null || _b === void 0 ? void 0 : _b.getEvmProviderByChainId(configurations, networkId)) === null || _c === void 0 ? void 0 : _c.provider;
         });
     }
-    constructor({ evmNetworks }) {
+    constructor({ evmNetworks, chainRpcProviders }) {
+        var _a;
         super();
         this.evmNetworkRpcMap = () => this.evmNetworks.reduce((acc, network) => {
             var _a;
@@ -38,7 +37,24 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 : network.rpcUrls;
             return acc;
         }, {});
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = utils.parseEvmNetworks(evmNetworks);
+        this.chainRpcProviders = chainRpcProviders;
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerChainProviders(rpcProviders.ProviderChain.EVM, (config) => {
+            const rpcProviders = {};
+            if (config === null || config === void 0 ? void 0 : config.evm) {
+                rpcProviders.evm = utils.parseEvmNetworks(config.evm).map((network) => {
+                    var _a;
+                    const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
+                    const provider = new ethers.ethers.providers.JsonRpcProvider(rpcUrl, network.chainId);
+                    return {
+                        chainId: network.chainId,
+                        chainName: network.name,
+                        provider,
+                    };
+                });
+            }
+            return rpcProviders.evm;
+        });
     }
     getNetwork() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
@@ -163,13 +179,13 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
     providerAddNetwork({ network, provider, }) {
         var _a;
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            const { blockExplorerUrls, chainId, nativeCurrency, rpcUrls, chainName } = network;
+            const { blockExplorerUrls, chainId, nativeCurrency, rpcUrls, name } = network;
             try {
                 return yield provider.send('wallet_addEthereumChain', [
                     {
                         blockExplorerUrls,
                         chainId: `0x${chainId.toString(16)}`,
-                        chainName,
+                        chainName: name,
                         nativeCurrency,
                         rpcUrls,
                     },

package/src/wallets/ethereum/EthWalletConnector.d.ts

@@ -1,6 +1,7 @@
 import { ethers } from 'ethers';
 import { NameServiceData, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { EvmNetwork } from './evm-network';
+import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
+import { ChainRpcProviders } from '@dynamic-labs/rpc-providers';
 export type SwitchNetworkOps = {
     networkChainId?: number;
     networkName?: string;
@@ -8,13 +9,15 @@ export type SwitchNetworkOps = {
 type EvmRpcMap = {
     [chainId: number]: string;
 };
+export type EthWalletConnectorOpts = {
+    chainRpcProviders: typeof ChainRpcProviders;
+    evmNetworks: GenericNetwork[];
+};
 export declare abstract class EthWalletConnector extends WalletConnectorBase {
     evmNetworks: EvmNetwork[];
     abstract getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     getRpcProvider(): Promise<ethers.providers.JsonRpcProvider | undefined>;
-    constructor({ evmNetworks }: {
-        evmNetworks: EvmNetwork[];
-    });
+    constructor({ evmNetworks, chainRpcProviders }: EthWalletConnectorOpts);
     getNetwork(): Promise<number | undefined>;
     getNameService(): Promise<NameServiceData | undefined>;
     getSigner(): Promise<ethers.providers.JsonRpcSigner | undefined>;

package/src/wallets/ethereum/EthWalletConnector.js

@@ -1,15 +1,16 @@
 import { __awaiter } from 'tslib';
 import { ethers } from 'ethers';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { parseEvmNetworks } from '@dynamic-labs/utils';
+import { ProviderChain } from '@dynamic-labs/rpc-providers';
 import { DynamicError } from '../../errors.js';
-import { getEvmDefaultRpcProvider, getEvmRpcProviderByChainId } from '../../rpcProviders.js';
 import { findEvmNetwork } from './evm-network.js';
 
 class EthWalletConnector extends WalletConnectorBase {
     getRpcProvider() {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const networkId = yield this.getNetwork();
+            const networkId = (_a = (yield this.getNetwork())) !== null && _a !== void 0 ? _a : 1;
             if (this.evmNetworks.length === 0) {
                 return undefined;
             }
@@ -19,13 +20,11 @@ class EthWalletConnector extends WalletConnectorBase {
                 solana: [],
                 starknet: undefined,
             };
-            if (!networkId) {
-                return (_a = getEvmDefaultRpcProvider(configurations)) === null || _a === void 0 ? void 0 : _a.provider;
-            }
-            return (_b = getEvmRpcProviderByChainId(configurations, networkId)) === null || _b === void 0 ? void 0 : _b.provider;
+            return (_c = (_b = this.chainRpcProviders) === null || _b === void 0 ? void 0 : _b.getEvmProviderByChainId(configurations, networkId)) === null || _c === void 0 ? void 0 : _c.provider;
         });
     }
-    constructor({ evmNetworks }) {
+    constructor({ evmNetworks, chainRpcProviders }) {
+        var _a;
         super();
         this.evmNetworkRpcMap = () => this.evmNetworks.reduce((acc, network) => {
             var _a;
@@ -34,7 +33,24 @@ class EthWalletConnector extends WalletConnectorBase {
                 : network.rpcUrls;
             return acc;
         }, {});
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = parseEvmNetworks(evmNetworks);
+        this.chainRpcProviders = chainRpcProviders;
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerChainProviders(ProviderChain.EVM, (config) => {
+            const rpcProviders = {};
+            if (config === null || config === void 0 ? void 0 : config.evm) {
+                rpcProviders.evm = parseEvmNetworks(config.evm).map((network) => {
+                    var _a;
+                    const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
+                    const provider = new ethers.providers.JsonRpcProvider(rpcUrl, network.chainId);
+                    return {
+                        chainId: network.chainId,
+                        chainName: network.name,
+                        provider,
+                    };
+                });
+            }
+            return rpcProviders.evm;
+        });
     }
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -159,13 +175,13 @@ class EthWalletConnector extends WalletConnectorBase {
     providerAddNetwork({ network, provider, }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { blockExplorerUrls, chainId, nativeCurrency, rpcUrls, chainName } = network;
+            const { blockExplorerUrls, chainId, nativeCurrency, rpcUrls, name } = network;
             try {
                 return yield provider.send('wallet_addEthereumChain', [
                     {
                         blockExplorerUrls,
                         chainId: `0x${chainId.toString(16)}`,
-                        chainName,
+                        chainName: name,
                         nativeCurrency,
                         rpcUrls,
                     },