@dynamic-labs/multi-wallet 0.17.0-RC.1 → 0.17.0-RC.10

package/src/multi-wallet.js

@@ -1,59 +1,20 @@
 import { __awaiter } from 'tslib';
+import { isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
-import Phantom from './wallets/solana/phantom.js';
-import Coinbase from './wallets/ethereum/coinbase.js';
-import Slope from './wallets/solana/slope.js';
-import Solflare from './wallets/solana/solflare.js';
-import Glow from './wallets/solana/glow.js';
+import { EmailOTPMagicWalletConnector, MagicSocialWalletConnector } from '@dynamic-labs/magic';
+import { isMobile, isIPad, isIPhone } from '@dynamic-labs/utils';
+import { EthereumWalletConnectors } from '@dynamic-labs/ethereum-all';
+import { AlgorandWalletConnectors } from '@dynamic-labs/algorand-all';
+import { SolanaWalletConnectors } from '@dynamic-labs/solana-all';
 import Blocto from './wallets/flow/blocto.js';
 import Dapper from './wallets/flow/dapper.js';
-import { isMobile, isIPad, isIPhone } from './utils/isMobile.js';
-import { fetchWalletConnectWallets } from './utils/walletConnect.js';
-import MyAlgoWalletConnector from './wallets/algorand/MyAlgoWalletConnector.js';
-import BraveEvm from './wallets/ethereum/injected/BraveEvm.js';
-import Opera from './wallets/ethereum/injected/Opera.js';
-import BraveSol from './wallets/solana/injected/BraveSol.js';
-import UnknownInjectedWallet from './wallets/ethereum/injected/UnknownInjectedWallet.js';
-import GameStop from './wallets/ethereum/injected/GameStop.js';
-import ExodusEvm from './wallets/ethereum/injected/ExodusEvm.js';
-import ExodusSol from './wallets/solana/injected/ExodusSol.js';
-import BloctoInjected from './wallets/ethereum/injected/BloctoInjected.js';
 import ArgentX from './wallets/starknet/argentx.js';
 import Braavos from './wallets/starknet/braavos.js';
-import BloctoEvm from './wallets/ethereum/BloctoEvm.js';
-import PhantomLedger from './wallets/solana/phantom-ledger.js';
-export { walletName as phantomLedgerWalletName } from './wallets/solana/phantom-ledger.js';
-import CoinbaseSolana from './wallets/solana/CoinbaseSolana.js';
-import Frame from './wallets/ethereum/injected/Frame.js';
-import Fortmatic from './wallets/ethereum/fortmatic.js';
 import Lilico from './wallets/flow/lilico.js';
-import { getWalletConnectConnector } from './wallets/getWalletConnectConnector.js';
-import Dawn from './wallets/ethereum/injected/Dawn.js';
-import PhantomEvm from './wallets/ethereum/injected/PhantomEvm.js';
-import 'magic-sdk';
-import 'ethers';
-import '@dynamic-labs/wallet-connector-core';
-import './utils/logger.js';
-import { EmailOTPMagicWalletConnector } from './wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js';
-import { MagicSocialWalletConnector } from './wallets/ethereum/MagicConnector/MagicSocialWalletConnector/MagicSocialWalletConnector.js';
-import { isEmailWalletConnector } from './utils/isEmailWalletConnector/isEmailWalletConnector.js';
-import { getKeplerConnector } from './wallets/cosmos/getKeplrConnector.js';
-import Zerion from './wallets/ethereum/injected/Zerion.js';
-import { getMobileOrInjectedWallet } from './wallets/getMobileOrInjectedWallet.js';
-import MetaMask from './wallets/ethereum/meta-mask.js';
-import Trust from './wallets/ethereum/injected/Trust.js';
+import { KeplrWalletConnector } from './wallets/cosmos/KeplrWalletConnector.js';
+import { getApiProviders } from './utils/getApiProviders.js';
 
 let wallets = [];
-// These wallets are either not supported or implement their
-// own WalletConnect connector
-const filteredWalletConnectWallets = [
-    'MetaMask',
-    'Gnosis Safe',
-    'Trust',
-    'lilico',
-    'Keplr',
-    'Zerion',
-];
 const defaultWalletUiUtils = {
     enableInternalSign: () => {
         throw Error('enableInternalSign, not implemented');
@@ -65,106 +26,48 @@ const defaultWalletUiUtils = {
         throw Error('signMessage not implemented');
     },
 };
-const getSupportedWallets = ({ appLogoUrl, appName, isWalletConnectV2Enabled, networkConfigurations, skipMemo, vendorCredentials, walletConnectProjectId, walletUiUtils, magicLinkApiKey, magicLinkConfig, } = {
-    appLogoUrl: '',
-    appName: '',
-    isWalletConnectV2Enabled: false,
-    networkConfigurations: { cosmos: [], evm: [], solana: [], starknet: [] },
-    skipMemo: false,
-    vendorCredentials: {},
-    walletConnectProjectId: '',
-}) => __awaiter(void 0, void 0, void 0, function* () {
+const getSupportedWallets = (args) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const { appLogoUrl = '', appName = '', chainRpcProviders, isWalletConnectV2Enabled = false, networkConfigurations = { cosmos: [], evm: [], solana: [], starknet: [] }, customerApiProviders = [], skipMemo = false, walletConnectProjectId = '', walletUiUtils = undefined, } = args;
     if (!skipMemo && wallets.length > 0) {
         return wallets;
     }
     const evmNetworkConfigs = (networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations.evm) || [];
     const solanaNetworkConfigs = (networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations.solana) || [];
     const cosmosNetworkConfigs = (networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations.cosmos) || [];
-    const walletConnectWallets = fetchWalletConnectWallets(evmNetworkConfigs, isWalletConnectV2Enabled);
-    // temporary hack to filter out metamask, which currently has walletconnect
-    // functionality built-in
-    const filtered = walletConnectWallets.filter(({ name }) => !filteredWalletConnectWallets.includes(name));
+    const apiProviders = getApiProviders(customerApiProviders);
+    const opts = {
+        apiProviders,
+        appLogoUrl,
+        appName,
+        chainRpcProviders,
+        cosmosNetworks: cosmosNetworkConfigs,
+        evmNetworks: evmNetworkConfigs,
+        isWalletConnectV2Enabled,
+        projectId: walletConnectProjectId,
+        solNetworks: solanaNetworkConfigs,
+        walletUiUtils: walletUiUtils || defaultWalletUiUtils,
+    };
+    const importedWallets = [
+        ...EthereumWalletConnectors(opts),
+        ...AlgorandWalletConnectors(opts),
+        ...SolanaWalletConnectors(opts),
+    ].map((wallet) => new wallet(opts));
     const allWallets = [
-        new Dawn({ evmNetworks: evmNetworkConfigs }),
-        new Phantom({ solNetworks: solanaNetworkConfigs }),
-        getMobileOrInjectedWallet({
-            evmNetworks: evmNetworkConfigs,
-            injectedWallet: new MetaMask({ evmNetworks: evmNetworkConfigs }),
-            isWalletConnectV2: isWalletConnectV2Enabled,
-            walletConnectName: 'MetaMask',
-        }),
-        getMobileOrInjectedWallet({
-            evmNetworks: evmNetworkConfigs,
-            injectedWallet: new Trust({ evmNetworks: evmNetworkConfigs }),
-            isWalletConnectV2: isWalletConnectV2Enabled,
-            walletConnectName: 'Trust',
-        }),
-        new PhantomEvm({ evmNetworks: evmNetworkConfigs }),
-        new PhantomLedger({ solNetworks: solanaNetworkConfigs }),
-        new Coinbase({
-            appLogoUrl,
-            appName,
-            evmNetworks: evmNetworkConfigs,
-        }),
-        new Solflare({ solNetworks: solanaNetworkConfigs }),
-        new Glow({ solNetworks: solanaNetworkConfigs }),
-        new Slope({ solNetworks: solanaNetworkConfigs }),
-        new Dapper({ appLogoUrl, appName }),
-        new Blocto({ appLogoUrl, appName }),
-        new BloctoEvm({ evmNetworks: evmNetworkConfigs }),
-        new BloctoInjected({ evmNetworks: evmNetworkConfigs }),
-        getWalletConnectConnector({
-            evmNetworks: evmNetworkConfigs,
-            isWalletConnectV2Enabled,
-            projectId: walletConnectProjectId,
-        }),
-        new BraveSol({ solNetworks: solanaNetworkConfigs }),
-        new BraveEvm({ evmNetworks: evmNetworkConfigs }),
-        new UnknownInjectedWallet({ evmNetworks: evmNetworkConfigs }),
-        new GameStop({ evmNetworks: evmNetworkConfigs }),
-        new ExodusEvm({ evmNetworks: evmNetworkConfigs }),
-        new ExodusSol({ solNetworks: solanaNetworkConfigs }),
-        new Opera({ evmNetworks: evmNetworkConfigs }),
-        ...(magicLinkApiKey
+        ...importedWallets,
+        new Dapper(opts),
+        new Blocto(opts),
+        ...(((_a = apiProviders.magicLink) === null || _a === void 0 ? void 0 : _a.providerProjectId)
             ? [
-                new EmailOTPMagicWalletConnector({
-                    apiKey: magicLinkApiKey,
-                    config: magicLinkConfig,
-                    evmNetworks: evmNetworkConfigs,
-                    walletUiUtils: walletUiUtils || defaultWalletUiUtils,
-                }),
-                new MagicSocialWalletConnector({
-                    apiKey: magicLinkApiKey,
-                    config: magicLinkConfig,
-                    evmNetworks: evmNetworkConfigs,
-                    walletUiUtils: walletUiUtils || defaultWalletUiUtils,
-                }),
+                new EmailOTPMagicWalletConnector(Object.assign({}, opts)),
+                new MagicSocialWalletConnector(Object.assign({}, opts)),
             ]
             : []),
-        new MyAlgoWalletConnector(),
         new ArgentX(),
         new Braavos(),
-        new CoinbaseSolana({ solNetworks: solanaNetworkConfigs }),
-        new Frame({ evmNetworks: evmNetworkConfigs }),
-        new Lilico({ appLogoUrl, appName }),
-        getMobileOrInjectedWallet({
-            evmNetworks: evmNetworkConfigs,
-            injectedWallet: new Zerion({ evmNetworks: evmNetworkConfigs }),
-            isWalletConnectV2: isWalletConnectV2Enabled,
-            walletConnectName: 'Zerion',
-        }),
-        //TODO: https://linear.app/dynamic-labs/issue/DYN-2127/rename-evmnetworks-to-networks-across-the-application
-        getKeplerConnector({ evmNetworks: cosmosNetworkConfigs }),
-        ...((vendorCredentials === null || vendorCredentials === void 0 ? void 0 : vendorCredentials.fortmatic)
-            ? [
-                new Fortmatic({
-                    apiKey: vendorCredentials.fortmatic,
-                    evmNetworks: evmNetworkConfigs,
-                }),
-            ]
-            : []),
-        ...filtered,
-    ];
+        new Lilico(opts),
+        new KeplrWalletConnector(opts),
+    ].map((wallet) => wallet.getMobileOrInstalledWallet());
     yield Promise.all(allWallets.map((wallet) => { var _a; return (_a = wallet.init) === null || _a === void 0 ? void 0 : _a.call(wallet); }));
     // Memoize the wallets
     const filteredWallets = filterWalletsForPlatform(allWallets);
@@ -193,20 +96,12 @@ const filterWalletsForPlatform = (wallets) => wallets.filter((wallet) => {
         return true;
     }
     else {
-        return handleMobileWalletFilter(wallet, metadata);
+        return handleMobileWalletFilter(metadata);
     }
 });
-const handleMobileWalletFilter = (wallet, metadata) => {
+const handleMobileWalletFilter = (metadata) => {
     if (!metadata.mobile)
         return false;
-    /**
-     * Custom check added with DYN-1489 for mobile version only:
-     * it shows a WalletConnect listItem that wraps-up all the WalletConnect wallets
-     * in a new wallet-list view.
-     */
-    if (wallet.isWalletConnect && wallet.name === 'WalletConnect') {
-        return true;
-    }
     /**
      * WalletConnect provides a "universal" and "native" deep link. They recommend using
      * the universal deep link over the native one due to UX differences, and our current
@@ -265,14 +160,10 @@ const getSupportedChainsForWalletConnector = (walletConnector) => {
 };
 const getEnabledWallets = (props) => __awaiter(void 0, void 0, void 0, function* () {
     const supportedWallets = yield getSupportedWallets(props.getSupportedWalletOpts);
-    const isKeplrWalletEnabled = (wallet) => wallet.name.includes('Keplr') &&
-        props.enabledNetworks.includes(wallet.networkId) &&
-        wallet.isInstalledOnBrowser() === props.installed;
-    const allEnabledWallets = supportedWallets.filter((wallet) => isKeplrWalletEnabled(wallet) ||
-        (props.enabledChains.some((chain) => getSupportedChainsForWalletConnector(wallet).includes(chain)) &&
-            wallet.isInstalledOnBrowser() === props.installed) ||
+    const allEnabledWallets = supportedWallets.filter((wallet) => (props.enabledChains.some((chain) => getSupportedChainsForWalletConnector(wallet).includes(chain)) &&
+        wallet.isInstalledOnBrowser() === props.installed) ||
         wallet.key === 'magiclink');
     return allEnabledWallets;
 });
 
-export { filteredWalletConnectWallets, getEnabledWallets, getSupportedChainsForWalletConnector, getSupportedWallets };
+export { getEnabledWallets, getSupportedChainsForWalletConnector, getSupportedWallets };

package/src/types.d.ts

@@ -1,58 +1,19 @@
-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;
@@ -63,4 +24,3 @@ export type ChainWihtIcon = {
     icon?: string;
     name: string | undefined;
 };
-export type SocialOAuthProvider = OAuthProvider;

package/src/utils/convertors.cjs

@@ -4,12 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var constants = require('../wallets/constants.cjs');
 
-const bufferToBase64 = (buf) => {
-    const binstr = Array.prototype.map
-        .call(buf, (ch) => String.fromCharCode(ch))
-        .join('');
-    return btoa(binstr);
-};
 const defaultTypedData = Object.assign(Object.assign({}, constants.DEFAULT_STARKNET_TYPED_DATA_DOMAIN), { primaryType: 'Message', types: {
         Message: [
             {
@@ -39,5 +33,4 @@ const formatTypedDataMessage = (inputMessage, chainId = 'SN_MAIN') => {
     return Object.assign(Object.assign({}, defaultTypedData), { domain: Object.assign(Object.assign({}, defaultTypedData.domain), { chainId }), message });
 };
 
-exports.bufferToBase64 = bufferToBase64;
 exports.formatTypedDataMessage = formatTypedDataMessage;

package/src/utils/convertors.d.ts

@@ -1,3 +1,2 @@
 import { TypedData } from 'starknet/dist/utils/typedData';
-export declare const bufferToBase64: (buf: Uint8Array) => string;
 export declare const formatTypedDataMessage: (inputMessage: string, chainId?: 'SN_MAIN' | 'SN_GOERLI') => TypedData;

package/src/utils/convertors.js

@@ -1,11 +1,5 @@
 import { DEFAULT_STARKNET_TYPED_DATA_DOMAIN } from '../wallets/constants.js';
 
-const bufferToBase64 = (buf) => {
-    const binstr = Array.prototype.map
-        .call(buf, (ch) => String.fromCharCode(ch))
-        .join('');
-    return btoa(binstr);
-};
 const defaultTypedData = Object.assign(Object.assign({}, DEFAULT_STARKNET_TYPED_DATA_DOMAIN), { primaryType: 'Message', types: {
         Message: [
             {
@@ -35,4 +29,4 @@ const formatTypedDataMessage = (inputMessage, chainId = 'SN_MAIN') => {
     return Object.assign(Object.assign({}, defaultTypedData), { domain: Object.assign(Object.assign({}, defaultTypedData.domain), { chainId }), message });
 };
 
-export { bufferToBase64, formatTypedDataMessage };
+export { formatTypedDataMessage };

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,15 +3,14 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var utils = require('ethers/lib/utils');
-var logger = require('./logger.cjs');
-var getChainInfo = require('./getChainInfo/getChainInfo.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
 const generateMessageToSign = ({ blockchain, domain, chainId, nonce, uri, publicKey, issuedAt = new Date().toISOString(), statement, requestId, resources, }) => {
     var _a, _b;
     if (blockchain === 'STARK') {
         return nonce;
     }
-    const blockchainName = (_b = (_a = getChainInfo.getChainInfo(blockchain)) === null || _a === void 0 ? void 0 : _a.blockchainName) !== null && _b !== void 0 ? _b : 'Ethereum';
+    const blockchainName = (_b = (_a = walletConnectorCore.getChainInfo(blockchain)) === null || _a === void 0 ? void 0 : _a.blockchainName) !== null && _b !== void 0 ? _b : 'Ethereum';
     // This format follows the sign-in with ethereum (SIWE) standard,
     // but we are using it also for non-ethereum wallets for now (eg. Solana)
     // for more context on format and fields, please see:
@@ -48,7 +47,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,6 +1,5 @@
 import { getAddress } from 'ethers/lib/utils.js';
-import { logger } from './logger.js';
-import { getChainInfo } from './getChainInfo/getChainInfo.js';
+import { getChainInfo, logger } from '@dynamic-labs/wallet-connector-core';
 
 const generateMessageToSign = ({ blockchain, domain, chainId, nonce, uri, publicKey, issuedAt = new Date().toISOString(), statement, requestId, resources, }) => {
     var _a, _b;

package/src/wallets/constants.cjs

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const infuraId = '87939db78f824920ada5c872db3e56b8';
 const ETH_STARKNET_ADDRESS = '0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7';
 const DEFAULT_STARKNET_TYPED_DATA_DOMAIN = {
     domain: {
@@ -13,4 +12,3 @@ const DEFAULT_STARKNET_TYPED_DATA_DOMAIN = {
 
 exports.DEFAULT_STARKNET_TYPED_DATA_DOMAIN = DEFAULT_STARKNET_TYPED_DATA_DOMAIN;
 exports.ETH_STARKNET_ADDRESS = ETH_STARKNET_ADDRESS;
-exports.infuraId = infuraId;

package/src/wallets/constants.js

@@ -1,4 +1,3 @@
-const infuraId = '87939db78f824920ada5c872db3e56b8';
 const ETH_STARKNET_ADDRESS = '0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7';
 const DEFAULT_STARKNET_TYPED_DATA_DOMAIN = {
     domain: {
@@ -7,4 +6,4 @@ const DEFAULT_STARKNET_TYPED_DATA_DOMAIN = {
     },
 };
 
-export { DEFAULT_STARKNET_TYPED_DATA_DOMAIN, ETH_STARKNET_ADDRESS, infuraId };
+export { DEFAULT_STARKNET_TYPED_DATA_DOMAIN, ETH_STARKNET_ADDRESS };

package/src/wallets/cosmos/KeplrWalletConnect.cjs

@@ -3,16 +3,14 @@
 var tslib = require('tslib');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletBook = require('@dynamic-labs/wallet-book');
-var walletConnect = require('../clients/walletConnect/walletConnect.cjs');
-var isMobile = require('../../utils/isMobile.cjs');
-var logger = require('../../utils/logger.cjs');
+var utils = require('@dynamic-labs/utils');
 var wcClient = require('./wcClient.cjs');
+var wcClient_lib = require('./wcClient.lib.cjs');
 
 const DYNAMIC_KEPLR_NETWORK_ID = 'dynamic_keplr_wc_network_id';
 class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
-    constructor({ evmNetworks }) {
-        var _a;
-        super();
+    constructor(props) {
+        super(props);
         this.name = 'Keplr';
         this.isWalletConnect = true;
         this.canConnectViaQrCode = true;
@@ -29,22 +27,24 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
         };
         this.supportedChains = ['COSMOS'];
         this.connectedChain = 'COSMOS';
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = utils.parseEvmNetworks(props.cosmosNetworks);
         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 =
+                (this.evmNetworks[0] && utils.parseChainId(this.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 +58,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) {
@@ -70,7 +70,7 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
         if (this.client) {
             return this.client;
         }
-        this.client = walletConnect.initClient(this.key, this.clientOptions);
+        this.client = wcClient_lib.initClient(this.key, this.clientOptions);
         return this.client;
     }
     getNetwork() {
@@ -87,7 +87,7 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
                 localStorage.setItem(DYNAMIC_KEPLR_NETWORK_ID, networkChainId.toString());
             }
             catch (e) {
-                logger.logger.error(e);
+                walletConnectorCore.logger.error(e);
             }
         });
     }
@@ -115,7 +115,7 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const client = this.getClient();
             const keplr = this.getProvider();
-            return walletConnect.fetchWalletConnectCosmosPublicAddress(walletBook.getWalletBookWallet(this.name), client, keplr, Object.assign(Object.assign({}, opts), { chainId: this.chainId, onConnect: (payload) => {
+            return wcClient_lib.fetchWalletConnectCosmosPublicAddress(walletBook.getWalletBookWallet(this.name), client, keplr, Object.assign(Object.assign({}, opts), { chainId: this.chainId, onConnect: (payload) => {
                     var _a;
                     payload.params[0].chainId = this.selectedNetworkId;
                     (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
@@ -138,14 +138,14 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
                 return balance.toString();
             }
             catch (e) {
-                logger.logger.error(e);
+                walletConnectorCore.logger.error(e);
                 return '0';
             }
         });
     }
     endSession() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            walletConnect.killWalletConnectSession(this.getClient());
+            wcClient_lib.killWalletConnectSession(this.getClient());
         });
     }
     getConnectedAccounts() {
@@ -159,11 +159,11 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
     getDeepLink() {
         var _a;
         const wallet = walletBook.getWalletBookWallet(this.name);
-        if (!isMobile.isMobile() && !((_a = wallet.desktop) === null || _a === void 0 ? void 0 : _a.native)) {
+        if (!utils.isMobile() && !((_a = wallet.desktop) === null || _a === void 0 ? void 0 : _a.native)) {
             return undefined;
         }
-        return walletConnect.getDeepLink(this.getClient().uri, wallet, {
-            removeWCUri: isMobile.isIOS() && this.key === 'cryptocom',
+        return wcClient_lib.getDeepLink(this.getClient().uri, wallet, {
+            removeWCUri: utils.isIOS() && this.key === 'cryptocom',
         });
     }
     getRpcProvider() {
@@ -179,14 +179,14 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
         return this.getProvider();
     }
     setupEventListeners(listeners) {
-        return walletConnect.setupWalletConnectEventListeners({
+        wcClient_lib.setupWalletConnectEventListeners({
             onAccountChange: listeners.onAccountChange,
             onChainChange: listeners.onChainChange,
             onDisconnect: listeners.onDisconnect,
         }, this.getClient());
     }
     teardownEventListeners() {
-        walletConnect.teardownWalletConnectEventListeners(this.getClient());
+        wcClient_lib.teardownWalletConnectEventListeners(this.getClient());
     }
     supportsNetworkSwitching() {
         return true;

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

@@ -1,13 +1,17 @@
 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 { SwitchNetworkOps } from '../ethereum/EthWalletConnector';
+import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
 import { KeplrWalletConnectV1 } from './wcClient';
+export type KeplrWalletConnectProps = {
+    cosmosNetworks: GenericNetwork[];
+};
+export type SwitchNetworkOps = {
+    networkChainId?: number;
+    networkName?: string;
+};
 declare class KeplrWalletConnect extends WalletConnectorBase {
-    constructor({ evmNetworks }: {
-        evmNetworks: EvmNetwork[];
-    });
+    constructor(props: KeplrWalletConnectProps);
     name: string;
     isWalletConnect: boolean;
     canConnectViaQrCode: boolean;
@@ -22,7 +26,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;
@@ -39,7 +43,7 @@ declare class KeplrWalletConnect extends WalletConnectorBase {
     getRpcProvider(): Promise<unknown>;
     getSigner(): Promise<OfflineAminoSigner | undefined>;
     getWeb3Provider(): KeplrWalletConnectV1 | undefined;
-    setupEventListeners(listeners: WalletEventListeners): () => void;
+    setupEventListeners(listeners: WalletEventListeners): void;
     teardownEventListeners(): void;
     supportsNetworkSwitching(): boolean;
 }