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

package/src/wallets/cosmos/KeplrWalletConnect.cjs

@@ -3,16 +3,16 @@
 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 logger = require('../../utils/logger.cjs');
 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 +29,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 +60,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 +72,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 +89,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 +117,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 +140,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() {
@@ -162,7 +164,7 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
         if (!isMobile.isMobile() && !((_a = wallet.desktop) === null || _a === void 0 ? void 0 : _a.native)) {
             return undefined;
         }
-        return walletConnect.getDeepLink(this.getClient().uri, wallet, {
+        return wcClient_lib.getDeepLink(this.getClient().uri, wallet, {
             removeWCUri: isMobile.isIOS() && this.key === 'cryptocom',
         });
     }
@@ -179,7 +181,7 @@ class KeplrWalletConnect extends walletConnectorCore.WalletConnectorBase {
         return this.getProvider();
     }
     setupEventListeners(listeners) {
-        return walletConnect.setupWalletConnectEventListeners({
+        walletConnect.setupWalletConnectEventListeners({
             onAccountChange: listeners.onAccountChange,
             onChainChange: listeners.onChainChange,
             onDisconnect: listeners.onDisconnect,

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

@@ -1,13 +1,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 } from '../ethereum/evm-network';
+import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
 import { SwitchNetworkOps } from '../ethereum/EthWalletConnector';
 import { KeplrWalletConnectV1 } from './wcClient';
+export type KeplrWalletConnectProps = {
+    cosmosNetworks: GenericNetwork[];
+};
 declare class KeplrWalletConnect extends WalletConnectorBase {
-    constructor({ evmNetworks }: {
-        evmNetworks: EvmNetwork[];
-    });
+    constructor(props: KeplrWalletConnectProps);
     name: string;
     isWalletConnect: boolean;
     canConnectViaQrCode: boolean;
@@ -22,7 +23,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 +40,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;
 }

package/src/wallets/cosmos/KeplrWalletConnect.js

@@ -1,16 +1,16 @@
 import { __awaiter } from 'tslib';
-import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { initClient, fetchWalletConnectCosmosPublicAddress, killWalletConnectSession, getDeepLink, setupWalletConnectEventListeners, teardownWalletConnectEventListeners } from '../clients/walletConnect/walletConnect.js';
+import { parseEvmNetworks, parseChainId } from '@dynamic-labs/utils';
+import { setupWalletConnectEventListeners, teardownWalletConnectEventListeners } from '../clients/walletConnect/walletConnect.js';
 import { isMobile, isIOS } from '../../utils/isMobile.js';
-import { logger } from '../../utils/logger.js';
 import { KeplrWalletConnectV1 } from './wcClient.js';
+import { initClient, fetchWalletConnectCosmosPublicAddress, killWalletConnectSession, getDeepLink } from './wcClient.lib.js';
 
 const DYNAMIC_KEPLR_NETWORK_ID = 'dynamic_keplr_wc_network_id';
 class KeplrWalletConnect extends WalletConnectorBase {
-    constructor({ evmNetworks }) {
-        var _a;
-        super();
+    constructor(props) {
+        super(props);
         this.name = 'Keplr';
         this.isWalletConnect = true;
         this.canConnectViaQrCode = true;
@@ -27,22 +27,24 @@ class KeplrWalletConnect extends WalletConnectorBase {
         };
         this.supportedChains = ['COSMOS'];
         this.connectedChain = 'COSMOS';
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = 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] && 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) => 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) => parseChainId(network.networkId) === this.selectedNetworkId);
     }
     get lcdUrl() {
         var _a;
@@ -56,7 +58,7 @@ class KeplrWalletConnect extends WalletConnectorBase {
         if (!this.selectedNetwork) {
             return 'osmosis-1';
         }
-        return this.chainIdMap[this.selectedNetwork.chainId];
+        return this.chainIdMap[parseChainId(this.selectedNetwork.chainId)];
     }
     getProvider() {
         if (!this._keplrInstance) {
@@ -177,7 +179,7 @@ class KeplrWalletConnect extends WalletConnectorBase {
         return this.getProvider();
     }
     setupEventListeners(listeners) {
-        return setupWalletConnectEventListeners({
+        setupWalletConnectEventListeners({
             onAccountChange: listeners.onAccountChange,
             onChainChange: listeners.onChainChange,
             onDisconnect: listeners.onDisconnect,

package/src/wallets/cosmos/KeplrWalletConnector.cjs

@@ -4,14 +4,23 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var logger = require('../../utils/logger.cjs');
+var utils = require('@dynamic-labs/utils');
+var KeplrWalletConnect = require('./KeplrWalletConnect.cjs');
 
 const DYNAMIC_KEPLR_NETWORK_ID = 'dynamic_keplr_network_id';
 class KeplrWalletConnector extends walletConnectorCore.WalletConnectorBase {
-    constructor({ evmNetworks }) {
-        super();
+    getMobileOrInstalledWallet() {
+        if (this.isInstalledOnBrowser()) {
+            return this;
+        }
+        else {
+            return new KeplrWalletConnect(this.constructorProps);
+        }
+    }
+    constructor(props) {
+        super(props);
         this.switchNetworkOnlyFromWallet = true;
-        this.selectedNetworkId = 401;
+        this._selectedNetworkId = 401;
         this.name = 'Keplr';
         this.connectedChain = 'COSMOS';
         this.supportedChains = ['COSMOS'];
@@ -20,13 +29,19 @@ class KeplrWalletConnector extends walletConnectorCore.WalletConnectorBase {
             402: 'axelar-dojo-1',
             403: 'osmosis-1',
         };
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = utils.parseEvmNetworks(props.cosmosNetworks);
         this._handleAccountChange = this._handleAccountChange.bind(this);
         const persistedNetworkId = localStorage.getItem(DYNAMIC_KEPLR_NETWORK_ID);
         if (persistedNetworkId) {
             this.selectedNetworkId = Number(persistedNetworkId);
         }
     }
+    get selectedNetworkId() {
+        return this._selectedNetworkId;
+    }
+    set selectedNetworkId(networkId) {
+        this._selectedNetworkId = utils.parseChainId(networkId);
+    }
     getWeb3Provider() {
         return this.keplr;
     }
@@ -175,7 +190,7 @@ class KeplrWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 return balance.toString();
             }
             catch (e) {
-                logger.logger.error(e);
+                walletConnectorCore.logger.error(e);
                 return '0';
             }
         });

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

@@ -1,7 +1,8 @@
 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 { EvmNetwork } from '../ethereum/evm-network';
+import KeplrWalletConnect from './KeplrWalletConnect';
 export interface IFetchBalanceResponse {
     balances: IFetchBalanceBalance[];
     pagination: IFetchBalancePagination;
@@ -14,17 +15,21 @@ export interface IFetchBalancePagination {
     next_key: any;
     total: string;
 }
+export type KeplrWalletConnectorProps = {
+    cosmosNetworks: GenericNetwork[];
+};
 export declare class KeplrWalletConnector extends WalletConnectorBase {
     evmNetworks: EvmNetwork[];
     switchNetworkOnlyFromWallet: boolean;
-    selectedNetworkId: number;
+    private _selectedNetworkId;
     name: string;
     connectedChain: Chain;
     supportedChains: Chain[];
     chainIdMap: Record<number, string>;
-    constructor({ evmNetworks }: {
-        evmNetworks: EvmNetwork[];
-    });
+    getMobileOrInstalledWallet(): this | KeplrWalletConnect;
+    constructor(props: KeplrWalletConnectorProps);
+    get selectedNetworkId(): number;
+    set selectedNetworkId(networkId: number);
     getWeb3Provider(): KeplrWallet;
     getDeepLink(): string | undefined;
     get selectedNetwork(): EvmNetwork | undefined;

package/src/wallets/cosmos/KeplrWalletConnector.js

@@ -1,13 +1,22 @@
 import { __awaiter } from 'tslib';
-import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { logger } from '../../utils/logger.js';
+import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
+import { parseEvmNetworks, parseChainId } from '@dynamic-labs/utils';
+import KeplrWalletConnect from './KeplrWalletConnect.js';
 
 const DYNAMIC_KEPLR_NETWORK_ID = 'dynamic_keplr_network_id';
 class KeplrWalletConnector extends WalletConnectorBase {
-    constructor({ evmNetworks }) {
-        super();
+    getMobileOrInstalledWallet() {
+        if (this.isInstalledOnBrowser()) {
+            return this;
+        }
+        else {
+            return new KeplrWalletConnect(this.constructorProps);
+        }
+    }
+    constructor(props) {
+        super(props);
         this.switchNetworkOnlyFromWallet = true;
-        this.selectedNetworkId = 401;
+        this._selectedNetworkId = 401;
         this.name = 'Keplr';
         this.connectedChain = 'COSMOS';
         this.supportedChains = ['COSMOS'];
@@ -16,13 +25,19 @@ class KeplrWalletConnector extends WalletConnectorBase {
             402: 'axelar-dojo-1',
             403: 'osmosis-1',
         };
-        this.evmNetworks = evmNetworks;
+        this.evmNetworks = parseEvmNetworks(props.cosmosNetworks);
         this._handleAccountChange = this._handleAccountChange.bind(this);
         const persistedNetworkId = localStorage.getItem(DYNAMIC_KEPLR_NETWORK_ID);
         if (persistedNetworkId) {
             this.selectedNetworkId = Number(persistedNetworkId);
         }
     }
+    get selectedNetworkId() {
+        return this._selectedNetworkId;
+    }
+    set selectedNetworkId(networkId) {
+        this._selectedNetworkId = parseChainId(networkId);
+    }
     getWeb3Provider() {
         return this.keplr;
     }

package/src/wallets/cosmos/wcClient.lib.cjs

@@ -0,0 +1,100 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var Client = require('@walletconnect/client');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var isMobile = require('../../utils/isMobile.cjs');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var Client__default = /*#__PURE__*/_interopDefaultLegacy(Client);
+
+const initClient = (name, settings) => {
+    const storageId = `walletconnect-${name}`;
+    const session = localStorage.getItem(storageId);
+    const clientArgs = session
+        ? { session: JSON.parse(session), storageId }
+        : { bridge: 'https://bridge.walletconnect.org', storageId };
+    return new Client__default["default"](Object.assign(Object.assign({}, clientArgs), settings));
+};
+/**
+ * Initialize a client from a stored session and terminate the connection.
+ */
+const killWalletConnectSession = (client) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    try {
+        if (client === null || client === void 0 ? void 0 : client.connected) {
+            yield client.killSession();
+        }
+    }
+    catch (e) {
+        walletConnectorCore.logger.debug(e);
+    }
+});
+const useDeepLink = (metadata, wcClient, opts) => {
+    var _a, _b, _c;
+    const deepLink = getDeepLink(wcClient.uri, metadata);
+    if (isMobile.isMobile()) {
+        window.location.href = deepLink;
+    }
+    else {
+        if ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.desktop) === null || _a === void 0 ? void 0 : _a.native) {
+            (_b = opts === null || opts === void 0 ? void 0 : opts.onDesktopUri) === null || _b === void 0 ? void 0 : _b.call(opts, deepLink);
+        }
+        (_c = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _c === void 0 ? void 0 : _c.call(opts, wcClient.uri);
+    }
+};
+const getDeepLink = (uri, metadata, { removeWCUri = false, } = {}) => {
+    var _a, _b, _c, _d;
+    if (!isMobile.isMobile()) {
+        const origin = ((_a = metadata.desktop) === null || _a === void 0 ? void 0 : _a.universal) || ((_b = metadata.desktop) === null || _b === void 0 ? void 0 : _b.native);
+        if (removeWCUri)
+            return origin || '';
+        return `${origin}?uri=${encodeURIComponent(uri !== null && uri !== void 0 ? uri : '')}`;
+    }
+    // deeplinks for ios require special treatment
+    // see: https://docs.walletconnect.com/mobile-linking#for-ios
+    else if (isMobile.isIOS()) {
+        const origin = ((_c = metadata.mobile) === null || _c === void 0 ? void 0 : _c.universal) || ((_d = metadata.mobile) === null || _d === void 0 ? void 0 : _d.native);
+        if (removeWCUri)
+            return origin || '';
+        return `${origin}?uri=${encodeURIComponent(uri !== null && uri !== void 0 ? uri : '')}`;
+    }
+    // on android, the deeplink is simply the uri
+    // see: https://docs.walletconnect.com/mobile-linking#for-android
+    return uri;
+};
+const createSession = (client) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    return new Promise((resolve, reject) => {
+        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 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;
+});
+
+exports.createSession = createSession;
+exports.fetchWalletConnectCosmosPublicAddress = fetchWalletConnectCosmosPublicAddress;
+exports.getDeepLink = getDeepLink;
+exports.initClient = initClient;
+exports.killWalletConnectSession = killWalletConnectSession;
+exports.useDeepLink = useDeepLink;

package/src/wallets/cosmos/wcClient.lib.d.ts

@@ -0,0 +1,20 @@
+import Client from '@walletconnect/client';
+import { WalletSchema } from '@dynamic-labs/wallet-book';
+import { FetchPublicAddressOpts, PayloadParams, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+import { KeplrWalletConnectV1 } from './wcClient';
+export declare const initClient: (name: string, settings?: any) => Client;
+/**
+ * Initialize a client from a stored session and terminate the connection.
+ */
+export declare const killWalletConnectSession: (client: Client) => Promise<void>;
+/**
+ * Attach event handlers to WalletConnect events.
+ */
+export declare const setupWalletConnectEventListeners: (opts: WalletEventListeners, client: Client) => void;
+export declare const teardownWalletConnectEventListeners: (client: Client) => void;
+export declare const useDeepLink: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => void;
+export declare const getDeepLink: (uri: string, metadata: WalletSchema, { removeWCUri, }?: {
+    removeWCUri?: boolean | undefined;
+}) => string;
+export declare const createSession: (client: Client) => Promise<PayloadParams>;
+export declare const fetchWalletConnectCosmosPublicAddress: (metadata: WalletSchema, wcClient: Client, provider: KeplrWalletConnectV1, opts: FetchPublicAddressOpts & Required<Pick<FetchPublicAddressOpts, 'chainId'>>) => Promise<string>;

package/src/wallets/cosmos/wcClient.lib.js

@@ -0,0 +1,87 @@
+import { __awaiter } from 'tslib';
+import Client from '@walletconnect/client';
+import { logger } from '@dynamic-labs/wallet-connector-core';
+import { isMobile, isIOS } from '../../utils/isMobile.js';
+
+const initClient = (name, settings) => {
+    const storageId = `walletconnect-${name}`;
+    const session = localStorage.getItem(storageId);
+    const clientArgs = session
+        ? { session: JSON.parse(session), storageId }
+        : { bridge: 'https://bridge.walletconnect.org', storageId };
+    return new Client(Object.assign(Object.assign({}, clientArgs), settings));
+};
+/**
+ * Initialize a client from a stored session and terminate the connection.
+ */
+const killWalletConnectSession = (client) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        if (client === null || client === void 0 ? void 0 : client.connected) {
+            yield client.killSession();
+        }
+    }
+    catch (e) {
+        logger.debug(e);
+    }
+});
+const useDeepLink = (metadata, wcClient, opts) => {
+    var _a, _b, _c;
+    const deepLink = getDeepLink(wcClient.uri, metadata);
+    if (isMobile()) {
+        window.location.href = deepLink;
+    }
+    else {
+        if ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.desktop) === null || _a === void 0 ? void 0 : _a.native) {
+            (_b = opts === null || opts === void 0 ? void 0 : opts.onDesktopUri) === null || _b === void 0 ? void 0 : _b.call(opts, deepLink);
+        }
+        (_c = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _c === void 0 ? void 0 : _c.call(opts, wcClient.uri);
+    }
+};
+const getDeepLink = (uri, metadata, { removeWCUri = false, } = {}) => {
+    var _a, _b, _c, _d;
+    if (!isMobile()) {
+        const origin = ((_a = metadata.desktop) === null || _a === void 0 ? void 0 : _a.universal) || ((_b = metadata.desktop) === null || _b === void 0 ? void 0 : _b.native);
+        if (removeWCUri)
+            return origin || '';
+        return `${origin}?uri=${encodeURIComponent(uri !== null && uri !== void 0 ? uri : '')}`;
+    }
+    // deeplinks for ios require special treatment
+    // see: https://docs.walletconnect.com/mobile-linking#for-ios
+    else if (isIOS()) {
+        const origin = ((_c = metadata.mobile) === null || _c === void 0 ? void 0 : _c.universal) || ((_d = metadata.mobile) === null || _d === void 0 ? void 0 : _d.native);
+        if (removeWCUri)
+            return origin || '';
+        return `${origin}?uri=${encodeURIComponent(uri !== null && uri !== void 0 ? uri : '')}`;
+    }
+    // on android, the deeplink is simply the uri
+    // see: https://docs.walletconnect.com/mobile-linking#for-android
+    return uri;
+};
+const createSession = (client) => __awaiter(void 0, void 0, void 0, function* () {
+    return new Promise((resolve, reject) => {
+        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 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;
+});
+
+export { createSession, fetchWalletConnectCosmosPublicAddress, getDeepLink, initClient, killWalletConnectSession, useDeepLink };

package/src/wallets/ethereum/BloctoEvm.cjs

@@ -3,32 +3,30 @@
 var tslib = require('tslib');
 var BloctoSDK = require('@blocto/sdk');
 var ethers = require('ethers');
-var logger = require('../../utils/logger.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var EthWalletConnector = require('./EthWalletConnector.cjs');
-var ethProviderHelper = require('./ethProviderHelper.cjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var BloctoSDK__default = /*#__PURE__*/_interopDefaultLegacy(BloctoSDK);
 
 class BloctoEvm extends EthWalletConnector.EthWalletConnector {
-    constructor({ evmNetworks }) {
+    constructor(props) {
         var _a, _b;
-        // Taken from : https://docs.blocto.app/blocto-sdk/javascript-sdk/evm-sdk/provider
-        const BLOCTO_SUPPORTED_CHAIN_IDS = [1, 4, 56, 97, 137, 80001, 43114, 43113];
-        const bloctoSupportedNetworks = evmNetworks.filter((n) => BLOCTO_SUPPORTED_CHAIN_IDS.includes(n.chainId));
-        super({ evmNetworks: bloctoSupportedNetworks });
+        super(props);
         this.LOCAL_STORAGE_KEY = 'dynamic_blocto_evm_chain_id';
         this.name = 'bloctoevm';
         this.canConnectViaCustodialService = true;
         this.connectedChain = 'EVM';
         this.supportedChains = ['EVM', 'ETH'];
-        this.ethProviderHelper = new ethProviderHelper.EthProviderHelper();
         this.supportsNetworkSwitching = () => false;
+        // Taken from : https://docs.blocto.app/blocto-sdk/javascript-sdk/evm-sdk/provider
+        const BLOCTO_SUPPORTED_CHAIN_IDS = [1, 4, 56, 97, 137, 80001, 43114, 43113];
+        this.evmNetworks = this.evmNetworks.filter((n) => BLOCTO_SUPPORTED_CHAIN_IDS.includes(n.chainId));
         this.chainId =
             Number(localStorage.getItem(this.LOCAL_STORAGE_KEY)) ||
-                ((_a = bloctoSupportedNetworks.find((n) => n.chainId === 137)) === null || _a === void 0 ? void 0 : _a.chainId) ||
-                ((_b = bloctoSupportedNetworks[0]) === null || _b === void 0 ? void 0 : _b.chainId);
+                ((_a = this.evmNetworks.find((n) => n.chainId === 137)) === null || _a === void 0 ? void 0 : _a.chainId) ||
+                ((_b = this.evmNetworks[0]) === null || _b === void 0 ? void 0 : _b.chainId);
     }
     getClient() {
         if (!this.client) {
@@ -42,7 +40,7 @@ class BloctoEvm extends EthWalletConnector.EthWalletConnector {
                 });
             }
             else {
-                logger.logger.error("Couldn't find a configured network for Blocto EVM");
+                walletConnectorCore.logger.error("Couldn't find a configured network for Blocto EVM");
             }
         }
         return this.client;
@@ -76,7 +74,7 @@ class BloctoEvm extends EthWalletConnector.EthWalletConnector {
                 return undefined;
             }
             catch (e) {
-                logger.logger.error(e);
+                walletConnectorCore.logger.error(e);
                 return Promise.reject(e);
             }
         });

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

@@ -1,8 +1,6 @@
 import { ethers } from 'ethers';
 import { Chain } from '@dynamic-labs/wallet-connector-core';
-import { EvmNetwork } from './evm-network';
-import { EthWalletConnector } from './EthWalletConnector';
-import { EthProviderHelper } from './ethProviderHelper';
+import { EthWalletConnector, EthWalletConnectorOpts } from './EthWalletConnector';
 declare class BloctoEvm extends EthWalletConnector {
     LOCAL_STORAGE_KEY: string;
     private client?;
@@ -11,11 +9,8 @@ declare class BloctoEvm extends EthWalletConnector {
     connectedChain: Chain;
     supportedChains: Chain[];
     chainId: number;
-    ethProviderHelper: EthProviderHelper;
     supportsNetworkSwitching: () => boolean;
-    constructor({ evmNetworks }: {
-        evmNetworks: EvmNetwork[];
-    });
+    constructor(props: EthWalletConnectorOpts);
     private getClient;
     getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     fetchPublicAddress(): Promise<string | undefined>;