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

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 
+## [0.17.0-RC.9](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.0-RC.8...v0.17.0-RC.9) (2023-05-05)
+
+
+### Features
+
+* **DYN-2231:** show in the user profile all existing fields ([#1988](https://github.com/dynamic-labs/DynamicAuth/issues/1988)) ([1f8cee2](https://github.com/dynamic-labs/DynamicAuth/commit/1f8cee22cf8338bd518961288c570c40e807cd52))
+* **TransactionModal:** add insufficient funds warning ([#2031](https://github.com/dynamic-labs/DynamicAuth/issues/2031)) ([bf868e2](https://github.com/dynamic-labs/DynamicAuth/commit/bf868e239e74f4cd0ceda5e09b7538d97d4e431d))
+
+
+### Bug Fixes
+
+* **DYN-1820:** use missing_from_list error code ([#2040](https://github.com/dynamic-labs/DynamicAuth/issues/2040)) ([92c7ad5](https://github.com/dynamic-labs/DynamicAuth/commit/92c7ad565376573d963c65fa821c97a2102ec8d7))
+* **MagicClientNetworkHandler:** save last used network id ([#2045](https://github.com/dynamic-labs/DynamicAuth/issues/2045)) ([6e1c571](https://github.com/dynamic-labs/DynamicAuth/commit/6e1c57127a824cd02d4b785fb8a387e4f221f044))
+* **TransactionModal:** ensure alchemy will not fail when estimating for gas ([#2034](https://github.com/dynamic-labs/DynamicAuth/issues/2034)) ([86c0d7c](https://github.com/dynamic-labs/DynamicAuth/commit/86c0d7cc7b20ff12bc9fc2e33961e177d9decf2a))
+
 ## [0.17.0-RC.8](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.0-RC.7...v0.17.0-RC.8) (2023-05-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/multi-wallet",
-  "version": "0.17.0-RC.8",
+  "version": "0.17.0-RC.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -11,28 +11,23 @@
     "deepmerge": "^4.3.1",
     "@dynamic-labs/sdk-api": "0.0.183",
     "@dynamic-labs/wallet-book": "^0.0.14",
-    "@magic-ext/oauth": "^10.2.0",
     "starknet": "^3.19.0",
     "ethers": "^5.7.2",
     "@randlabs/myalgo-connect": "^1.4.2",
     "@solana/web3.js": "^1.70.1",
-    "@coinbase/wallet-sdk": "^3.6.4",
     "@walletconnect/client": "^1.8.0",
     "@walletconnect/utils": "^1.8.0",
-    "@blocto/sdk": "^0.3.3",
     "@onflow/fcl": "^1.3.2",
     "get-starknet": "^1.5.0",
-    "@walletconnect/ethereum-provider": "^1.8.0",
-    "@walletconnect/universal-provider": "^2.4.2",
     "tslib": "^2.4.1",
-    "magic-sdk": "^16.0.1",
     "@keplr-wallet/provider": "0.11.56",
     "@keplr-wallet/types": "^0.11.51",
-    "@dynamic-labs/logger": "0.17.0-RC.8",
-    "@dynamic-labs/rpc-providers": "0.17.0-RC.8",
-    "@dynamic-labs/types": "0.17.0-RC.8",
-    "@dynamic-labs/utils": "0.17.0-RC.8",
-    "@dynamic-labs/wallet-connector-core": "0.17.0-RC.8"
+    "@dynamic-labs/ethereum-all": "0.17.0-RC.9",
+    "@dynamic-labs/magic": "0.17.0-RC.9",
+    "@dynamic-labs/rpc-providers": "0.17.0-RC.9",
+    "@dynamic-labs/types": "0.17.0-RC.9",
+    "@dynamic-labs/utils": "0.17.0-RC.9",
+    "@dynamic-labs/wallet-connector-core": "0.17.0-RC.9"
   },
   "devDependencies": {
     "@walletconnect/types": "^2.2.1"

package/src/index.cjs

@@ -4,61 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('./polyfills.cjs');
 var multiWallet = require('./multi-wallet.cjs');
-var EmailMagicWalletConnector = require('./wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.cjs');
-var MagicWalletConnector = require('./wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.cjs');
-var EmailOTPMagicWalletConnector = require('./wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.cjs');
-var MagicClientNetworkHandler = require('./wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.cjs');
-var MagicSocialWalletConnector = require('./wallets/ethereum/MagicConnector/MagicSocialWalletConnector/MagicSocialWalletConnector.cjs');
 var message = require('./utils/message.cjs');
-var isMobile = require('./utils/isMobile.cjs');
-var normalizeWalletName = require('./utils/normalizeWalletName/normalizeWalletName.cjs');
-var isEmailWalletConnector = require('./utils/isEmailWalletConnector/isEmailWalletConnector.cjs');
-var isEmailOTPWalletConnector = require('./utils/isEmailOTPWalletConnector/isEmailOTPWalletConnector.cjs');
-var isSocialWalletConnector = require('./utils/isSocialWalletConnector/isSocialWalletConnector.cjs');
-var getChainInfo = require('./utils/getChainInfo/getChainInfo.cjs');
-var getWalletConnectorByName = require('./utils/getWalletConnectorByName.cjs');
-var walletConnect = require('./wallets/clients/walletConnect/walletConnect.cjs');
-var coinbase = require('./wallets/clients/coinbase/coinbase.cjs');
 var KeplrWalletConnector = require('./wallets/cosmos/KeplrWalletConnector.cjs');
-var isSameAddress = require('./utils/isSameAddress/isSameAddress.cjs');
 var constants = require('./wallets/constants.cjs');
 var phantomLedger = require('./wallets/solana/phantom-ledger.cjs');
 
 
 
-exports.filteredWalletConnectWallets = multiWallet.filteredWalletConnectWallets;
 exports.getEnabledWallets = multiWallet.getEnabledWallets;
 exports.getSupportedChainsForWalletConnector = multiWallet.getSupportedChainsForWalletConnector;
 exports.getSupportedWallets = multiWallet.getSupportedWallets;
-exports.EmailMagicWalletConnector = EmailMagicWalletConnector.EmailMagicWalletConnector;
-exports.MagicWalletConnector = MagicWalletConnector.MagicWalletConnector;
-exports.EmailOTPMagicWalletConnector = EmailOTPMagicWalletConnector.EmailOTPMagicWalletConnector;
-exports.MagicClientNetworkHandler = MagicClientNetworkHandler.MagicClientNetworkHandler;
-exports.MagicSocialWalletConnector = MagicSocialWalletConnector.MagicSocialWalletConnector;
 exports.generateMessageToSign = message.generateMessageToSign;
-exports.isIPad = isMobile.isIPad;
-exports.isIPhone = isMobile.isIPhone;
-exports.isMobile = isMobile.isMobile;
-exports.normalizeWalletName = normalizeWalletName.normalizeWalletName;
-exports.isEmailWalletConnector = isEmailWalletConnector.isEmailWalletConnector;
-exports.isEmailOTPWalletConnector = isEmailOTPWalletConnector.isEmailOTPWalletConnector;
-exports.isSocialWalletConnector = isSocialWalletConnector.isSocialWalletConnector;
-exports.getChainInfo = getChainInfo.getChainInfo;
-exports.getWalletConnectorByName = getWalletConnectorByName.getWalletConnectorByName;
-exports.createSession = walletConnect.createSession;
-exports.fetchWalletConnectEVMPublicAddress = walletConnect.fetchWalletConnectEVMPublicAddress;
-exports.getDeepLink = walletConnect.getDeepLink;
-exports.initClient = walletConnect.initClient;
-exports.killWalletConnectSession = walletConnect.killWalletConnectSession;
-exports.setupWalletConnectEventListeners = walletConnect.setupWalletConnectEventListeners;
-exports.signWalletConnectPersonalMessage = walletConnect.signWalletConnectPersonalMessage;
-exports.teardownWalletConnectEventListeners = walletConnect.teardownWalletConnectEventListeners;
-exports.useDeepLink = walletConnect.useDeepLink;
-exports.fetchPublicAddress = coinbase.fetchPublicAddress;
-exports.getCoinbaseProvider = coinbase.getCoinbaseProvider;
-exports.killCoinbaseSession = coinbase.killCoinbaseSession;
-exports.signMessage = coinbase.signMessage;
 exports.KeplrWalletConnector = KeplrWalletConnector.KeplrWalletConnector;
-exports.isSameAddress = isSameAddress.isSameAddress;
 exports.defaultStarknetTypedDataDomain = constants.DEFAULT_STARKNET_TYPED_DATA_DOMAIN;
 exports.phantomLedgerWalletName = phantomLedger.walletName;

package/src/index.d.ts

@@ -1,17 +1,6 @@
 import './polyfills';
 export * from './multi-wallet';
 export * from './types';
-export * from './wallets/ethereum/MagicConnector';
 export { generateMessageToSign } from './utils/message';
-export { isIPad, isIPhone, isMobile } from './utils/isMobile';
-export { normalizeWalletName } from './utils/normalizeWalletName';
-export { isEmailWalletConnector } from './utils/isEmailWalletConnector';
-export { isEmailOTPWalletConnector } from './utils/isEmailOTPWalletConnector';
-export { isSocialWalletConnector } from './utils/isSocialWalletConnector';
-export { getChainInfo } from './utils/getChainInfo';
-export { getWalletConnectorByName } from './utils/getWalletConnectorByName';
-export * from './wallets/clients/walletConnect';
-export * from './wallets/clients/coinbase';
 export { KeplrWalletConnector } from './wallets/cosmos/KeplrWalletConnector';
-export * from './utils/isSameAddress';
 export { DEFAULT_STARKNET_TYPED_DATA_DOMAIN as defaultStarknetTypedDataDomain } from './wallets/constants';

package/src/index.js

@@ -1,21 +1,6 @@
 import './polyfills.js';
-export { filteredWalletConnectWallets, getEnabledWallets, getSupportedChainsForWalletConnector, getSupportedWallets } from './multi-wallet.js';
-export { EmailMagicWalletConnector } from './wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.js';
-export { MagicWalletConnector } from './wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.js';
-export { EmailOTPMagicWalletConnector } from './wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js';
-export { MagicClientNetworkHandler } from './wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js';
-export { MagicSocialWalletConnector } from './wallets/ethereum/MagicConnector/MagicSocialWalletConnector/MagicSocialWalletConnector.js';
+export { getEnabledWallets, getSupportedChainsForWalletConnector, getSupportedWallets } from './multi-wallet.js';
 export { generateMessageToSign } from './utils/message.js';
-export { isIPad, isIPhone, isMobile } from './utils/isMobile.js';
-export { normalizeWalletName } from './utils/normalizeWalletName/normalizeWalletName.js';
-export { isEmailWalletConnector } from './utils/isEmailWalletConnector/isEmailWalletConnector.js';
-export { isEmailOTPWalletConnector } from './utils/isEmailOTPWalletConnector/isEmailOTPWalletConnector.js';
-export { isSocialWalletConnector } from './utils/isSocialWalletConnector/isSocialWalletConnector.js';
-export { getChainInfo } from './utils/getChainInfo/getChainInfo.js';
-export { getWalletConnectorByName } from './utils/getWalletConnectorByName.js';
-export { createSession, fetchWalletConnectEVMPublicAddress, getDeepLink, initClient, killWalletConnectSession, setupWalletConnectEventListeners, signWalletConnectPersonalMessage, teardownWalletConnectEventListeners, useDeepLink } from './wallets/clients/walletConnect/walletConnect.js';
-export { fetchPublicAddress, getCoinbaseProvider, killCoinbaseSession, signMessage } from './wallets/clients/coinbase/coinbase.js';
 export { KeplrWalletConnector } from './wallets/cosmos/KeplrWalletConnector.js';
-export { isSameAddress } from './utils/isSameAddress/isSameAddress.js';
 export { DEFAULT_STARKNET_TYPED_DATA_DOMAIN as defaultStarknetTypedDataDomain } from './wallets/constants.js';
 export { walletName as phantomLedgerWalletName } from './wallets/solana/phantom-ledger.js';

package/src/multi-wallet.cjs

@@ -3,59 +3,29 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletBook = require('@dynamic-labs/wallet-book');
+var magic = require('@dynamic-labs/magic');
+var utils = require('@dynamic-labs/utils');
+var ethereumAll = require('@dynamic-labs/ethereum-all');
 var phantom = require('./wallets/solana/phantom.cjs');
-var coinbase = require('./wallets/ethereum/coinbase.cjs');
 var slope = require('./wallets/solana/slope.cjs');
 var solflare = require('./wallets/solana/solflare.cjs');
 var glow = require('./wallets/solana/glow.cjs');
 var blocto = require('./wallets/flow/blocto.cjs');
 var dapper = require('./wallets/flow/dapper.cjs');
-var isMobile = require('./utils/isMobile.cjs');
-var walletConnect = require('./utils/walletConnect.cjs');
 var MyAlgoWalletConnector = require('./wallets/algorand/MyAlgoWalletConnector.cjs');
-var BraveEvm = require('./wallets/ethereum/injected/BraveEvm.cjs');
-var Opera = require('./wallets/ethereum/injected/Opera.cjs');
 var BraveSol = require('./wallets/solana/injected/BraveSol.cjs');
-var UnknownInjectedWallet = require('./wallets/ethereum/injected/UnknownInjectedWallet.cjs');
-var GameStop = require('./wallets/ethereum/injected/GameStop.cjs');
-var ExodusEvm = require('./wallets/ethereum/injected/ExodusEvm.cjs');
 var ExodusSol = require('./wallets/solana/injected/ExodusSol.cjs');
-var BloctoInjected = require('./wallets/ethereum/injected/BloctoInjected.cjs');
 var argentx = require('./wallets/starknet/argentx.cjs');
 var braavos = require('./wallets/starknet/braavos.cjs');
-var BloctoEvm = require('./wallets/ethereum/BloctoEvm.cjs');
 var phantomLedger = require('./wallets/solana/phantom-ledger.cjs');
 var CoinbaseSolana = require('./wallets/solana/CoinbaseSolana.cjs');
-var Frame = require('./wallets/ethereum/injected/Frame.cjs');
 var lilico = require('./wallets/flow/lilico.cjs');
-var getWalletConnectConnector = require('./wallets/getWalletConnectConnector.cjs');
-var Dawn = require('./wallets/ethereum/injected/Dawn.cjs');
-var PhantomEvm = require('./wallets/ethereum/injected/PhantomEvm.cjs');
-require('magic-sdk');
-require('ethers');
-require('@dynamic-labs/wallet-connector-core');
-require('@dynamic-labs/utils');
-var EmailOTPMagicWalletConnector = require('./wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.cjs');
-var MagicSocialWalletConnector = require('./wallets/ethereum/MagicConnector/MagicSocialWalletConnector/MagicSocialWalletConnector.cjs');
-var isEmailWalletConnector = require('./utils/isEmailWalletConnector/isEmailWalletConnector.cjs');
-var Zerion = require('./wallets/ethereum/injected/Zerion.cjs');
-var Trust = require('./wallets/ethereum/injected/Trust.cjs');
 var KeplrWalletConnector = require('./wallets/cosmos/KeplrWalletConnector.cjs');
-var MetaMask = require('./wallets/ethereum/injected/MetaMask.cjs');
 var getApiProviders = require('./utils/getApiProviders.cjs');
 
 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');
@@ -85,53 +55,36 @@ const getSupportedWallets = (args) => tslib.__awaiter(void 0, void 0, void 0, fu
         cosmosNetworks: cosmosNetworkConfigs,
         evmNetworks: evmNetworkConfigs,
         isWalletConnectV2Enabled,
+        projectId: walletConnectProjectId,
         solNetworks: solanaNetworkConfigs,
         walletUiUtils: walletUiUtils || defaultWalletUiUtils,
     };
-    const walletConnectWallets = walletConnect.fetchWalletConnectWallets({
-        isV2Enabled: isWalletConnectV2Enabled,
-    }).map((WalletConnect) => new WalletConnect(opts));
-    // temporary hack to filter out metamask, which currently has walletconnect
-    // functionality built-in
-    const filtered = walletConnectWallets.filter(({ name }) => !filteredWalletConnectWallets.includes(name));
+    const importedWallets = [
+        ...ethereumAll.EthereumWalletConnectors(opts),
+    ].map((wallet) => new wallet(opts));
     const allWallets = [
-        new Dawn(opts),
+        ...importedWallets,
         new phantom(opts),
-        new MetaMask(opts),
-        new Trust(opts),
-        new PhantomEvm(opts),
         new phantomLedger["default"](opts),
-        new coinbase(opts),
         new solflare(opts),
         new glow(opts),
         new slope(opts),
         new dapper(opts),
         new blocto(opts),
-        new BloctoEvm(opts),
-        new BloctoInjected(opts),
-        getWalletConnectConnector.getWalletConnectConnector(Object.assign(Object.assign({}, opts), { isWalletConnectV2Enabled, projectId: walletConnectProjectId })),
         new BraveSol(opts),
-        new BraveEvm(opts),
-        new UnknownInjectedWallet(opts),
-        new GameStop(opts),
-        new ExodusEvm(opts),
         new ExodusSol(opts),
-        new Opera(opts),
         ...(((_a = apiProviders.magicLink) === null || _a === void 0 ? void 0 : _a.providerProjectId)
             ? [
-                new EmailOTPMagicWalletConnector.EmailOTPMagicWalletConnector(Object.assign({}, opts)),
-                new MagicSocialWalletConnector.MagicSocialWalletConnector(Object.assign({}, opts)),
+                new magic.EmailOTPMagicWalletConnector(Object.assign({}, opts)),
+                new magic.MagicSocialWalletConnector(Object.assign({}, opts)),
             ]
             : []),
         new MyAlgoWalletConnector(),
         new argentx(),
         new braavos(),
         new CoinbaseSolana(opts),
-        new Frame(opts),
         new lilico(opts),
-        new Zerion(opts),
         new KeplrWalletConnector.KeplrWalletConnector(opts),
-        ...filtered,
     ].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
@@ -151,20 +104,20 @@ const filterWalletsForPlatform = (wallets) => wallets.filter((wallet) => {
     if (wallet.isInstalledOnBrowser()) {
         return true;
     }
-    else if (isEmailWalletConnector.isEmailWalletConnector(wallet)) {
+    else if (walletConnectorCore.isEmailWalletConnector(wallet)) {
         return true;
     }
     else if (metadata.showOnlyIfInstalled) {
         return false;
     }
-    else if (!isMobile.isMobile()) {
+    else if (!utils.isMobile()) {
         return true;
     }
     else {
-        return handleMobileWalletFilter(wallet, metadata);
+        return handleMobileWalletFilter(metadata);
     }
 });
-const handleMobileWalletFilter = (wallet, metadata) => {
+const handleMobileWalletFilter = (metadata) => {
     if (!metadata.mobile)
         return false;
     /**
@@ -180,7 +133,7 @@ const handleMobileWalletFilter = (wallet, metadata) => {
      * if a wallet has a non-empty value for ios, that means that wallet has an ios app
      * and we support that app. the same goes for android
      */
-    if (isMobile.isIPad() || isMobile.isIPhone()) {
+    if (utils.isIPad() || utils.isIPhone()) {
         const hasIOSLink = metadata.mobile.iosId !== undefined;
         return !isWalletConnectWallet
             ? hasIOSLink
@@ -232,7 +185,6 @@ const getEnabledWallets = (props) => tslib.__awaiter(void 0, void 0, void 0, fun
 });
 
 exports.phantomLedgerWalletName = phantomLedger.walletName;
-exports.filteredWalletConnectWallets = filteredWalletConnectWallets;
 exports.getEnabledWallets = getEnabledWallets;
 exports.getSupportedChainsForWalletConnector = getSupportedChainsForWalletConnector;
 exports.getSupportedWallets = getSupportedWallets;

package/src/multi-wallet.d.ts

@@ -1,7 +1,6 @@
 import { Chain, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { GetSupportedWallets, GetSupportedWalletsOpts } from './types';
 export { walletName as phantomLedgerWalletName } from './wallets/solana/phantom-ledger';
-export declare const filteredWalletConnectWallets: string[];
 export declare const getSupportedWallets: GetSupportedWallets;
 export declare const getSupportedChainsForWalletConnector: (walletConnector: WalletConnector) => Chain[];
 export declare const getEnabledWallets: (props: {

package/src/multi-wallet.js

@@ -1,58 +1,28 @@
 import { __awaiter } from 'tslib';
+import { isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { EmailOTPMagicWalletConnector, MagicSocialWalletConnector } from '@dynamic-labs/magic';
+import { isMobile, isIPad, isIPhone } from '@dynamic-labs/utils';
+import { EthereumWalletConnectors } from '@dynamic-labs/ethereum-all';
 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 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 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 '@dynamic-labs/utils';
-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 Zerion from './wallets/ethereum/injected/Zerion.js';
-import Trust from './wallets/ethereum/injected/Trust.js';
 import { KeplrWalletConnector } from './wallets/cosmos/KeplrWalletConnector.js';
-import MetaMask from './wallets/ethereum/injected/MetaMask.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');
@@ -82,38 +52,24 @@ const getSupportedWallets = (args) => __awaiter(void 0, void 0, void 0, function
         cosmosNetworks: cosmosNetworkConfigs,
         evmNetworks: evmNetworkConfigs,
         isWalletConnectV2Enabled,
+        projectId: walletConnectProjectId,
         solNetworks: solanaNetworkConfigs,
         walletUiUtils: walletUiUtils || defaultWalletUiUtils,
     };
-    const walletConnectWallets = fetchWalletConnectWallets({
-        isV2Enabled: isWalletConnectV2Enabled,
-    }).map((WalletConnect) => new WalletConnect(opts));
-    // temporary hack to filter out metamask, which currently has walletconnect
-    // functionality built-in
-    const filtered = walletConnectWallets.filter(({ name }) => !filteredWalletConnectWallets.includes(name));
+    const importedWallets = [
+        ...EthereumWalletConnectors(opts),
+    ].map((wallet) => new wallet(opts));
     const allWallets = [
-        new Dawn(opts),
+        ...importedWallets,
         new Phantom(opts),
-        new MetaMask(opts),
-        new Trust(opts),
-        new PhantomEvm(opts),
         new PhantomLedger(opts),
-        new Coinbase(opts),
         new Solflare(opts),
         new Glow(opts),
         new Slope(opts),
         new Dapper(opts),
         new Blocto(opts),
-        new BloctoEvm(opts),
-        new BloctoInjected(opts),
-        getWalletConnectConnector(Object.assign(Object.assign({}, opts), { isWalletConnectV2Enabled, projectId: walletConnectProjectId })),
         new BraveSol(opts),
-        new BraveEvm(opts),
-        new UnknownInjectedWallet(opts),
-        new GameStop(opts),
-        new ExodusEvm(opts),
         new ExodusSol(opts),
-        new Opera(opts),
         ...(((_a = apiProviders.magicLink) === null || _a === void 0 ? void 0 : _a.providerProjectId)
             ? [
                 new EmailOTPMagicWalletConnector(Object.assign({}, opts)),
@@ -124,11 +80,8 @@ const getSupportedWallets = (args) => __awaiter(void 0, void 0, void 0, function
         new ArgentX(),
         new Braavos(),
         new CoinbaseSolana(opts),
-        new Frame(opts),
         new Lilico(opts),
-        new Zerion(opts),
         new KeplrWalletConnector(opts),
-        ...filtered,
     ].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
@@ -158,10 +111,10 @@ 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;
     /**
@@ -228,4 +181,4 @@ const getEnabledWallets = (props) => __awaiter(void 0, void 0, void 0, function*
     return allEnabledWallets;
 });
 
-export { filteredWalletConnectWallets, getEnabledWallets, getSupportedChainsForWalletConnector, getSupportedWallets };
+export { getEnabledWallets, getSupportedChainsForWalletConnector, getSupportedWallets };

package/src/types.d.ts

@@ -1,4 +1,3 @@
-import { OAuthProvider } from '@magic-ext/oauth';
 import type { Provider } from '@dynamic-labs/sdk-api';
 import { WalletConnector, Chain } from '@dynamic-labs/wallet-connector-core';
 import { NetworkConfigurationMap, WalletUiUtils } from '@dynamic-labs/types';
@@ -25,4 +24,3 @@ export type ChainWihtIcon = {
     icon?: string;
     name: string | undefined;
 };
-export type SocialOAuthProvider = OAuthProvider;

package/src/utils/message.cjs

@@ -4,14 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var utils = require('ethers/lib/utils');
 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, }) => {
     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:

package/src/utils/message.js

@@ -1,6 +1,5 @@
 import { getAddress } from 'ethers/lib/utils.js';
-import { logger } from '@dynamic-labs/wallet-connector-core';
-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

@@ -4,8 +4,6 @@ var tslib = require('tslib');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
-var walletConnect = require('../clients/walletConnect/walletConnect.cjs');
-var isMobile = require('../../utils/isMobile.cjs');
 var wcClient = require('./wcClient.cjs');
 var wcClient_lib = require('./wcClient.lib.cjs');
 
@@ -161,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 wcClient_lib.getDeepLink(this.getClient().uri, wallet, {
-            removeWCUri: isMobile.isIOS() && this.key === 'cryptocom',
+            removeWCUri: utils.isIOS() && this.key === 'cryptocom',
         });
     }
     getRpcProvider() {
@@ -181,14 +179,14 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
         return this.getProvider();
     }
     setupEventListeners(listeners) {
-        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

@@ -2,11 +2,14 @@ import Client from '@walletconnect/client';
 import { OfflineAminoSigner } from '@keplr-wallet/types';
 import { Chain, FetchPublicAddressOpts, WalletConnectorBase, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
-import { SwitchNetworkOps } from '../ethereum/EthWalletConnector';
 import { KeplrWalletConnectV1 } from './wcClient';
 export type KeplrWalletConnectProps = {
     cosmosNetworks: GenericNetwork[];
 };
+export type SwitchNetworkOps = {
+    networkChainId?: number;
+    networkName?: string;
+};
 declare class KeplrWalletConnect extends WalletConnectorBase {
     constructor(props: KeplrWalletConnectProps);
     name: string;

package/src/wallets/cosmos/KeplrWalletConnect.js

@@ -1,11 +1,9 @@
 import { __awaiter } from 'tslib';
 import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { parseEvmNetworks, parseChainId } from '@dynamic-labs/utils';
-import { setupWalletConnectEventListeners, teardownWalletConnectEventListeners } from '../clients/walletConnect/walletConnect.js';
-import { isMobile, isIOS } from '../../utils/isMobile.js';
+import { parseEvmNetworks, parseChainId, isMobile, isIOS } from '@dynamic-labs/utils';
 import { KeplrWalletConnectV1 } from './wcClient.js';
-import { initClient, fetchWalletConnectCosmosPublicAddress, killWalletConnectSession, getDeepLink } from './wcClient.lib.js';
+import { initClient, fetchWalletConnectCosmosPublicAddress, killWalletConnectSession, getDeepLink, setupWalletConnectEventListeners, teardownWalletConnectEventListeners } from './wcClient.lib.js';
 
 const DYNAMIC_KEPLR_NETWORK_ID = 'dynamic_keplr_wc_network_id';
 class KeplrWalletConnect extends WalletConnectorBase {

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

@@ -1,8 +1,7 @@
 import { Keplr as KeplrWallet } from '@keplr-wallet/types';
 import { Chain, WalletConnectorBase, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
-import { SwitchNetworkOps } from '../ethereum/EthWalletConnector';
-import KeplrWalletConnect from './KeplrWalletConnect';
+import KeplrWalletConnect, { SwitchNetworkOps } from './KeplrWalletConnect';
 export interface IFetchBalanceResponse {
     balances: IFetchBalanceBalance[];
     pagination: IFetchBalancePagination;