@dynamic-labs/multi-wallet 0.17.0-RC.6 → 0.17.0-RC.8

package/src/wallets/solana/solProviderHelper.js

@@ -3,41 +3,15 @@ import { bufferToBase64 } from '../../utils/convertors.js';
 import { ProviderLookup } from '../ProviderLookup.js';
 import { normalizeWalletName } from '../../utils/normalizeWalletName/normalizeWalletName.js';
 
+var _a;
 class SolProviderHelper {
-    constructor() {
-        this.GlowProvider = () => this.installedProviderLookup([{ flag: 'isGlow', value: true }]);
-        this.CoinbaseProvider = () => this.findSolanaProviders(window.coinbaseSolana)[0];
-        this.PhantomProvider = () => this.installedProviderLookup([
-            { flag: 'isPhantom', value: true },
-            { flag: 'isBraveWallet', value: false },
-            { flag: 'isExodus', value: false },
-        ]);
-        this.SolflareProvider = () => this.installedProviderLookup([{ flag: 'isSolflare', value: true }]);
-        this.BraveProvider = () => this.installedProviderLookup([
-            { flag: 'isPhantom', value: true },
-            { flag: 'isBraveWallet', value: true },
-        ]);
-        this.ExodusProvider = () => this.installedProviderLookup([
-            { flag: 'isPhantom', value: true },
-            { flag: 'isExodus', value: true },
-        ]);
-        this.providers = {
-            bravesol: this.BraveProvider,
-            coinbasesolana: this.CoinbaseProvider,
-            exodussol: this.ExodusProvider,
-            glow: this.GlowProvider,
-            phantom: this.PhantomProvider,
-            phantomledger: this.PhantomProvider,
-            solflare: this.SolflareProvider,
-        };
-    }
-    installedProviderLookup(providerFlags) {
+    static installedProviderLookup(providerFlags) {
         return ProviderLookup(this.allInstalledProviders(), providerFlags);
     }
-    allInstalledProviders() {
+    static allInstalledProviders() {
         return this.findSolanaProviders(window.solana).concat(this.findSolanaProviders(window.solflare), this.findSolanaProviders(window.glowSolana));
     }
-    findSolanaProviders(solana) {
+    static findSolanaProviders(solana) {
         const solanaProviders = [];
         if (solana && !solana.providers) {
             solanaProviders.push(solana);
@@ -49,14 +23,14 @@ class SolProviderHelper {
         }
         return solanaProviders;
     }
-    isInstalledHelper(walletName) {
+    static isInstalledHelper(walletName) {
         return this.findProvider(walletName) !== undefined;
     }
-    findProvider(walletName) {
-        var _a, _b;
-        return (_b = (_a = this.providers)[normalizeWalletName(walletName)]) === null || _b === void 0 ? void 0 : _b.call(_a);
+    static findProvider(walletName) {
+        var _b, _c;
+        return (_c = (_b = this.providers)[normalizeWalletName(walletName)]) === null || _c === void 0 ? void 0 : _c.call(_b);
     }
-    fetchPublicAddressWithName(name) {
+    static fetchPublicAddressWithName(name) {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.findProvider(name);
             if (!provider) {
@@ -67,7 +41,7 @@ class SolProviderHelper {
             return publicKey ? publicKey.toString() : Promise.resolve(undefined);
         });
     }
-    connectWithName(name) {
+    static connectWithName(name) {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.findProvider(name);
             if (!provider) {
@@ -82,7 +56,7 @@ class SolProviderHelper {
             }
         });
     }
-    signMessageWithName(messageToSign, name) {
+    static signMessageWithName(messageToSign, name) {
         return __awaiter(this, void 0, void 0, function* () {
             const walletAddress = yield this.fetchPublicAddressWithName(name);
             if (!walletAddress) {
@@ -99,36 +73,35 @@ class SolProviderHelper {
             }));
         });
     }
-    _setupEventListeners(listeners, web3Provider) {
+    static _setupEventListeners(listeners, web3Provider) {
         const handleAccountChange = (address) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _b, _c, _d;
             if (!address) {
                 yield (web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.connect());
-                if ((_a = web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.publicKey) === null || _a === void 0 ? void 0 : _a.toString()) {
-                    (_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, [web3Provider.publicKey.toString()]);
+                if ((_b = web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString()) {
+                    (_c = listeners.onAccountChange) === null || _c === void 0 ? void 0 : _c.call(listeners, [web3Provider.publicKey.toString()]);
                 }
                 return;
             }
             if (address.toString()) {
-                yield ((_c = listeners.onAccountChange) === null || _c === void 0 ? void 0 : _c.call(listeners, [address.toString()]));
+                yield ((_d = listeners.onAccountChange) === null || _d === void 0 ? void 0 : _d.call(listeners, [address.toString()]));
             }
         });
         const handleDisconnect = () => __awaiter(this, void 0, void 0, function* () {
-            var _d;
-            yield ((_d = listeners.onDisconnect) === null || _d === void 0 ? void 0 : _d.call(listeners));
+            var _e;
+            yield ((_e = listeners.onDisconnect) === null || _e === void 0 ? void 0 : _e.call(listeners));
         });
         web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.on('accountChanged', handleAccountChange);
         web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.on('disconnect', handleDisconnect);
-        return () => { };
     }
-    _teardownEventListeners(name) {
+    static _teardownEventListeners(name) {
         const web3Provider = this.findProvider(name);
         if (!web3Provider) {
             return;
         }
         web3Provider.removeAllListeners();
     }
-    getConnectedAccountsWithName(name) {
+    static getConnectedAccountsWithName(name) {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.findProvider(name);
             if (!provider) {
@@ -155,6 +128,32 @@ class SolProviderHelper {
             }
         });
     }
-}
+}
+_a = SolProviderHelper;
+SolProviderHelper.GlowProvider = () => _a.installedProviderLookup([{ flag: 'isGlow', value: true }]);
+SolProviderHelper.CoinbaseProvider = () => _a.findSolanaProviders(window.coinbaseSolana)[0];
+SolProviderHelper.PhantomProvider = () => _a.installedProviderLookup([
+    { flag: 'isPhantom', value: true },
+    { flag: 'isBraveWallet', value: false },
+    { flag: 'isExodus', value: false },
+]);
+SolProviderHelper.SolflareProvider = () => _a.installedProviderLookup([{ flag: 'isSolflare', value: true }]);
+SolProviderHelper.BraveProvider = () => _a.installedProviderLookup([
+    { flag: 'isPhantom', value: true },
+    { flag: 'isBraveWallet', value: true },
+]);
+SolProviderHelper.ExodusProvider = () => _a.installedProviderLookup([
+    { flag: 'isPhantom', value: true },
+    { flag: 'isExodus', value: true },
+]);
+SolProviderHelper.providers = {
+    bravesol: _a.BraveProvider,
+    coinbasesolana: _a.CoinbaseProvider,
+    exodussol: _a.ExodusProvider,
+    glow: _a.GlowProvider,
+    phantom: _a.PhantomProvider,
+    phantomledger: _a.PhantomProvider,
+    solflare: _a.SolflareProvider,
+};
 
 export { SolProviderHelper };

package/src/wallets/solana/solWalletConnector.cjs

@@ -5,27 +5,45 @@ 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 errors = require('../../errors.cjs');
+var rpcProviders = require('@dynamic-labs/rpc-providers');
+var utils = require('@dynamic-labs/utils');
 
 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;
         const [network] = this.solNetworks;
         if (!network) {
-            throw new errors.DynamicError('No enabled networks');
+            throw new utils.DynamicError('No enabled networks');
         }
         const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
         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 { DynamicError } from '../../errors.js';
+import { ProviderChain } from '@dynamic-labs/rpc-providers';
+import { DynamicError } from '@dynamic-labs/utils';
 
 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() {

package/src/wallets/solana/solflare.cjs

@@ -9,24 +9,23 @@ class Solflare extends solWalletConnector.SolWalletConnector {
     constructor() {
         super(...arguments);
         this.name = 'Solflare';
-        this.solProviderHelper = new solProviderHelper.SolProviderHelper();
     }
     isInstalledOnBrowser() {
-        return this.solProviderHelper.isInstalledHelper(this.name);
+        return solProviderHelper.SolProviderHelper.isInstalledHelper(this.name);
     }
     fetchPublicAddress() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.fetchPublicAddressWithName(this.name);
+            return solProviderHelper.SolProviderHelper.fetchPublicAddressWithName(this.name);
         });
     }
     connect() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.solProviderHelper.connectWithName(this.name);
+            yield solProviderHelper.SolProviderHelper.connectWithName(this.name);
         });
     }
     getSigner() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.connectWithName(this.name);
+            return solProviderHelper.SolProviderHelper.connectWithName(this.name);
         });
     }
     signMessage(messageToSign) {
@@ -35,7 +34,7 @@ class Solflare extends solWalletConnector.SolWalletConnector {
             if (!walletAddress) {
                 return undefined;
             }
-            const provider = this.solProviderHelper.findProvider(this.name);
+            const provider = solProviderHelper.SolProviderHelper.findProvider(this.name);
             if (!provider) {
                 return undefined;
             }
@@ -57,7 +56,7 @@ class Solflare extends solWalletConnector.SolWalletConnector {
     }
     getConnectedAccounts() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.getConnectedAccountsWithName(this.name);
+            return solProviderHelper.SolProviderHelper.getConnectedAccountsWithName(this.name);
         });
     }
 }

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

@@ -1,9 +1,7 @@
 import { ISolana } from '../window';
 import { SolWalletConnector } from './solWalletConnector';
-import { SolProviderHelper } from './solProviderHelper';
 declare class Solflare extends SolWalletConnector {
     name: string;
-    solProviderHelper: SolProviderHelper;
     isInstalledOnBrowser(): boolean;
     fetchPublicAddress(): Promise<string | undefined>;
     connect(): Promise<void>;

package/src/wallets/solana/solflare.js

@@ -7,24 +7,23 @@ class Solflare extends SolWalletConnector {
     constructor() {
         super(...arguments);
         this.name = 'Solflare';
-        this.solProviderHelper = new SolProviderHelper();
     }
     isInstalledOnBrowser() {
-        return this.solProviderHelper.isInstalledHelper(this.name);
+        return SolProviderHelper.isInstalledHelper(this.name);
     }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.fetchPublicAddressWithName(this.name);
+            return SolProviderHelper.fetchPublicAddressWithName(this.name);
         });
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.solProviderHelper.connectWithName(this.name);
+            yield SolProviderHelper.connectWithName(this.name);
         });
     }
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.connectWithName(this.name);
+            return SolProviderHelper.connectWithName(this.name);
         });
     }
     signMessage(messageToSign) {
@@ -33,7 +32,7 @@ class Solflare extends SolWalletConnector {
             if (!walletAddress) {
                 return undefined;
             }
-            const provider = this.solProviderHelper.findProvider(this.name);
+            const provider = SolProviderHelper.findProvider(this.name);
             if (!provider) {
                 return undefined;
             }
@@ -55,7 +54,7 @@ class Solflare extends SolWalletConnector {
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.solProviderHelper.getConnectedAccountsWithName(this.name);
+            return SolProviderHelper.getConnectedAccountsWithName(this.name);
         });
     }
 }

package/src/wallets/starknet/starknetWalletConnector.cjs

@@ -6,8 +6,7 @@ var starknet = require('starknet');
 var constants = require('starknet/constants');
 var uint256 = require('starknet/dist/utils/uint256');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var errors = require('../../errors.cjs');
-var logger = require('../../utils/logger.cjs');
+var utils = require('@dynamic-labs/utils');
 var convertors = require('../../utils/convertors.cjs');
 var constants$1 = require('../constants.cjs');
 var ethereumContractAbi = require('./ethereumContractAbi.cjs');
@@ -31,7 +30,7 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 }
             }
             catch (err) {
-                logger.logger.error(err);
+                walletConnectorCore.logger.error(err);
             }
         });
     }
@@ -68,7 +67,7 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
             const wallet = yield this.getWallet();
             const walletAddress = yield this.fetchPublicAddress();
             if (!walletAddress || !wallet) {
-                logger.logger.error('Could not fetch wallet address for signing message');
+                walletConnectorCore.logger.error('Could not fetch wallet address for signing message');
                 return undefined;
             }
             const { account } = wallet;
@@ -83,7 +82,7 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
             const walletAddress = yield this.fetchPublicAddress();
             const provider = yield this.getWeb3Provider();
             if (!walletAddress || !provider) {
-                logger.logger.error('Could not fetch wallet address for getting balance');
+                walletConnectorCore.logger.error('Could not fetch wallet address for getting balance');
                 return undefined;
             }
             const contract = new starknet.Contract(ethereumContractAbi, constants$1.ETH_STARKNET_ADDRESS, provider);
@@ -97,7 +96,7 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 return (gweiBalance / 1e18).toFixed(6);
             }
             catch (error) {
-                throw new errors.DynamicError('Something went wrong');
+                throw new utils.DynamicError('Something went wrong');
             }
         });
     }

package/src/wallets/starknet/starknetWalletConnector.js

@@ -3,9 +3,8 @@ import { getInstalledWallets, disconnect } from 'get-starknet';
 import { Contract } from 'starknet';
 import { StarknetChainId } from 'starknet/constants.js';
 import { uint256ToBN } from 'starknet/dist/utils/uint256.js';
-import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { DynamicError } from '../../errors.js';
-import { logger } from '../../utils/logger.js';
+import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
+import { DynamicError } from '@dynamic-labs/utils';
 import { formatTypedDataMessage } from '../../utils/convertors.js';
 import { ETH_STARKNET_ADDRESS } from '../constants.js';
 import ETH_CONTRACT_ABI from './ethereumContractAbi.js';

package/src/wallets/walletConnect/index.d.ts

@@ -1,2 +1,2 @@
 export { default } from './walletConnect';
-export { default as WalletConnectV2 } from './walletConnectV2';
+export { default as WalletConnectV2, type WalletConnectorV2Opts, } from './walletConnectV2';

package/src/wallets/walletConnect/walletConnect.cjs

@@ -4,20 +4,21 @@ var tslib = require('tslib');
 var WalletConnectProvider = require('@walletconnect/ethereum-provider');
 var ethers = require('ethers');
 var walletBook = require('@dynamic-labs/wallet-book');
+var utils = require('@dynamic-labs/utils');
 var constants = require('../constants.cjs');
 var EthWalletConnector = require('../ethereum/EthWalletConnector.cjs');
 var walletConnect = require('../clients/walletConnect/walletConnect.cjs');
 var isMobile = require('../../utils/isMobile.cjs');
 var normalizeWalletName = require('../../utils/normalizeWalletName/normalizeWalletName.cjs');
-var errors = require('../../errors.cjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var WalletConnectProvider__default = /*#__PURE__*/_interopDefaultLegacy(WalletConnectProvider);
 
 class WalletConnect extends EthWalletConnector.EthWalletConnector {
-    constructor({ walletName, evmNetworks, }) {
-        super({ evmNetworks });
+    constructor(_a) {
+        var { walletName } = _a, props = tslib.__rest(_a, ["walletName"]);
+        super(props);
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = true;
@@ -42,7 +43,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
         }
     }
     setupEventListeners(listeners) {
-        return walletConnect.setupWalletConnectEventListeners({
+        walletConnect.setupWalletConnectEventListeners({
             onAccountChange: listeners.onAccountChange,
             onChainChange: listeners.onChainChange,
             onDisconnect: listeners.onDisconnect,
@@ -104,13 +105,13 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             }
             if (this.switchNetworkOnlyFromWallet !== undefined &&
                 this.switchNetworkOnlyFromWallet) {
-                throw new errors.DynamicError('Network switching is only supported through the wallet');
+                throw new utils.DynamicError('Network switching is only supported through the wallet');
             }
             if (!this.supportsNetworkSwitching()) {
-                throw new errors.DynamicError('Network switching not supported');
+                throw new utils.DynamicError('Network switching not supported');
             }
             if (!client) {
-                throw new errors.DynamicError('Client not found');
+                throw new utils.DynamicError('Client not found');
             }
             if (isMobile.isMobile()) {
                 const deepLink = walletConnect.getDeepLink(client.uri, walletBook.getWalletBookWallet(this.name));

package/src/wallets/walletConnect/walletConnect.d.ts

@@ -1,8 +1,11 @@
 import Client from '@walletconnect/client';
 import { ethers } from 'ethers';
 import { Chain, FetchPublicAddressOpts, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
-import { EthWalletConnector } from '../ethereum/EthWalletConnector';
-import { EvmNetwork } from '../ethereum/evm-network';
+import { EvmNetwork } from '@dynamic-labs/types';
+import { EthWalletConnector, EthWalletConnectorOpts } from '../ethereum/EthWalletConnector';
+export type WalletConnectOpts = EthWalletConnectorOpts & {
+    walletName: string;
+};
 declare class WalletConnect extends EthWalletConnector {
     supportedChains: Chain[];
     connectedChain: Chain;
@@ -12,13 +15,10 @@ declare class WalletConnect extends EthWalletConnector {
     switchNetworkOnlyFromWallet: boolean;
     client?: Client;
     clientOptions?: any;
-    constructor({ walletName, evmNetworks, }: {
-        evmNetworks: EvmNetwork[];
-        walletName: string;
-    });
+    constructor({ walletName, ...props }: WalletConnectOpts);
     getClient(): Client;
     supportsNetworkSwitching(): boolean;
-    setupEventListeners(listeners: WalletEventListeners): () => void;
+    setupEventListeners(listeners: WalletEventListeners): void;
     teardownEventListeners(): void;
     getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;

package/src/wallets/walletConnect/walletConnect.js

@@ -1,17 +1,18 @@
-import { __awaiter } from 'tslib';
+import { __rest, __awaiter } from 'tslib';
 import WalletConnectProvider from '@walletconnect/ethereum-provider';
 import { ethers } from 'ethers';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { DynamicError } from '@dynamic-labs/utils';
 import { infuraId } from '../constants.js';
 import { EthWalletConnector } from '../ethereum/EthWalletConnector.js';
 import { initClient, setupWalletConnectEventListeners, teardownWalletConnectEventListeners, fetchWalletConnectEVMPublicAddress, getDeepLink, signWalletConnectPersonalMessage, killWalletConnectSession } from '../clients/walletConnect/walletConnect.js';
 import { isMobile, isIOS } from '../../utils/isMobile.js';
 import { normalizeWalletName } from '../../utils/normalizeWalletName/normalizeWalletName.js';
-import { DynamicError } from '../../errors.js';
 
 class WalletConnect extends EthWalletConnector {
-    constructor({ walletName, evmNetworks, }) {
-        super({ evmNetworks });
+    constructor(_a) {
+        var { walletName } = _a, props = __rest(_a, ["walletName"]);
+        super(props);
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = true;
@@ -36,7 +37,7 @@ class WalletConnect extends EthWalletConnector {
         }
     }
     setupEventListeners(listeners) {
-        return setupWalletConnectEventListeners({
+        setupWalletConnectEventListeners({
             onAccountChange: listeners.onAccountChange,
             onChainChange: listeners.onChainChange,
             onDisconnect: listeners.onDisconnect,