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

package/src/types.d.ts

@@ -1,58 +1,20 @@
-import { Connection } from '@solana/web3.js';
-import { ethers } from 'ethers';
 import { OAuthProvider } from '@magic-ext/oauth';
-import type { NetworkConfiguration } from '@dynamic-labs/sdk-api';
+import type { Provider } from '@dynamic-labs/sdk-api';
 import { WalletConnector, Chain } from '@dynamic-labs/wallet-connector-core';
-import { EvmNetwork } from './wallets/ethereum/evm-network';
-import { MagicLinkConfig } from './wallets/ethereum/MagicConnector';
-export type VendorCredentials = {
-    fortmatic?: string;
-};
-export type EvmRpcProvider = {
-    chainId: number;
-    chainName: string;
-    provider: ethers.providers.JsonRpcProvider;
-};
-export type SolanaRpcProvider = {
-    chainId?: number;
-    chainName: string;
-    provider: Connection;
-};
-export type RpcProviders = {
-    evm?: EvmRpcProvider[];
-    solana?: SolanaRpcProvider[];
-};
-export type NetworkConfigurationMap = {
-    cosmos: EvmNetwork[] | undefined;
-    evm: EvmNetwork[] | undefined;
-    solana: NetworkConfiguration[] | undefined;
-    starknet: NetworkConfiguration[] | undefined;
-};
+import { NetworkConfigurationMap, WalletUiUtils } from '@dynamic-labs/types';
+import { ChainRpcProviders } from '@dynamic-labs/rpc-providers';
 export type GetSupportedWalletsOpts = {
     appLogoUrl?: string;
     appName?: string;
-    isWalletConnectV2Enabled: boolean;
-    magicLinkApiKey?: string;
-    magicLinkConfig?: MagicLinkConfig;
-    networkConfigurations: NetworkConfigurationMap | undefined;
+    chainRpcProviders: typeof ChainRpcProviders;
+    customerApiProviders?: Provider[];
+    isWalletConnectV2Enabled?: boolean;
+    networkConfigurations?: NetworkConfigurationMap;
     skipMemo?: boolean;
-    vendorCredentials?: VendorCredentials;
-    walletConnectProjectId: string | undefined;
+    walletConnectProjectId?: string;
     walletUiUtils?: WalletUiUtils;
 };
-export type GetSupportedWallets = (opts?: GetSupportedWalletsOpts) => Promise<WalletConnector[]>;
-export type WalletUiUtils = {
-    enableInternalSign: () => void;
-    sendTransaction: (props: {
-        handler: (transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>) => Promise<ethers.providers.TransactionResponse>;
-        provider: ethers.providers.Web3Provider;
-        transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>;
-    }) => Promise<ethers.providers.TransactionResponse>;
-    signMessage: (props: {
-        handler: (message: string | ethers.utils.Bytes) => Promise<string>;
-        message: string | ethers.utils.Bytes;
-    }) => Promise<string>;
-};
+export type GetSupportedWallets = (opts: GetSupportedWalletsOpts) => Promise<WalletConnector[]>;
 export type ChainInfo = {
     blockchainName: string;
     displayName: string;

package/src/utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.d.ts

@@ -1,3 +1,3 @@
 import { ethers } from 'ethers';
-import { WalletUiUtils } from '../../types';
+import { WalletUiUtils } from '@dynamic-labs/types';
 export declare const assignConfirmationScreenToProvider: (provider: ethers.providers.Web3Provider, walletUiUtils: WalletUiUtils) => void;

package/src/utils/getApiProviders.cjs

@@ -0,0 +1,15 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var sdkApi = require('@dynamic-labs/sdk-api');
+
+const getApiProviders = (providers) => Object.values(sdkApi.ProviderEnum).reduce((acc, provider) => {
+    const foundProvider = providers.find((providerSetting) => providerSetting.provider === provider);
+    if (foundProvider) {
+        acc[provider] = foundProvider;
+    }
+    return acc;
+}, {});
+
+exports.getApiProviders = getApiProviders;

package/src/utils/getApiProviders.d.ts

@@ -0,0 +1,10 @@
+import { Provider, ProviderEnum } from '@dynamic-labs/sdk-api';
+export declare const getApiProviders: (providers: Provider[]) => {
+    emailOnly?: Provider | undefined;
+    magicLink?: Provider | undefined;
+    google?: Provider | undefined;
+    facebook?: Provider | undefined;
+    twitter?: Provider | undefined;
+    discord?: Provider | undefined;
+    github?: Provider | undefined;
+};

package/src/utils/getApiProviders.js

@@ -0,0 +1,11 @@
+import { ProviderEnum } from '@dynamic-labs/sdk-api';
+
+const getApiProviders = (providers) => Object.values(ProviderEnum).reduce((acc, provider) => {
+    const foundProvider = providers.find((providerSetting) => providerSetting.provider === provider);
+    if (foundProvider) {
+        acc[provider] = foundProvider;
+    }
+    return acc;
+}, {});
+
+export { getApiProviders };

package/src/utils/message.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var utils = require('ethers/lib/utils');
-var logger = require('./logger.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var getChainInfo = require('./getChainInfo/getChainInfo.cjs');
 
 const generateMessageToSign = ({ blockchain, domain, chainId, nonce, uri, publicKey, issuedAt = new Date().toISOString(), statement, requestId, resources, }) => {
@@ -48,7 +48,7 @@ const getEip55Address = (publicKey, chainId) => {
         }
     }
     catch (err) {
-        logger.logger.debug(`Error getting checksum, returning default ${publicKey}`);
+        walletConnectorCore.logger.debug(`Error getting checksum, returning default ${publicKey}`);
     }
     return publicKey;
 };

package/src/utils/message.d.ts

@@ -1,7 +1,7 @@
 import { Chain } from '@dynamic-labs/wallet-connector-core';
 export interface MessageParameters {
     blockchain: Chain;
-    chainId?: number;
+    chainId?: number | string;
     domain: string;
     issuedAt?: string;
     nonce: string;
@@ -12,4 +12,4 @@ export interface MessageParameters {
     uri: string;
 }
 export declare const generateMessageToSign: ({ blockchain, domain, chainId, nonce, uri, publicKey, issuedAt, statement, requestId, resources, }: MessageParameters) => string;
-export declare const getEip55Address: (publicKey: string, chainId?: number) => string;
+export declare const getEip55Address: (publicKey: string, chainId?: number | string) => string;

package/src/utils/message.js

@@ -1,5 +1,5 @@
 import { getAddress } from 'ethers/lib/utils.js';
-import { logger } from './logger.js';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { getChainInfo } from './getChainInfo/getChainInfo.js';
 
 const generateMessageToSign = ({ blockchain, domain, chainId, nonce, uri, publicKey, issuedAt = new Date().toISOString(), statement, requestId, resources, }) => {

package/src/utils/walletConnect.cjs

@@ -6,25 +6,28 @@ var walletBook = require('@dynamic-labs/wallet-book');
 var walletConnect = require('../wallets/walletConnect/walletConnect.cjs');
 var walletConnectV2 = require('../wallets/walletConnect/walletConnectV2.cjs');
 
-const fetchWalletConnectWallets = (evmNetworks, isV2Enabled) => Object.values(walletBook.useWalletBook().wallets)
+const fetchWalletConnectWallets = ({ isV2Enabled, }) => Object.values(walletBook.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,
-        });
+        return class extends walletConnectV2 {
+            constructor(props) {
+                super(Object.assign(Object.assign({}, props), { walletName: name }));
+            }
+        };
     }
     else {
-        connector = new walletConnect({ evmNetworks, walletName: name });
+        return class extends walletConnect {
+            constructor(props) {
+                super(Object.assign(Object.assign({}, props), { walletName: name }));
+            }
+        };
     }
-    return connector;
 });
 
 exports.fetchWalletConnectWallets = fetchWalletConnectWallets;

package/src/utils/walletConnect.d.ts

@@ -1,4 +1,4 @@
-import WalletConnect from '../wallets/walletConnect';
-import { EvmNetwork } from '../wallets/ethereum/evm-network';
-import WalletConnectV2 from '../wallets/walletConnect/walletConnectV2';
-export declare const fetchWalletConnectWallets: (evmNetworks: EvmNetwork[], isV2Enabled: boolean) => (WalletConnectV2 | WalletConnect)[];
+import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
+export declare const fetchWalletConnectWallets: ({ isV2Enabled, }: {
+    isV2Enabled: boolean;
+}) => Array<WalletConnectorConstructor>;

package/src/utils/walletConnect.js

@@ -2,25 +2,28 @@ 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)
+const fetchWalletConnectWallets = ({ 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,
-        });
+        return class extends WalletConnectV2 {
+            constructor(props) {
+                super(Object.assign(Object.assign({}, props), { walletName: name }));
+            }
+        };
     }
     else {
-        connector = new WalletConnect({ evmNetworks, walletName: name });
+        return class extends WalletConnect {
+            constructor(props) {
+                super(Object.assign(Object.assign({}, props), { walletName: name }));
+            }
+        };
     }
-    return connector;
 });
 
 export { fetchWalletConnectWallets };

package/src/wallets/algorand/MyAlgoWalletConnector.cjs

@@ -3,7 +3,7 @@
 var tslib = require('tslib');
 var MyAlgoConnect = require('@randlabs/myalgo-connect');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var errors = require('../../errors.cjs');
+var utils = require('@dynamic-labs/utils');
 var localStorageAsync = require('../../utils/localStorageAsync.cjs');
 var myalgoSigner = require('./myalgoSigner.cjs');
 
@@ -96,7 +96,7 @@ class MyAlgoWalletConnector extends walletConnectorCore.WalletConnectorBase {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const address = yield this.fetchPublicAddress();
             if (!address)
-                throw new errors.DynamicError('MyAlgo Wallet Connector - Not connected!');
+                throw new utils.DynamicError('MyAlgo Wallet Connector - Not connected!');
             return new myalgoSigner.MyAlgoSigner(address, this.getClient());
         });
     }
@@ -111,7 +111,7 @@ class MyAlgoWalletConnector extends walletConnectorCore.WalletConnectorBase {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const address = yield this.fetchPublicAddress();
             if (!address)
-                throw new errors.DynamicError('getBalance - Not connected!');
+                throw new utils.DynamicError('getBalance - Not connected!');
             const response = yield fetch(`https://indexer.algoexplorerapi.io/v2/accounts/${address}`);
             if (!response.ok) {
                 // if the request fails due to rate limits, return cached value

package/src/wallets/algorand/MyAlgoWalletConnector.js

@@ -1,7 +1,7 @@
 import { __awaiter } from 'tslib';
 import MyAlgoConnect from '@randlabs/myalgo-connect';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { DynamicError } from '../../errors.js';
+import { DynamicError } from '@dynamic-labs/utils';
 import { getItemAsync, setItemAsync, removeItemAsync } from '../../utils/localStorageAsync.js';
 import { MyAlgoSigner } from './myalgoSigner.js';
 

package/src/wallets/clients/coinbase/coinbase.cjs

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var walletSdk = require('@coinbase/wallet-sdk');
-var utils = require('ethers/lib/utils');
-var errors = require('../../../errors.cjs');
+var utils$1 = require('ethers/lib/utils');
+var utils = require('@dynamic-labs/utils');
 var constants = require('../../constants.cjs');
 
 const jsonRpcUrl = `https://mainnet.infura.io/v3/${constants.infuraId}`;
@@ -42,7 +42,7 @@ const fetchPublicAddress = (coinbaseProviderOpts, opts) => tslib.__awaiter(void
     const provider = getCoinbaseProvider({ opts: coinbaseProviderOpts });
     const { qrUrl } = provider;
     if (!qrUrl) {
-        throw new errors.DynamicError('no qr url available');
+        throw new utils.DynamicError('no qr url available');
     }
     (_a = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _a === void 0 ? void 0 : _a.call(opts, qrUrl);
     const [address] = yield provider.request({
@@ -58,7 +58,7 @@ const signMessage = (coinbaseProviderOpts, messageToSign) => tslib.__awaiter(voi
     try {
         return yield provider.request({
             method: 'personal_sign',
-            params: [utils.hexlify(utils.toUtf8Bytes(messageToSign)), address.toLowerCase()],
+            params: [utils$1.hexlify(utils$1.toUtf8Bytes(messageToSign)), address.toLowerCase()],
         });
     }
     catch (err) {

package/src/wallets/clients/coinbase/coinbase.js

@@ -1,7 +1,7 @@
 import { __awaiter } from 'tslib';
 import { CoinbaseWalletSDK } from '@coinbase/wallet-sdk';
 import { hexlify, toUtf8Bytes } from 'ethers/lib/utils.js';
-import { DynamicError } from '../../../errors.js';
+import { DynamicError } from '@dynamic-labs/utils';
 import { infuraId } from '../../constants.js';
 
 const jsonRpcUrl = `https://mainnet.infura.io/v3/${infuraId}`;

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

@@ -5,9 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var Client = require('@walletconnect/client');
 var ethers = require('ethers');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var isMobile = require('../../../utils/isMobile.cjs');
 var isSameAddress = require('../../../utils/isSameAddress/isSameAddress.cjs');
-var logger = require('../../../utils/logger.cjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -26,9 +26,7 @@ const initClient = (name, settings) => {
  */
 const setupWalletConnectEventListeners = (opts, client) => {
     if (!client) {
-        return () => {
-            // nothing to teardown
-        };
+        return;
     }
     let prevAccount;
     let prevChain;
@@ -57,10 +55,6 @@ const setupWalletConnectEventListeners = (opts, client) => {
             yield ((_c = opts.onChainChange) === null || _c === void 0 ? void 0 : _c.call(opts, String(chainId)));
         }
     }));
-    return () => {
-        client.off('disconnect');
-        client.off('session_update');
-    };
 };
 const teardownWalletConnectEventListeners = (client) => {
     client.off('disconnect');
@@ -76,7 +70,7 @@ const killWalletConnectSession = (client) => tslib.__awaiter(void 0, void 0, voi
         }
     }
     catch (e) {
-        logger.logger.debug(e);
+        walletConnectorCore.logger.debug(e);
     }
 });
 const getDeepLink = (uri, metadata, { removeWCUri = false, } = {}) => {
@@ -101,19 +95,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) => {
@@ -129,22 +118,8 @@ const useDeepLink = (metadata, wcClient, opts) => {
         (_c = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _c === void 0 ? void 0 : _c.call(opts, wcClient.uri);
     }
 };
-const fetchWalletConnectCosmosPublicAddress = (metadata, wcClient, provider, opts) => tslib.__awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    if (wcClient.connected) {
-        const key = yield provider.getKey(opts.chainId);
-        return key.bech32Address;
-    }
-    yield wcClient.createSession();
-    useDeepLink(metadata, wcClient, opts);
-    const payload = yield createSession(wcClient);
-    const key = yield provider.getKey(opts.chainId);
-    (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
-    wcClient.accounts = [key.bech32Address];
-    return key.bech32Address;
-});
 const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => tslib.__awaiter(void 0, void 0, void 0, function* () {
-    var _b;
+    var _a;
     if (wcClient.connected) {
         const [accountPublicAddress] = wcClient.accounts;
         return accountPublicAddress;
@@ -153,14 +128,14 @@ const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => tslib._
     yield wcClient.createSession();
     useDeepLink(metadata, wcClient, opts);
     const payload = yield createSession(wcClient);
-    (_b = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _b === void 0 ? void 0 : _b.call(opts, payload);
+    (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
     const [accountPublicAddress] = payload.params[0].accounts;
     return accountPublicAddress;
 });
 const signWalletConnectPersonalMessage = (messageToSign, metadata, client, rpcProvider) => tslib.__awaiter(void 0, void 0, void 0, function* () {
-    var _c, _d;
-    const isCryptoWallet = ((_c = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _c === void 0 ? void 0 : _c.name) === 'Crypto.com | DeFi Wallet' ||
-        ((_d = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _d === void 0 ? void 0 : _d.name) === 'DeFi Wallet';
+    var _b, _c;
+    const isCryptoWallet = ((_b = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _b === void 0 ? void 0 : _b.name) === 'Crypto.com | DeFi Wallet' ||
+        ((_c = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _c === void 0 ? void 0 : _c.name) === 'DeFi Wallet';
     if (!client || !client.connected) {
         return;
     }
@@ -192,7 +167,7 @@ const signWalletConnectPersonalMessage = (messageToSign, metadata, client, rpcPr
         return signature;
     }
     catch (e) {
-        logger.logger.debug(e);
+        walletConnectorCore.logger.debug(e);
         throw e;
     }
 });
@@ -204,11 +179,11 @@ const IS_VALID_SIGNATURE_ABI = [
     'function isValidSignature(bytes32 _message, bytes _signature) public view returns (bytes4)',
 ];
 const waitForSafeTransactionOrTimeout = (accountPublicAddress, signature, messageToSign, client, rpcProvider) => tslib.__awaiter(void 0, void 0, void 0, function* () {
-    var _e;
+    var _d;
     if (signature === '0x' &&
         // this is what wallet connect client returns there's no `safe` or `Safe`
         // exact string anywhere, so this seems like the best proxy
-        ((_e = client.peerMeta) === null || _e === void 0 ? void 0 : _e.name) === 'WalletConnect Safe App') {
+        ((_d = client.peerMeta) === null || _d === void 0 ? void 0 : _d.name) === 'WalletConnect Safe App') {
         if (!rpcProvider) {
             return;
         }
@@ -236,7 +211,7 @@ const waitForSafeTransaction = (signature, messageToSign, contract) => tslib.__a
                 return;
         }
         catch (err) {
-            logger.logger.info('Safe transaction cannot be validated yet. Retrying.');
+            walletConnectorCore.logger.info('Safe transaction cannot be validated yet. Retrying.');
         }
         // try again after 2 seconds
         yield sleep(2000);
@@ -244,7 +219,6 @@ const waitForSafeTransaction = (signature, messageToSign, contract) => tslib.__a
 });
 
 exports.createSession = createSession;
-exports.fetchWalletConnectCosmosPublicAddress = fetchWalletConnectCosmosPublicAddress;
 exports.fetchWalletConnectEVMPublicAddress = fetchWalletConnectEVMPublicAddress;
 exports.getDeepLink = getDeepLink;
 exports.initClient = initClient;

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

@@ -2,12 +2,11 @@ import Client from '@walletconnect/client';
 import { ethers } from 'ethers';
 import { FetchPublicAddressOpts, PayloadParams, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { WalletSchema } from '@dynamic-labs/wallet-book';
-import { KeplrWalletConnectV1 } from '../../cosmos/wcClient';
 export declare const initClient: (name: string, settings?: any) => Client;
 /**
  * Attach event handlers to WalletConnect events.
  */
-export declare const setupWalletConnectEventListeners: (opts: WalletEventListeners, client: Client) => (() => void);
+export declare const setupWalletConnectEventListeners: (opts: WalletEventListeners, client: Client) => void;
 export declare const teardownWalletConnectEventListeners: (client: Client) => void;
 /**
  * Initialize a client from a stored session and terminate the connection.
@@ -18,6 +17,5 @@ export declare const getDeepLink: (uri: string, metadata: WalletSchema, { remove
 }) => string;
 export declare const createSession: (client: Client) => Promise<PayloadParams>;
 export declare const useDeepLink: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => void;
-export declare const fetchWalletConnectCosmosPublicAddress: (metadata: WalletSchema, wcClient: Client, provider: KeplrWalletConnectV1, opts: FetchPublicAddressOpts & Required<Pick<FetchPublicAddressOpts, 'chainId'>>) => Promise<string>;
 export declare const fetchWalletConnectEVMPublicAddress: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => Promise<string | undefined>;
 export declare const signWalletConnectPersonalMessage: (messageToSign: string, metadata: WalletSchema, client: Client, rpcProvider?: () => Promise<ethers.providers.JsonRpcProvider | undefined>) => Promise<string | undefined>;

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

@@ -1,9 +1,9 @@
 import { __awaiter } from 'tslib';
 import Client from '@walletconnect/client';
 import { Contract, ethers } from 'ethers';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { isMobile, isIOS } from '../../../utils/isMobile.js';
 import { isSameAddress } from '../../../utils/isSameAddress/isSameAddress.js';
-import { logger } from '../../../utils/logger.js';
 
 const initClient = (name, settings) => {
     const storageId = `walletconnect-${name}`;
@@ -18,9 +18,7 @@ const initClient = (name, settings) => {
  */
 const setupWalletConnectEventListeners = (opts, client) => {
     if (!client) {
-        return () => {
-            // nothing to teardown
-        };
+        return;
     }
     let prevAccount;
     let prevChain;
@@ -49,10 +47,6 @@ const setupWalletConnectEventListeners = (opts, client) => {
             yield ((_c = opts.onChainChange) === null || _c === void 0 ? void 0 : _c.call(opts, String(chainId)));
         }
     }));
-    return () => {
-        client.off('disconnect');
-        client.off('session_update');
-    };
 };
 const teardownWalletConnectEventListeners = (client) => {
     client.off('disconnect');
@@ -93,19 +87,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) => {
@@ -121,22 +110,8 @@ const useDeepLink = (metadata, wcClient, opts) => {
         (_c = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _c === void 0 ? void 0 : _c.call(opts, wcClient.uri);
     }
 };
-const fetchWalletConnectCosmosPublicAddress = (metadata, wcClient, provider, opts) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    if (wcClient.connected) {
-        const key = yield provider.getKey(opts.chainId);
-        return key.bech32Address;
-    }
-    yield wcClient.createSession();
-    useDeepLink(metadata, wcClient, opts);
-    const payload = yield createSession(wcClient);
-    const key = yield provider.getKey(opts.chainId);
-    (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
-    wcClient.accounts = [key.bech32Address];
-    return key.bech32Address;
-});
 const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => __awaiter(void 0, void 0, void 0, function* () {
-    var _b;
+    var _a;
     if (wcClient.connected) {
         const [accountPublicAddress] = wcClient.accounts;
         return accountPublicAddress;
@@ -145,14 +120,14 @@ const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => __await
     yield wcClient.createSession();
     useDeepLink(metadata, wcClient, opts);
     const payload = yield createSession(wcClient);
-    (_b = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _b === void 0 ? void 0 : _b.call(opts, payload);
+    (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
     const [accountPublicAddress] = payload.params[0].accounts;
     return accountPublicAddress;
 });
 const signWalletConnectPersonalMessage = (messageToSign, metadata, client, rpcProvider) => __awaiter(void 0, void 0, void 0, function* () {
-    var _c, _d;
-    const isCryptoWallet = ((_c = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _c === void 0 ? void 0 : _c.name) === 'Crypto.com | DeFi Wallet' ||
-        ((_d = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _d === void 0 ? void 0 : _d.name) === 'DeFi Wallet';
+    var _b, _c;
+    const isCryptoWallet = ((_b = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _b === void 0 ? void 0 : _b.name) === 'Crypto.com | DeFi Wallet' ||
+        ((_c = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _c === void 0 ? void 0 : _c.name) === 'DeFi Wallet';
     if (!client || !client.connected) {
         return;
     }
@@ -196,11 +171,11 @@ const IS_VALID_SIGNATURE_ABI = [
     'function isValidSignature(bytes32 _message, bytes _signature) public view returns (bytes4)',
 ];
 const waitForSafeTransactionOrTimeout = (accountPublicAddress, signature, messageToSign, client, rpcProvider) => __awaiter(void 0, void 0, void 0, function* () {
-    var _e;
+    var _d;
     if (signature === '0x' &&
         // this is what wallet connect client returns there's no `safe` or `Safe`
         // exact string anywhere, so this seems like the best proxy
-        ((_e = client.peerMeta) === null || _e === void 0 ? void 0 : _e.name) === 'WalletConnect Safe App') {
+        ((_d = client.peerMeta) === null || _d === void 0 ? void 0 : _d.name) === 'WalletConnect Safe App') {
         if (!rpcProvider) {
             return;
         }
@@ -235,4 +210,4 @@ const waitForSafeTransaction = (signature, messageToSign, contract) => __awaiter
     }
 });
 
-export { createSession, fetchWalletConnectCosmosPublicAddress, fetchWalletConnectEVMPublicAddress, getDeepLink, initClient, killWalletConnectSession, setupWalletConnectEventListeners, signWalletConnectPersonalMessage, teardownWalletConnectEventListeners, useDeepLink };
+export { createSession, fetchWalletConnectEVMPublicAddress, getDeepLink, initClient, killWalletConnectSession, setupWalletConnectEventListeners, signWalletConnectPersonalMessage, teardownWalletConnectEventListeners, useDeepLink };