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

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
+var utils = require('@dynamic-labs/utils');
 
 // these are based off of Magic's EthNetworkName type
 const chainNameToChainIdMap = {
@@ -17,16 +18,16 @@ const chainNameToChainIdMap = {
     sepolia: 11155111,
 };
 class MagicClientNetworkHandler {
-    constructor({ createClient, evmNetworks, config, }) {
-        var _a, _b;
+    constructor({ createClient, evmNetworks, config, defaultChainId, }) {
+        var _a, _b, _c;
         this._clients = {};
         this.evmNetworks = [];
         this._config = config;
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = utils.parseEvmNetworks(evmNetworks);
         this._networkId =
             typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'
                 ? chainNameToChainIdMap[config.network]
-                : (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : 1;
+                : (_c = (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : defaultChainId) !== null && _c !== void 0 ? _c : 1;
         this._createClient = createClient;
     }
     setListeners(listeners) {

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.d.ts

@@ -1,12 +1,12 @@
 import { MagicSDKAdditionalConfiguration, MagicSDKExtensionsOption } from 'magic-sdk';
 import { WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+import { EvmNetwork } from '@dynamic-labs/types';
 import { MagicConnectorProps } from '../MagicWalletConnector';
-import { EvmNetwork } from '../../evm-network';
 export type MagicLinkConfig = Pick<MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>>, 'network' | 'testMode' | 'locale'> & {
     redirectURI?: string;
 };
 type ConfigForNetwork = MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>> | undefined;
-export type MagicClientNetworkHandlerProps<TClient> = Pick<MagicConnectorProps, 'config' | 'evmNetworks'> & {
+export type MagicClientNetworkHandlerProps<TClient> = Pick<MagicConnectorProps, 'config' | 'evmNetworks' | 'defaultChainId'> & {
     createClient: (config: ConfigForNetwork) => TClient;
 };
 export declare class MagicClientNetworkHandler<TClient = unknown> {
@@ -18,7 +18,7 @@ export declare class MagicClientNetworkHandler<TClient = unknown> {
     protected _listeners: WalletEventListeners | undefined;
     evmNetworks: EvmNetwork[];
     protected _createClient: MagicClientNetworkHandlerProps<TClient>['createClient'];
-    constructor({ createClient, evmNetworks, config, }: MagicClientNetworkHandlerProps<TClient>);
+    constructor({ createClient, evmNetworks, config, defaultChainId, }: MagicClientNetworkHandlerProps<TClient>);
     setListeners(listeners: WalletEventListeners | undefined): void;
     onChainChanged(networkChainId: number): void;
     selectNetwork(networkChainId: number): Promise<void>;

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js

@@ -1,4 +1,5 @@
 import { __awaiter } from 'tslib';
+import { parseEvmNetworks } from '@dynamic-labs/utils';
 
 // these are based off of Magic's EthNetworkName type
 const chainNameToChainIdMap = {
@@ -13,16 +14,16 @@ const chainNameToChainIdMap = {
     sepolia: 11155111,
 };
 class MagicClientNetworkHandler {
-    constructor({ createClient, evmNetworks, config, }) {
-        var _a, _b;
+    constructor({ createClient, evmNetworks, config, defaultChainId, }) {
+        var _a, _b, _c;
         this._clients = {};
         this.evmNetworks = [];
         this._config = config;
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = parseEvmNetworks(evmNetworks);
         this._networkId =
             typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'
                 ? chainNameToChainIdMap[config.network]
-                : (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : 1;
+                : (_c = (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : defaultChainId) !== null && _c !== void 0 ? _c : 1;
         this._createClient = createClient;
     }
     setListeners(listeners) {

package/src/wallets/ethereum/MagicConnector/MagicSocialWalletConnector/MagicSocialWalletConnector.cjs

@@ -16,6 +16,7 @@ class MagicSocialWalletConnector extends MagicWalletConnector.MagicWalletConnect
         this._magicClient = new MagicClientNetworkHandler.MagicClientNetworkHandler({
             config: opts.config,
             createClient: (config) => new magicSdk.Magic(opts.apiKey, Object.assign(Object.assign({}, config), { extensions: [new oauth.OAuthExtension()] })),
+            defaultChainId: opts.defaultChainId,
             evmNetworks: opts.evmNetworks,
         });
     }

package/src/wallets/ethereum/MagicConnector/MagicSocialWalletConnector/MagicSocialWalletConnector.js

@@ -12,6 +12,7 @@ class MagicSocialWalletConnector extends MagicWalletConnector {
         this._magicClient = new MagicClientNetworkHandler({
             config: opts.config,
             createClient: (config) => new Magic(opts.apiKey, Object.assign(Object.assign({}, config), { extensions: [new OAuthExtension()] })),
+            defaultChainId: opts.defaultChainId,
             evmNetworks: opts.evmNetworks,
         });
     }

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.cjs

@@ -6,6 +6,7 @@ var tslib = require('tslib');
 var magicSdk = require('magic-sdk');
 var ethers = require('ethers');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
 var errors = require('../../../../errors.cjs');
 var logger = require('../../../../utils/logger.cjs');
 var assignConfirmationScreenToProvider = require('../../../../utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.cjs');
@@ -17,7 +18,7 @@ class MagicWalletConnector extends walletConnectorCore.WalletConnectorBase {
     get key() {
         return 'magiclink';
     }
-    constructor({ apiKey, walletUiUtils, evmNetworks, config, }) {
+    constructor({ apiKey, walletUiUtils, evmNetworks, config, defaultChainId, }) {
         super();
         this.canConnectViaCustodialService = true;
         this.connectedChain = 'EVM';
@@ -26,9 +27,10 @@ class MagicWalletConnector extends walletConnectorCore.WalletConnectorBase {
         this._magicClient = new MagicClientNetworkHandler.MagicClientNetworkHandler({
             config,
             createClient: (config) => new magicSdk.Magic(apiKey, config),
+            defaultChainId,
             evmNetworks,
         });
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = utils.parseEvmNetworks(evmNetworks);
         this._walletUiUtils = walletUiUtils;
     }
     getDeepLink() {

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.d.ts

@@ -2,14 +2,15 @@ import { LoginWithMagicLinkEvents, Magic, MagicUserMetadata, PromiEvent } from '
 import { ethers } from 'ethers';
 import { OAuthExtension, OAuthProvider } from '@magic-ext/oauth';
 import { Chain, WalletConnectorBase, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
 import { WalletUiUtils } from '../../../../types';
 import { CancellablePromise } from '../../../../utils/CancellablePromise';
 import { MagicLinkConfig, MagicClientNetworkHandler } from '../MagicClientNetworkHandler';
-import { EvmNetwork } from './../../evm-network';
 export type MagicConnectorProps = {
     apiKey: string;
     config?: MagicLinkConfig;
-    evmNetworks: EvmNetwork[];
+    defaultChainId?: number;
+    evmNetworks: GenericNetwork[];
     walletUiUtils: WalletUiUtils;
 };
 export type MagicPromiEvent = PromiEvent<string | null, LoginWithMagicLinkEvents & {
@@ -28,7 +29,7 @@ export declare abstract class MagicWalletConnector extends WalletConnectorBase {
     _listeners: WalletEventListeners | undefined;
     _currentAuthCancellablePromise: CancellablePromise<MagicPromiEvent | undefined> | undefined;
     protected _magicClient: MagicClientNetworkHandler<Magic | Magic<OAuthExtension[]>>;
-    constructor({ apiKey, walletUiUtils, evmNetworks, config, }: MagicConnectorProps);
+    constructor({ apiKey, walletUiUtils, evmNetworks, config, defaultChainId, }: MagicConnectorProps);
     abstract loginWithMagic(provider?: OAuthProvider): Promise<MagicPromiEvent | undefined>;
     getDeepLink(): string | undefined;
     connect(provider?: OAuthProvider): Promise<void>;

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.js

@@ -2,6 +2,7 @@ import { __awaiter } from 'tslib';
 import { Magic } from 'magic-sdk';
 import { ethers } from 'ethers';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { parseEvmNetworks } from '@dynamic-labs/utils';
 import { DynamicError } from '../../../../errors.js';
 import { logger } from '../../../../utils/logger.js';
 import { assignConfirmationScreenToProvider } from '../../../../utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.js';
@@ -13,7 +14,7 @@ class MagicWalletConnector extends WalletConnectorBase {
     get key() {
         return 'magiclink';
     }
-    constructor({ apiKey, walletUiUtils, evmNetworks, config, }) {
+    constructor({ apiKey, walletUiUtils, evmNetworks, config, defaultChainId, }) {
         super();
         this.canConnectViaCustodialService = true;
         this.connectedChain = 'EVM';
@@ -22,9 +23,10 @@ class MagicWalletConnector extends WalletConnectorBase {
         this._magicClient = new MagicClientNetworkHandler({
             config,
             createClient: (config) => new Magic(apiKey, config),
+            defaultChainId,
             evmNetworks,
         });
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = parseEvmNetworks(evmNetworks);
         this._walletUiUtils = walletUiUtils;
     }
     getDeepLink() {

package/src/wallets/ethereum/coinbase.cjs

@@ -7,8 +7,9 @@ var ethProviderHelper = require('./ethProviderHelper.cjs');
 var EthWalletConnector = require('./EthWalletConnector.cjs');
 
 class Coinbase extends EthWalletConnector.EthWalletConnector {
-    constructor({ appName, appLogoUrl, evmNetworks, }) {
-        super({ evmNetworks });
+    constructor(_a) {
+        var { appName, appLogoUrl, evmNetworks } = _a, props = tslib.__rest(_a, ["appName", "appLogoUrl", "evmNetworks"]);
+        super(Object.assign({ evmNetworks }, props));
         this.name = 'Coinbase';
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';

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

@@ -1,8 +1,11 @@
 import { ethers } from 'ethers';
 import { Chain, FetchPublicAddressOpts, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { EthProviderHelper } from './ethProviderHelper';
-import { EthWalletConnector } from './EthWalletConnector';
-import { EvmNetwork } from './evm-network';
+import { EthWalletConnector, EthWalletConnectorOpts } from './EthWalletConnector';
+type CoinbaseOpts = EthWalletConnectorOpts & {
+    appLogoUrl?: string;
+    appName?: string;
+};
 declare class Coinbase extends EthWalletConnector {
     name: string;
     supportedChains: Chain[];
@@ -10,11 +13,7 @@ declare class Coinbase extends EthWalletConnector {
     canConnectViaQrCode: boolean;
     ethProviderHelper: EthProviderHelper;
     private coinbaseProviderOpts;
-    constructor({ appName, appLogoUrl, evmNetworks, }: {
-        appLogoUrl?: string;
-        appName?: string;
-        evmNetworks: EvmNetwork[];
-    });
+    constructor({ appName, appLogoUrl, evmNetworks, ...props }: CoinbaseOpts);
     setupEventListeners(listeners: WalletEventListeners): () => void;
     teardownEventListeners(): void;
     getWeb3Provider(): ethers.providers.Web3Provider | undefined;

package/src/wallets/ethereum/coinbase.js

@@ -1,12 +1,13 @@
-import { __awaiter } from 'tslib';
+import { __rest, __awaiter } from 'tslib';
 import { ethers } from 'ethers';
 import { getCoinbaseProvider, fetchPublicAddress, signMessage, killCoinbaseSession } from '../clients/coinbase/coinbase.js';
 import { EthProviderHelper } from './ethProviderHelper.js';
 import { EthWalletConnector } from './EthWalletConnector.js';
 
 class Coinbase extends EthWalletConnector {
-    constructor({ appName, appLogoUrl, evmNetworks, }) {
-        super({ evmNetworks });
+    constructor(_a) {
+        var { appName, appLogoUrl, evmNetworks } = _a, props = __rest(_a, ["appName", "appLogoUrl", "evmNetworks"]);
+        super(Object.assign({ evmNetworks }, props));
         this.name = 'Coinbase';
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';

package/src/wallets/ethereum/evm-network.cjs

@@ -7,13 +7,13 @@ const findEvmNetwork = ({ chainId, name, networks, }) => {
         return undefined;
     }
     if (chainId && name) {
-        return networks.find((network) => network.chainId === chainId && network.chainName === name);
+        return networks.find((network) => network.chainId === chainId && network.name === name);
     }
     else if (chainId) {
         return networks.find((network) => network.chainId === chainId);
     }
     else {
-        return networks.find((network) => network.chainName === name);
+        return networks.find((network) => network.name === name);
     }
 };
 

package/src/wallets/ethereum/evm-network.d.ts

@@ -1,20 +1,4 @@
-export type EvmNetwork = {
-    blockExplorerUrls?: string[];
-    chainId: number;
-    chainName: string;
-    iconUrls?: string[];
-    lcdUrl?: string;
-    nativeCurrency: {
-        decimals: number;
-        denom?: string;
-        name: string;
-        symbol: string;
-    };
-    networkId: number;
-    privateCustomerRpcUrls?: string[];
-    rpcUrls: string[];
-    vanityName?: string;
-};
+import { EvmNetwork } from '@dynamic-labs/types';
 export declare const findEvmNetwork: ({ chainId, name, networks, }: {
     chainId?: number | undefined;
     name?: string | undefined;

package/src/wallets/ethereum/evm-network.js

@@ -3,13 +3,13 @@ const findEvmNetwork = ({ chainId, name, networks, }) => {
         return undefined;
     }
     if (chainId && name) {
-        return networks.find((network) => network.chainId === chainId && network.chainName === name);
+        return networks.find((network) => network.chainId === chainId && network.name === name);
     }
     else if (chainId) {
         return networks.find((network) => network.chainId === chainId);
     }
     else {
-        return networks.find((network) => network.chainName === name);
+        return networks.find((network) => network.name === name);
     }
 };
 

package/src/wallets/ethereum/fortmatic.cjs

@@ -13,8 +13,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var FortmaticClient__default = /*#__PURE__*/_interopDefaultLegacy(FortmaticClient);
 
 class Fortmatic extends EthWalletConnector.EthWalletConnector {
-    constructor({ evmNetworks, apiKey, }) {
-        super({ evmNetworks });
+    constructor(_a) {
+        var { apiKey } = _a, props = tslib.__rest(_a, ["apiKey"]);
+        super(props);
         this.name = 'Fortmatic';
         this.supportedChains = ['ETH', 'EVM'];
         this.connectedChain = 'EVM';

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

@@ -1,8 +1,10 @@
 import { ethers } from 'ethers';
 import { Chain } from '@dynamic-labs/wallet-connector-core';
 import { EthProviderHelper } from './ethProviderHelper';
-import { EthWalletConnector } from './EthWalletConnector';
-import { EvmNetwork } from './evm-network';
+import { EthWalletConnector, EthWalletConnectorOpts } from './EthWalletConnector';
+type FortmaticOpts = EthWalletConnectorOpts & {
+    apiKey: string;
+};
 declare class Fortmatic extends EthWalletConnector {
     name: string;
     supportedChains: Chain[];
@@ -11,10 +13,7 @@ declare class Fortmatic extends EthWalletConnector {
     ethProviderHelper: EthProviderHelper;
     publicAddress: string | undefined;
     private apiKey;
-    constructor({ evmNetworks, apiKey, }: {
-        apiKey: string;
-        evmNetworks: EvmNetwork[];
-    });
+    constructor({ apiKey, ...props }: FortmaticOpts);
     getFortmaticProvider(): import("fortmatic/dist/cjs/src/core/fm-provider").FmProvider;
     getWeb3Provider(): ethers.providers.Web3Provider;
     fetchPublicAddress(): Promise<string | undefined>;

package/src/wallets/ethereum/fortmatic.js

@@ -1,4 +1,4 @@
-import { __awaiter } from 'tslib';
+import { __rest, __awaiter } from 'tslib';
 import { ethers } from 'ethers';
 import FortmaticClient from 'fortmatic';
 import { DynamicError } from '../../errors.js';
@@ -7,8 +7,9 @@ import { EthProviderHelper } from './ethProviderHelper.js';
 import { EthWalletConnector } from './EthWalletConnector.js';
 
 class Fortmatic extends EthWalletConnector {
-    constructor({ evmNetworks, apiKey, }) {
-        super({ evmNetworks });
+    constructor(_a) {
+        var { apiKey } = _a, props = __rest(_a, ["apiKey"]);
+        super(props);
         this.name = 'Fortmatic';
         this.supportedChains = ['ETH', 'EVM'];
         this.connectedChain = 'EVM';

package/src/wallets/ethereum/meta-mask.d.ts

@@ -1,8 +1,8 @@
 import { ethers } from 'ethers';
 import { Chain, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+import { EvmNetwork } from '@dynamic-labs/types';
 import { EthProviderHelper } from './ethProviderHelper';
 import { EthWalletConnector } from './EthWalletConnector';
-import { EvmNetwork } from './evm-network';
 declare class MetaMask extends EthWalletConnector {
     name: string;
     supportedChains: Chain[];

package/src/wallets/getMobileOrInjectedWallet.cjs

@@ -2,24 +2,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var walletConnect = require('./walletConnect/walletConnect.cjs');
 var walletConnectV2 = require('./walletConnect/walletConnectV2.cjs');
 
-const getMobileOrInjectedWallet = ({ evmNetworks, injectedWallet, isWalletConnectV2 = false, walletConnectName, }) => {
+const getMobileOrInjectedWallet = (_a) => {
+    var { injectedWallet, isWalletConnectV2 = false } = _a, props = tslib.__rest(_a, ["injectedWallet", "isWalletConnectV2"]);
     if (injectedWallet.isInstalledOnBrowser()) {
         return injectedWallet;
     }
     else if (isWalletConnectV2) {
-        return new walletConnectV2({
-            evmNetworks,
-            walletName: walletConnectName,
-        });
+        return new walletConnectV2(props);
     }
     else {
-        return new walletConnect({
-            evmNetworks,
-            walletName: walletConnectName,
-        });
+        return new walletConnect(props);
     }
 };
 

package/src/wallets/getMobileOrInjectedWallet.d.ts

@@ -1,8 +1,9 @@
 import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { EvmNetwork } from './ethereum/evm-network';
-export declare const getMobileOrInjectedWallet: ({ evmNetworks, injectedWallet, isWalletConnectV2, walletConnectName, }: {
-    evmNetworks: EvmNetwork[];
+import { WalletConnectorV2Opts } from './walletConnect/walletConnectV2';
+export declare const getMobileOrInjectedWallet: ({ injectedWallet, isWalletConnectV2, ...props }: import("./ethereum/EthWalletConnector").EthWalletConnectorOpts & {
+    projectId?: string | undefined;
+    walletName: string;
+} & {
     injectedWallet: WalletConnector;
     isWalletConnectV2?: boolean | undefined;
-    walletConnectName: string;
 }) => WalletConnector;

package/src/wallets/getMobileOrInjectedWallet.js

@@ -1,21 +1,17 @@
+import { __rest } from 'tslib';
 import WalletConnect from './walletConnect/walletConnect.js';
 import WalletConnectV2 from './walletConnect/walletConnectV2.js';
 
-const getMobileOrInjectedWallet = ({ evmNetworks, injectedWallet, isWalletConnectV2 = false, walletConnectName, }) => {
+const getMobileOrInjectedWallet = (_a) => {
+    var { injectedWallet, isWalletConnectV2 = false } = _a, props = __rest(_a, ["injectedWallet", "isWalletConnectV2"]);
     if (injectedWallet.isInstalledOnBrowser()) {
         return injectedWallet;
     }
     else if (isWalletConnectV2) {
-        return new WalletConnectV2({
-            evmNetworks,
-            walletName: walletConnectName,
-        });
+        return new WalletConnectV2(props);
     }
     else {
-        return new WalletConnect({
-            evmNetworks,
-            walletName: walletConnectName,
-        });
+        return new WalletConnect(props);
     }
 };
 

package/src/wallets/getWalletConnectConnector.cjs

@@ -2,18 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var walletConnect = require('./walletConnect/walletConnect.cjs');
 var walletConnectV2 = require('./walletConnect/walletConnectV2.cjs');
 
-const getWalletConnectConnector = ({ evmNetworks, isWalletConnectV2Enabled, projectId, }) => isWalletConnectV2Enabled
-    ? new walletConnectV2({
-        evmNetworks,
-        projectId,
-        walletName: 'WalletConnect',
-    })
-    : new walletConnect({
-        evmNetworks,
-        walletName: 'WalletConnect',
-    });
+const getWalletConnectConnector = (_a) => {
+    var { isWalletConnectV2Enabled } = _a, props = tslib.__rest(_a, ["isWalletConnectV2Enabled"]);
+    return isWalletConnectV2Enabled
+        ? new walletConnectV2(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }))
+        : new walletConnect(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
+};
 
 exports.getWalletConnectConnector = getWalletConnectConnector;

package/src/wallets/getWalletConnectConnector.d.ts

@@ -1,8 +1,5 @@
-import { EvmNetwork } from './ethereum/evm-network';
 import WalletConnect from './walletConnect';
-import WalletConnectV2 from './walletConnect/walletConnectV2';
-export declare const getWalletConnectConnector: ({ evmNetworks, isWalletConnectV2Enabled, projectId, }: {
-    evmNetworks: EvmNetwork[];
+import WalletConnectV2, { WalletConnectorV2Opts } from './walletConnect/walletConnectV2';
+export declare const getWalletConnectConnector: ({ isWalletConnectV2Enabled, ...props }: Omit<WalletConnectorV2Opts, "walletName"> & {
     isWalletConnectV2Enabled: boolean;
-    projectId?: string | undefined;
 }) => WalletConnectV2 | WalletConnect;

package/src/wallets/getWalletConnectConnector.js

@@ -1,15 +1,12 @@
+import { __rest } from 'tslib';
 import WalletConnect from './walletConnect/walletConnect.js';
 import WalletConnectV2 from './walletConnect/walletConnectV2.js';
 
-const getWalletConnectConnector = ({ evmNetworks, isWalletConnectV2Enabled, projectId, }) => isWalletConnectV2Enabled
-    ? new WalletConnectV2({
-        evmNetworks,
-        projectId,
-        walletName: 'WalletConnect',
-    })
-    : new WalletConnect({
-        evmNetworks,
-        walletName: 'WalletConnect',
-    });
+const getWalletConnectConnector = (_a) => {
+    var { isWalletConnectV2Enabled } = _a, props = __rest(_a, ["isWalletConnectV2Enabled"]);
+    return isWalletConnectV2Enabled
+        ? new WalletConnectV2(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }))
+        : new WalletConnect(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
+};
 
 export { getWalletConnectConnector };

package/src/wallets/solana/solWalletConnector.cjs

@@ -5,15 +5,33 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var web3_js = require('@solana/web3.js');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var rpcProviders = require('../../rpcProviders.cjs');
+var rpcProviders = require('@dynamic-labs/rpc-providers');
 var errors = require('../../errors.cjs');
 
 class SolWalletConnector extends walletConnectorCore.WalletConnectorBase {
-    constructor({ solNetworks }) {
+    constructor({ solNetworks, chainRpcProviders }) {
+        var _a;
         super();
         this.supportedChains = ['SOL'];
         this.connectedChain = 'SOL';
         this.solNetworks = solNetworks;
+        this.chainRpcProviders = chainRpcProviders;
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerChainProviders(rpcProviders.ProviderChain.SOLANA, (config) => {
+            const rpcProviders = {};
+            if (config === null || config === void 0 ? void 0 : config.solana) {
+                rpcProviders.solana = config.solana.map((network) => {
+                    var _a;
+                    const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
+                    const provider = new web3_js.Connection(rpcUrl);
+                    return {
+                        chainId: network.chainId.toString(),
+                        chainName: network.name,
+                        provider,
+                    };
+                });
+            }
+            return rpcProviders.solana;
+        });
     }
     getWeb3Provider() {
         var _a;
@@ -25,7 +43,7 @@ class SolWalletConnector extends walletConnectorCore.WalletConnectorBase {
         return new web3_js.Connection(rpcUrl, 'confirmed');
     }
     getRpcProvider() {
-        var _a;
+        var _a, _b;
         return tslib.__awaiter(this, void 0, void 0, function* () {
             if (this.solNetworks.length === 0)
                 return;
@@ -35,7 +53,7 @@ class SolWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 solana: this.solNetworks,
                 starknet: undefined,
             };
-            return (_a = rpcProviders.getSolanaDefaultRpcProvider(configurations)) === null || _a === void 0 ? void 0 : _a.provider;
+            return (_b = (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.getSolanaRpcProviderByChainId(configurations, '101')) === null || _b === void 0 ? void 0 : _b.provider;
         });
     }
     getBalance() {

package/src/wallets/solana/solWalletConnector.d.ts

@@ -1,14 +1,17 @@
 import { Connection } from '@solana/web3.js';
-import type { NetworkConfiguration } from '@dynamic-labs/sdk-api';
 import { Chain, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { GenericNetwork } from '@dynamic-labs/types';
+import { ChainRpcProviders } from '@dynamic-labs/rpc-providers';
 import { ISolana } from '../window';
+export type SolWalletConnectorOpts = {
+    chainRpcProviders: typeof ChainRpcProviders;
+    solNetworks: GenericNetwork[];
+};
 export declare abstract class SolWalletConnector extends WalletConnectorBase {
-    solNetworks: NetworkConfiguration[];
+    solNetworks: GenericNetwork[];
     supportedChains: Chain[];
     connectedChain: Chain;
-    constructor({ solNetworks }: {
-        solNetworks: NetworkConfiguration[];
-    });
+    constructor({ solNetworks, chainRpcProviders }: SolWalletConnectorOpts);
     getWeb3Provider(): Connection;
     getRpcProvider(): Promise<Connection | undefined>;
     abstract getSigner(): Promise<ISolana | undefined>;

package/src/wallets/solana/solWalletConnector.js

@@ -1,15 +1,33 @@
 import { __awaiter } from 'tslib';
 import { Connection, PublicKey } from '@solana/web3.js';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { getSolanaDefaultRpcProvider } from '../../rpcProviders.js';
+import { ProviderChain } from '@dynamic-labs/rpc-providers';
 import { DynamicError } from '../../errors.js';
 
 class SolWalletConnector extends WalletConnectorBase {
-    constructor({ solNetworks }) {
+    constructor({ solNetworks, chainRpcProviders }) {
+        var _a;
         super();
         this.supportedChains = ['SOL'];
         this.connectedChain = 'SOL';
         this.solNetworks = solNetworks;
+        this.chainRpcProviders = chainRpcProviders;
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerChainProviders(ProviderChain.SOLANA, (config) => {
+            const rpcProviders = {};
+            if (config === null || config === void 0 ? void 0 : config.solana) {
+                rpcProviders.solana = config.solana.map((network) => {
+                    var _a;
+                    const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
+                    const provider = new Connection(rpcUrl);
+                    return {
+                        chainId: network.chainId.toString(),
+                        chainName: network.name,
+                        provider,
+                    };
+                });
+            }
+            return rpcProviders.solana;
+        });
     }
     getWeb3Provider() {
         var _a;
@@ -21,7 +39,7 @@ class SolWalletConnector extends WalletConnectorBase {
         return new Connection(rpcUrl, 'confirmed');
     }
     getRpcProvider() {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.solNetworks.length === 0)
                 return;
@@ -31,7 +49,7 @@ class SolWalletConnector extends WalletConnectorBase {
                 solana: this.solNetworks,
                 starknet: undefined,
             };
-            return (_a = getSolanaDefaultRpcProvider(configurations)) === null || _a === void 0 ? void 0 : _a.provider;
+            return (_b = (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.getSolanaRpcProviderByChainId(configurations, '101')) === null || _b === void 0 ? void 0 : _b.provider;
         });
     }
     getBalance() {